Peter M. Groen / knowledgetree

Commit 3eb150eeeef327275914250c5a4cfa8120e649ac

Authored by Charl Joseph Mert
1 parent 951a14d0

Update KT CMIS implementation to 1.0 compliance 

PT:2295472

Partial commit that includes changes to some atompub responses.

Committed by: Charl Joseph Mert
Reviewed by: Paul Barrett
Inline Side-by-side
Showing 3 changed files with 12 additions and 8 deletions
webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
  View file @3eb150e
@@ -269,7 +269,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service { @@ -269,7 +269,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
269 foreach($response as $failed) 269 foreach($response as $failed)
270 { 270 {
271 $entry = $feed->newEntry(); 271 $entry = $feed->newEntry();
272 - $objectElement = $feed->newElement('cmis:object'); 272 + $objectElement = $feed->newElement('cmisra:object');
273 $propertiesElement = $feed->newElement('cmis:properties'); 273 $propertiesElement = $feed->newElement('cmis:properties');
274 $propElement = $feed->newElement('cmis:propertyId'); 274 $propElement = $feed->newElement('cmis:propertyId');
275 $propElement->appendChild($feed->newAttr('cmis:name', 'ObjectId')); 275 $propElement->appendChild($feed->newAttr('cmis:name', 'ObjectId'));
@@ -740,4 +740,4 @@ class KT_cmis_atom_service_type extends KT_cmis_atom_service { @@ -740,4 +740,4 @@ class KT_cmis_atom_service_type extends KT_cmis_atom_service {
740 740
741 } 741 }
742 742
743 -?>  
744 \ No newline at end of file 743 \ No newline at end of file
  744 +?>
webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
  View file @3eb150e
@@ -298,13 +298,14 @@ class KT_cmis_atom_service_helper { @@ -298,13 +298,14 @@ class KT_cmis_atom_service_helper {
298 $entry->appendChild($response->newField('updated', self::formatDatestamp())); 298 $entry->appendChild($response->newField('updated', self::formatDatestamp()));
299 299
300 // main CMIS entry 300 // main CMIS entry
301 - $objectElement = $response->newElement('cmis:object'); 301 + $objectElement = $response->newElement('cmisra:object');
302 $propertiesElement = $response->newElement('cmis:properties'); 302 $propertiesElement = $response->newElement('cmis:properties');
303 303
304 foreach($cmisEntry['properties'] as $propertyName => $property) 304 foreach($cmisEntry['properties'] as $propertyName => $property)
305 { 305 {
306 $propElement = $response->newElement('cmis:' . $property['type']); 306 $propElement = $response->newElement('cmis:' . $property['type']);
307 - $propElement->appendChild($response->newAttr('cmis:name', $propertyName)); 307 + $propElement->appendChild($response->newAttr('localName', 'rep-cmis:' . $propertyName));
  308 + $propElement->appendChild($response->newAttr('propertyDefinitionId', 'cmis:' . $propertyName));
308 if (!empty($property['value'])) 309 if (!empty($property['value']))
309 { 310 {
310 if ($propertyName == 'ContentStreamUri') { 311 if ($propertyName == 'ContentStreamUri') {
@@ -484,12 +485,12 @@ class KT_cmis_atom_service_helper { @@ -484,12 +485,12 @@ class KT_cmis_atom_service_helper {
484 { 485 {
485 $properties = array(); 486 $properties = array();
486 487
487 - // find cmis:object tag  
488 - $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmis:object', $xmlArray, null, false); 488 + // find cmisra:object tag
  489 + $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmisra:object', $xmlArray, null, false);
489 if(count($baseCmisObject) <= 0) 490 if(count($baseCmisObject) <= 0)
490 { 491 {
491 $entryObject = KT_cmis_atom_service_helper::findTag('entry', $xmlArray, null, false); 492 $entryObject = KT_cmis_atom_service_helper::findTag('entry', $xmlArray, null, false);
492 - $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmis:object', $entryObject['@children'], null, true); 493 + $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmisra:object', $entryObject['@children'], null, true);
493 } 494 }
494 495
495 if(count($baseCmisObject)>0) 496 if(count($baseCmisObject)>0)
webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
  View file @3eb150e
@@ -151,9 +151,12 @@ class KT_cmis_atom_server extends KT_atom_server { @@ -151,9 +151,12 @@ class KT_cmis_atom_server extends KT_atom_server {
151 { 151 {
152 ob_end_clean(); 152 ob_end_clean();
153 if (!$this->headersSet) header('Content-type: text/xml'); 153 if (!$this->headersSet) header('Content-type: text/xml');
  154 +
  155 + //include('/var/www/atompub_response.xml');
  156 +
154 if ($this->renderBody) echo $this->output; 157 if ($this->renderBody) echo $this->output;
155 } 158 }
156 159
157 } 160 }
158 161
159 -?>  
160 \ No newline at end of file 162 \ No newline at end of file
  163 +?>