Krautspace/dokuwiki-objectrepresentation
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://phablab.krautspace.de/diffusion/DO/dokuwiki-objectrepresentation

Browse source 
Conflicts:
	lib/enko/dokuwiki/objectrepresentation/DokuWikiPage.php
This commit is contained in:
Tim Schumacher 2014-06-14 10:20:30 +02:00
commit 8cbac44f77
4 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/enko/dokuwiki/objectrepresentation/DokuWikiIterator.php
View file

@ -55,12 +55,12 @@ class DokuWikiIterator
/**
*
*/
public function __construct()
public function __construct($loadChangesets = false, \DateTime $maxChangeSetAge = null)
{
global $conf;
$basedir = $conf['datadir'];
$this->root = new DokuWikiNameSpace($basedir);
$this->root = new DokuWikiNameSpace($basedir, null, $loadChangesets, $maxChangeSetAge);
}
/**

8
lib/enko/dokuwiki/objectrepresentation/DokuWikiNameSpace.php
View file

@ -19,9 +19,9 @@ class DokuWikiNameSpace extends DokuWikiNode
* @param $path
* @param null $parent
*/
function __construct($path, $parent = null)
function __construct($path, $parent = null,$loadChangesets = false, \DateTime $maxChangeSetAge = null)
{
parent::__construct($path, $parent);
parent::__construct($path, $parent, $loadChangesets, $maxChangeSetAge);
$files = dir($path);
$this->nodes = new \ArrayObject();
@ -31,10 +31,10 @@ class DokuWikiNameSpace extends DokuWikiNode
$file = $path . DIRECTORY_SEPARATOR . $realfile;
if (is_dir($file)) {
if (!(($realfile == '.') or ($realfile == '..'))) {
$node = new DokuWikiNameSpace($file, $this);
$node = new DokuWikiNameSpace($file, $this, $loadChangesets, $maxChangeSetAge);
}
} else {
$node = new DokuWikiPage($file, $this);
$node = new DokuWikiPage($file, $this, $loadChangesets, $maxChangeSetAge);
}
if ($node) {
$this->nodes->append($node);

10
lib/enko/dokuwiki/objectrepresentation/DokuWikiNode.php
View file

@ -32,6 +32,12 @@ abstract class DokuWikiNode
/** @var DokuWikiNameSpace */
protected $parent = null;
/** @var bool */
protected $loadChangesets = false;
/** @var \DateTime */
protected $maxChangeSetAge = null;
/**
* @return string
@ -81,11 +87,13 @@ abstract class DokuWikiNode
* @param $filename
* @param null $parent
*/
function __construct($filename, $parent = null)
function __construct($filename, $parent = null, $loadChangesets = false, \DateTime $maxChangeSetAge = null)
{
$this->filename = $filename;
$this->parent = $parent;
$this->metadata = new \ArrayObject();
$this->loadChangesets = $loadChangesets;
$this->maxChangeSetAge = $maxChangeSetAge;
if (is_null($parent) && is_dir($filename)) {
$this->name = 'root';
} else {

12
lib/enko/dokuwiki/objectrepresentation/DokuWikiPage.php
View file

@ -17,9 +17,9 @@ class DokuWikiPage extends DokuWikiNode
* @param $filename
* @param null $parent
*/
public function __construct($filename, $parent = null)
public function __construct($filename, $parent = null,$loadChangesets = false, \DateTime $maxChangeSetAge = null)
{
parent::__construct($filename, $parent);
parent::__construct($filename, $parent,$loadChangesets,$maxChangeSetAge);
$this->content = file_get_contents($this->filename);
if (($this->name == 'start') && ($this->parent->name != 'root')) {
$this->parent->content = $this->content;
@ -28,17 +28,21 @@ class DokuWikiPage extends DokuWikiNode
foreach ($metadata as $key => $value) {
$this->setMetaData($key, $value);
}
// extract changelog
$this->ChangeLog = new \ArrayObject();
if ($this->loadChangesets) {
// extract changelog
$file = metaFN($this->getFullID(), '.changes');
if (file_exists($file)) {
$changelog_entries = explode("\n", file_get_contents($file));
foreach ($changelog_entries as $raw_entry) {
$entry = parseChangelogLine($raw_entry);
$changelog = new DokuWikiChangeset($entry['date'], $entry['extra'], $entry['id'], $entry['ip'], $entry['sum'], $entry['type'], $entry['user'],$this);
if ((!is_null($this->maxChangeSetAge)) && ($this->maxChangeSetAge->format('U') > $entry['date']))
continue;
$changelog = new DokuWikiChangeset($entry['date'], $entry['extra'], $entry['id'], $entry['ip'], $entry['sum'], $entry['type'], $entry['user'],$page);
$this->ChangeLog->append($changelog);
}
}
}
}