|
@@ -45,13 +45,13 @@ class Client(object):
|
|
|
return self.get_collection('staging/downloads', 'id', limit)
|
|
|
|
|
|
def get_download(self, oid):
|
|
|
- return Download(self.get_response(self.url('staging/downloads', oid)))
|
|
|
+ return Download(self.get(self.url('staging/downloads', oid)))
|
|
|
|
|
|
def get_ingest_ids(self, limit=None):
|
|
|
return self.get_collection('staging/ingests', 'id', limit)
|
|
|
|
|
|
def get_ingest(self, oid):
|
|
|
- return Ingest(self.get_response(self.url('staging/ingests', oid)))
|
|
|
+ return Ingest(self.get(self.url('staging/ingests', oid)))
|
|
|
|
|
|
def get_ingests(self, limit=None):
|
|
|
return [self.get_ingest(oid) for oid in self.get_ingest_ids(limit)]
|
|
@@ -60,7 +60,7 @@ class Client(object):
|
|
|
return self.get_collection('basemetadata/investigations', 'investigationId', limit)
|
|
|
|
|
|
def get_investigation(self, oid):
|
|
|
- return Investigation(self.get_response(self.url('basemetadata/investigations', oid)))
|
|
|
+ return Investigation(self.get(self.url('basemetadata/investigations', oid)))
|
|
|
|
|
|
def get_investigations(self, limit=None):
|
|
|
return [self.get_investigation(oid) for oid in self.get_investigation_ids(limit)]
|
|
@@ -69,7 +69,7 @@ class Client(object):
|
|
|
return self.get_collection('basemetadata/digitalObjects', 'baseId', limit)
|
|
|
|
|
|
def get_object(self, oid):
|
|
|
- return Object(self.get_response(self.url('basemetadata/digitalObjects', oid)))
|
|
|
+ return Object(self.get(self.url('basemetadata/digitalObjects', oid)))
|
|
|
|
|
|
def get_objects(self, limit=None):
|
|
|
return [self.get_object(oid) for oid in self.get_object_ids(limit)]
|
|
@@ -96,13 +96,13 @@ class Client(object):
|
|
|
self.session.put(self.url('staging/ingests', oid), data=params)
|
|
|
|
|
|
def get_organization(self, oid):
|
|
|
- return Organization(self.get_response(self.url('dataorganization/organization', oid)))
|
|
|
+ return Organization(self.get(self.url('dataorganization/organization', oid)))
|
|
|
|
|
|
def get_accesspoint_ids(self):
|
|
|
return self.get_collection('staging/accesspoints', 'id')
|
|
|
|
|
|
def get_accesspoint(self, oid):
|
|
|
- return AccessPoint(self.get_response(self.url('staging/accesspoints', oid)))
|
|
|
+ return AccessPoint(self.get(self.url('staging/accesspoints', oid)))
|
|
|
|
|
|
def get_accesspoints(self, scheme=None):
|
|
|
aps = (self.get_accesspoint(oid) for oid in self.get_accesspoint_ids())
|
|
@@ -114,11 +114,11 @@ class Client(object):
|
|
|
|
|
|
def get_collection(self, url, id_name, limit=None):
|
|
|
params = {'results': limit} if limit else {}
|
|
|
- root = self.get_response(self.url(url), **params)
|
|
|
+ root = self.get(self.url(url), **params)
|
|
|
return [int(e.text) for e in root.findall('./entities/entity/{}'.format(id_name))]
|
|
|
|
|
|
def get_user(self, oid):
|
|
|
- return User(self.get_response(self.url('usergroup/users', oid)), self)
|
|
|
+ return User(self.get(self.url('usergroup/users', oid)), self)
|
|
|
|
|
|
def delete(self, url):
|
|
|
self.log.debug("DELETE {}".format(url))
|
|
@@ -129,7 +129,7 @@ class Client(object):
|
|
|
except requests.exceptions.Timeout:
|
|
|
raise Timeout
|
|
|
|
|
|
- def get_response(self, url, **params):
|
|
|
+ def get(self, url, **params):
|
|
|
self.log.debug("GET {}".format(url))
|
|
|
|
|
|
try:
|