Skip to content
Browse files

Added keyword argument to rr find_attachments

  • Loading branch information...
1 parent 195c435 commit 9d62961b231027010823b415da624b8b623c5cd4 Michael Meisinger committed
Showing with 7 additions and 11 deletions.
  1. +1 −1 extern/ion-definitions
  2. +1 −1 extern/pyon
  3. +5 −9 ion/services/coi/resource_registry_service.py
2 extern/ion-definitions
@@ -1 +1 @@
-Subproject commit 080f016958d9b30ffc786b77e8d1134365703ee9
+Subproject commit de3e84b08eaddf3c9f9f9c3c9c86873c8ac65990
2 extern/pyon
@@ -1 +1 @@
-Subproject commit 47675566eafbc3c76b50ab19ee502e59f77f9dd0
+Subproject commit 24d6bb3453f6e8438dec1ea7385141bae73cd95b
View
14 ion/services/coi/resource_registry_service.py
@@ -84,8 +84,8 @@ def delete_attachment(self, attachment_id=''):
return self.resource_registry.delete_attachment(attachment_id=attachment_id)
@mask_couch_error
- def find_attachments(self, resource_id='', limit=0, descending=False, include_content=False, id_only=True):
- return self.resource_registry.find_attachments(resource_id=resource_id, limit=limit,
+ def find_attachments(self, resource_id='', keyword='', limit=0, descending=False, include_content=False, id_only=True):
+ return self.resource_registry.find_attachments(resource_id=resource_id, keyword='', limit=limit,
descending=descending, include_content=include_content,
id_only=id_only)
@@ -137,13 +137,9 @@ def find_resources(self, restype="", lcstate="", name="", id_only=False):
@mask_couch_error
def find_resources_ext(self, restype='', lcstate='', name='', keyword='', nested_type='', limit=0, skip=0, descending=False, id_only=False):
- # @TODO Remove if and else clause after pyon update
- if 'find_resources_ext' in self.resource_registry:
- return self.resource_registry.find_resources_ext(restype=restype, lcstate=lcstate, name=name,
- keyword=keyword, nested_type=nested_type, limit=limit, skip=skip, descending=descending,
- id_only=id_only)
- else:
- return self.resource_registry.find_resources(restype=restype, lcstate=lcstate, name=name, id_only=id_only)
+ return self.resource_registry.find_resources_ext(restype=restype, lcstate=lcstate, name=name,
+ keyword=keyword, nested_type=nested_type, limit=limit, skip=skip, descending=descending,
+ id_only=id_only)
@mask_couch_error
def read_mult(self, object_ids=[]):

0 comments on commit 9d62961

Please sign in to comment.
Something went wrong with that request. Please try again.