diff --git a/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php index 88628d5..e8611df 100644 --- a/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php +++ b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php @@ -51,7 +51,9 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service { * This includes children and tree/descendant listings as well as individual folder retrieval */ public function GET_action() - { + { +// global $default; +// $default->log->info($this->rawContent); $repositoryId = KT_cmis_atom_service_helper::getRepositoryId($RepositoryService); // TODO implement full path/node separation as with Alfresco - i.e. path requests come in on path/ and node requests come in on node/ diff --git a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php index 8821614..c6c8e0e 100644 --- a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php +++ b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php @@ -110,7 +110,6 @@ class KT_cmis_atom_service_helper { static public function createObjectEntry(&$feed, $cmisEntry, $parent, $pwc = false, $method = 'GET') { $workspace = $feed->getWorkspace(); - $type = strtolower($cmisEntry['properties']['objectTypeId']['value']); // create entry $entry = $feed->newEntry(); @@ -125,7 +124,7 @@ class KT_cmis_atom_service_helper { $entry->appendChild($feed->newAttr('xmlns:cmisra', 'http://docs.oasis-open.org/ns/cmis/restatom/200908/')); } - self::createObjectEntryContent($entry, $feed, $cmisEntry, $parent, $pwc, $method); + self::createObjectEntryContent($entry, $feed, $workspace, $cmisEntry, $parent, $pwc, $method); } /** @@ -157,7 +156,7 @@ class KT_cmis_atom_service_helper { // create entry $entry = $feed->newElement('entry'); - self::createObjectEntryContent($entry, $feed, $cmisEntry);//, $parent, $pwc, $method); + self::createObjectEntryContent($entry, $feed, $workspace, $cmisEntry);//, $parent, $pwc, $method); $childrenFeed->appendChild($entry); } @@ -171,8 +170,10 @@ class KT_cmis_atom_service_helper { * @param boolean $pwc Whether this is a PWC object (will be returned slightly differently) * @param string $method The calling method (slightly affects the output) */ - static public function createObjectEntryContent($entry, &$feed, $cmisEntry, $parent = '', $pwc = false, $method = 'GET') + static public function createObjectEntryContent($entry, &$feed, $workspace, $cmisEntry, $parent = '', $pwc = false, $method = 'GET') { + $type = $cmisEntry['properties']['objectTypeId']['value']; + // TODO dynamic actual creator name $responseElement = $feed->newField('author'); $element = $feed->newField('name', 'admin', $responseElement); diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php index 417121d..899038b 100644 --- a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php +++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php @@ -166,6 +166,9 @@ class KT_cmis_atom_server extends KT_atom_server { header('Content-type: text/xml'); } +// global $default; +// $default->log->info($this->output); + if ($this->renderBody) { echo $this->output; }