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 0d24247..be3f2da 100644 --- a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php +++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php @@ -116,12 +116,12 @@ class KT_cmis_atom_server extends KT_atom_server { } } - ob_start(); - readfile('C:\Users\Paul\Documents\Downloads\cmis_mod_kt.xml'); - $this->output = ob_get_contents(); - ob_end_clean(); +// ob_start(); +// readfile('C:\Users\Paul\Documents\Downloads\cmis_mod_kt.xml'); +// $this->output = ob_get_contents(); +// ob_end_clean(); -// $this->output = $service->getAPPdoc(); + $this->output = $service->getAPPdoc(); } public function registerService($workspace = NULL, $serviceName = NULL, $serviceClass = NULL, $title = NULL, @@ -159,21 +159,21 @@ class KT_cmis_atom_server extends KT_atom_server { //include('/var/www/atompub_response.xml'); - if (false && preg_match('/F1\-children/', $this->output)) { - readfile('C:\Users\Paul\Documents\Downloads\alfresco folder tree atompub response.xml'); - } - else if (false && preg_match('/urn:uuid:checkedout/', $this->output)) { - readfile('C:\Users\Paul\Documents\Downloads\alfresco checkedout atompub response.xml'); - } - else if (false && preg_match('/urn:uuid:types\-all/', $this->output)) { - readfile('C:\Users\Paul\Documents\Downloads\alfresco types atompub response.xml'); - } - else if (false && preg_match('/\/', $this->output)) { - readfile('C:\Users\Paul\Documents\Downloads\cmis_mod_kt.xml'); - } - else { +// if (false && preg_match('/F1\-children/', $this->output)) { +// readfile('C:\Users\Paul\Documents\Downloads\alfresco folder tree atompub response.xml'); +// } +// else if (false && preg_match('/urn:uuid:checkedout/', $this->output)) { +// readfile('C:\Users\Paul\Documents\Downloads\alfresco checkedout atompub response.xml'); +// } +// else if (false && preg_match('/urn:uuid:types\-all/', $this->output)) { +// readfile('C:\Users\Paul\Documents\Downloads\alfresco types atompub response.xml'); +// } +// else if (false && preg_match('/\/', $this->output)) { +// readfile('C:\Users\Paul\Documents\Downloads\cmis_mod_kt.xml'); +// } +// else { if ($this->renderBody) echo $this->output; - } +// } } } diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php index 423e5d7..2e9a0b4 100644 --- a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php +++ b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php @@ -71,7 +71,7 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc { $service = $this->newElement('service'); $service->appendChild($this->newAttr('xmlns', 'http://www.w3.org/2007/app')); $service->appendChild($this->newAttr('xmlns:atom', 'http://www.w3.org/2005/Atom')); - $service->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200908')); + $service->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200908/')); $service->appendChild($this->newAttr('xmlns:cmisra', 'http://docs.oasis-open.org/ns/cmis/restatom/200908/')); $this->service =& $service; $this->DOM->appendChild($this->service); @@ -81,8 +81,8 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc { { $collection=$this->newElement('collection'); $collection->appendChild($this->newAttr('href', $url)); - $collection->appendChild($this->newAttr('cmisra:collectionType', $cmisCollectionType)); $collection->appendChild($this->newElement('atom:title', $title)); + $collection->appendChild($this->newElement('cmisra:collectionType', $cmisCollectionType)); if (!is_null($accept)) { $collection->appendChild($this->newElement('accept', $accept)); }