Fixed bug with response code and exception and moved query params from constructor to the individual requests.

Author: Reedyn

almaapi/__init__.py

@@ -8,34 +8,38 @@ class AlmaAPIException(Exception):
 
 class AlmaAPI:
 
-    def __init__(self, api, api_key, query_params=None):
+    def __init__(self, api, api_key):
         self.api_url = 'https://api-eu.hosted.exlibrisgroup.com/almaws/v1/' + api + '/'
         self.api_key = '?apikey=' + api_key
-        self.query_params = ''
 
+    def get(self, mms_id, query_params=None):
+        __query_params__ = ''
         if query_params is not None:
             for key, value in query_params.items():
-                self.query_params += '&' + key + '=' + value
+                __query_params__ += '&' + key + '=' + value
 
-    def get(self, mms_id):
-        url = self.api_url + mms_id + self.api_key + self.query_params
+        url = self.api_url + mms_id + self.api_key + __query_params__
 
         (response, content) = http.Http().request(url)
 
-        if response.status != '200':
-            # print(response)
+        if response.status != 200:
             root = ElementTree.ElementTree(ElementTree.fromstring(content)).getroot()
             error_message = root[1][0][1].text
             raise AlmaAPIException(str(response.status) + ': ' + error_message)
 
         return content.decode('utf8')
 
-    def put(self, mms_id, body):
-        url = self.api_url + mms_id + self.api_key + self.query_params
+    def put(self, mms_id, body, query_params=None):
+        __query_params__ = ''
+        if query_params is not None:
+            for key, value in query_params.items():
+                __query_params__ += '&' + key + '=' + value
+
+        url = self.api_url + mms_id + self.api_key + __query_params__
         headers = {'Content-type': 'application/xml'}
 
         (response, content) = http.Http().request(url, 'PUT', headers=headers, body=body)
-        if response.status != '200':
+        if response.status != 200:
             root = ElementTree.ElementTree(ElementTree.fromstring(content)).getroot()
             error_message = root[1][0][1].text
             raise AlmaAPIException(str(response.status) + ': ' + error_message)

almamarc/__init__.py

@@ -29,6 +29,8 @@ def __parse__(i, f):
         # Map record fields to a list
         self.fields = list(self.xml.findall('.//record/*'))
 
+
+
         # Get the attributes of the XMl Object
         def __get_attributes__(xml):
             record = xml.find('.//record')