From bb93527654dd187315cbc27a221c2dd441f1ad3d Mon Sep 17 00:00:00 2001
From: Paul Barrett <paul@knowledgetree.com>
Date: Thu, 4 Mar 2010 11:07:53 +0200
Subject: [PATCH] Fix issue with parent folder return caused by removal of redundant code layer

---
 lib/api/ktcmis/ktNavigationService.inc.php                   |  4 ++--
 lib/api/ktcmis/services/CMISNavigationService.inc.php        |  2 +-
 webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php | 14 +++-----------
 webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php  |  5 +----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/lib/api/ktcmis/ktNavigationService.inc.php b/lib/api/ktcmis/ktNavigationService.inc.php
index 1cf65ea..9737ab0 100644
--- a/lib/api/ktcmis/ktNavigationService.inc.php
+++ b/lib/api/ktcmis/ktNavigationService.inc.php
@@ -168,7 +168,7 @@ class KTNavigationService extends KTCMISBase {
                 "message" => "Failed getting folder parent: " . $e->getMessage()
             );
         }
-
+        
         if (PEAR::isError($parent))
         {
             return array(
@@ -176,7 +176,7 @@ class KTNavigationService extends KTCMISBase {
                 "message" => "Failed getting folder parent"
             );
         }
-
+        
         return array(
 			"status_code" => 0,
 			"results" => CMISUtil::createObjectPropertiesEntry($parent->getProperties())
diff --git a/lib/api/ktcmis/services/CMISNavigationService.inc.php b/lib/api/ktcmis/services/CMISNavigationService.inc.php
index 7fe2d21..9ceb9d0 100644
--- a/lib/api/ktcmis/services/CMISNavigationService.inc.php
+++ b/lib/api/ktcmis/services/CMISNavigationService.inc.php
@@ -197,7 +197,7 @@ class CMISNavigationService {
         }
 
         $parentId = $ktapiFolder->get_parent_folder_id();
-        $parent = new CMISFolderObject(CMISUtil::encodeObjectId($parentId, FOLDER), $this->ktapi);
+        $parent = new CMISFolderObject($parentId, $this->ktapi);
 
         return $parent;
     }
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 c137094..c9d39f3 100644
--- a/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
+++ b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
@@ -52,8 +52,6 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
      */
     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/
@@ -107,8 +105,8 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
             }
             
             // we know that a folder will only have one parent, so we can assume element 0
-            $folderId = $response[0]['properties']['objectId']['value'];
-            $folderName = $response[0]['properties']['name']['value'];
+            $folderId = $response['properties']['objectId']['value'];
+            $folderName = $response['properties']['name']['value'];
         }
         else {
             $folderId = $this->params[0];
@@ -134,10 +132,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
      * This includes creation/moving of both folders and documents.
      */
     public function POST_action()
-    {   
-        global $default;
-        $default->log->info($this->rawContent); 
-        
+    {        
         $repositoryId = KT_cmis_atom_service_helper::getRepositoryId($RepositoryService);
 
         // set default action, objectId and typeId
@@ -194,15 +189,12 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
 
         $ObjectService = new KTObjectService(KT_cmis_atom_service_helper::getKt());
 
-        $default->log->info('here: '.$action);
-        
         $success = false;
         $error = null;
         if ($action == 'create')
         {
             // TODO detection and passing of optional parameters (policies, ACEs, etc...) as well as support for other object-types
             if ($cmisObjectProperties['cmis:objectTypeId'] == 'cmis:folder') {
-                $default->log->info($cmisObjectProperties['cmis:objectTypeId']);
                 $newObjectId = $ObjectService->createFolder($repositoryId, $properties, $folderId);
             }
             else {
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 c6c8e0e..03a12f4 100644
--- a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
+++ b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
@@ -56,6 +56,7 @@ class KT_cmis_atom_service_helper {
      * @param string $folderId
      * @return string CMIS AtomPub feed
      */
+    // TODO enable this to work on an existing set of object properties if submitted
     static public function getObjectFeed(&$service, $ObjectService, $repositoryId, $objectId, $method = 'GET')
     {
         self::$repositoryId = $repositoryId;
@@ -399,10 +400,6 @@ class KT_cmis_atom_service_helper {
      */
     static public function getTypeFeed($typeDef, $types)
     {
-        global $default;
-//        $default->log->info(print_r($types));
-//        $default->log->info(print_r($types, true));
-        $default->log->info($typeDef);
         $typesString = '';
         $typesHeading = '';
         switch($typeDef)
--
libgit2 0.21.4