chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpo...@apache.org
Subject svn commit: r1595096 - /chemistry/cmislib/trunk/src/cmislib/browser/binding.py
Date Fri, 16 May 2014 03:36:06 GMT
Author: jpotts
Date: Fri May 16 03:36:06 2014
New Revision: 1595096

URL: http://svn.apache.org/r1595096
Log:
Implemented property filter in cmislib; folder unit tests running clean

Modified:
    chemistry/cmislib/trunk/src/cmislib/browser/binding.py

Modified: chemistry/cmislib/trunk/src/cmislib/browser/binding.py
URL: http://svn.apache.org/viewvc/chemistry/cmislib/trunk/src/cmislib/browser/binding.py?rev=1595096&r1=1595095&r2=1595096&view=diff
==============================================================================
--- chemistry/cmislib/trunk/src/cmislib/browser/binding.py (original)
+++ chemistry/cmislib/trunk/src/cmislib/browser/binding.py Fri May 16 03:36:06 2014
@@ -174,19 +174,21 @@ class BrowserCmisObject(object):
         """
 
         if self._extArgs:
-            kwargs.update(self._extArgs)
+            self._extArgs.update(kwargs)
+        else:
+            self._extArgs = kwargs
 
         byObjectIdUrl = self._repository.getRootFolderUrl() + "?objectId=" + self.getObjectId()
+ "&cmisselector=object"
         self.data = self._cmisClient.binding.get(byObjectIdUrl.encode('utf-8'),
                                                    self._cmisClient.username,
                                                    self._cmisClient.password,
-                                                   **kwargs)
+                                                   **self._extArgs)
         self._initData()
 
         # if a returnVersion arg was passed in, it is possible we got back
         # a different object ID than the value we started with, so it needs
         # to be cleared out as well
-        if kwargs.has_key('returnVersion'):
+        if self._extArgs.has_key('returnVersion'):
             self._objectId = None
     
     def getObjectId(self):
@@ -664,12 +666,13 @@ class BrowserRepository(object):
          - includeAllowableActions
         """
 
+        '''
         if kwargs:
             if self._extArgs:
                 self._extArgs.update(kwargs)
             else:
                 self._extArgs = kwargs
-
+        '''
         #TODO why is quoting the path required for the browser binding and not for atom pub
         #on inmemory 0.9?
         #TODO maybe we should quote all urls in the net library instead of here
@@ -2439,7 +2442,7 @@ class BrowserObjectType(object):
         """
         if kwargs:
             if self._extArgs:
-                kwargs.update(self._extArgs)
+                self._extArgs.update(kwargs)
 
         typesUrl = self._repository.getRepositoryUrl()
         kwargs['cmisselector'] = 'typeDefinition'



Mime
View raw message