|
@@ -57,21 +57,26 @@ class Client(object):
|
|
|
return [Ingest(self, oid) for oid in self.get_ingest_ids(limit)]
|
|
|
|
|
|
def get_investigation_ids(self, limit=None):
|
|
|
- return self.get_collection('basemetadata/investigations', 'investigationId', limit)
|
|
|
+ return self.get_collection('basemetadata/investigations',
|
|
|
+ 'investigationId', limit)
|
|
|
|
|
|
def get_investigations(self, limit=-1):
|
|
|
- return [Investigation(self, oid) for oid in self.get_investigation_ids(limit)]
|
|
|
+ return [Investigation(self, oid) for oid
|
|
|
+ in self.get_investigation_ids(limit)]
|
|
|
|
|
|
def get_object_ids(self, limit=None, since=None):
|
|
|
- return self.get_collection('basemetadata/digitalObjects', 'baseId', limit)
|
|
|
+ return self.get_collection('basemetadata/digitalObjects',
|
|
|
+ 'baseId', limit)
|
|
|
|
|
|
def get_objects(self, limit=-1, predicate=lambda o: True):
|
|
|
objects = (Object(self, oid) for oid in self.get_object_ids(limit))
|
|
|
return [o for o in objects if predicate(o)]
|
|
|
|
|
|
def create_object(self, investigation_id, uploader, label=None, note=None):
|
|
|
- url = self.url('basemetadata/investigations', investigation_id, 'digitalObjects')
|
|
|
- return Object(self, -1, root=self.post(url, label=label, uploaderId=uploader.id, note=note))
|
|
|
+ url = self.url('basemetadata/investigations', investigation_id,
|
|
|
+ 'digitalObjects')
|
|
|
+ root = self.post(url, label=label, uploaderId=uploader.id, note=note)
|
|
|
+ return Object(self, -1, root=root)
|
|
|
|
|
|
def delete_object(self, obj):
|
|
|
self.delete(self.url('basemetadata/digitalObjects', obj.id))
|
|
@@ -99,7 +104,8 @@ class Client(object):
|
|
|
def get_collection(self, url, id_name, limit=None):
|
|
|
params = {'results': limit} if limit else {}
|
|
|
root = self.get(self.url(url), **params)
|
|
|
- return [int(e.text) for e in root.findall('./entities/entity/{}'.format(id_name))]
|
|
|
+ entities = root.findall('./entities/entity/{}'.format(id_name))
|
|
|
+ return [int(e.text) for e in entities]
|
|
|
|
|
|
def get_user(self, oid):
|
|
|
return User(self, oid)
|