Bug in dbConnection

query was not capturing duplicate errors and passing them as the internal error object

Author: demiangomez

pgamit/dbConnection.py

@@ -171,27 +171,32 @@ def __init__(self, configfile, use_float=False, write_cfg_file=False):
             raise dbErrConnect(err)
 
     def query(self, command):
-        self.cursor.execute(command)
+        try:
+            self.cursor.execute(command)
 
-        debug(" QUERY: command=%r" % command)
+            debug(" QUERY: command=%r" % command)
 
-        # passing a query object to match response from pygresql
-        return query_obj(self.cursor)
+            # passing a query object to match response from pygresql
+            return query_obj(self.cursor)
+        except Exception as e:
+            raise DatabaseError(e)
 
     def query_float(self, command, as_dict=False):
         # deprecated: using psycopg2 now solves the problem of returning float numbers
         # still in to maintain backwards compatibility
+        try:
+            if not as_dict:
+                cursor = self.cnn.cursor()
+                cursor.execute(command)
+                recordset = cast_array_to_float(cursor.fetchall())
+            else:
+                # return results as a dictionary
+                self.cursor.execute(command)
+                recordset = cast_array_to_float(self.cursor.fetchall())
 
-        if not as_dict:
-            cursor = self.cnn.cursor()
-            cursor.execute(command)
-            recordset = cast_array_to_float(cursor.fetchall())
-        else:
-            # return results as a dictionary
-            self.cursor.execute(command)
-            recordset = cast_array_to_float(self.cursor.fetchall())
-
-        return recordset
+            return recordset
+        except Exception as e:
+            raise DatabaseError(e)
 
     def get(self, table, filter_fields, return_fields=None, limit=None):
         """

pgamit/igslog.py

@@ -204,7 +204,7 @@ def extract_id_block(
         raise LogVersionError(f"Incorrect version string '{version}' passed to the extract_id_block() function")
 
     id_block = _REGEX_ID.search(data)
-    print(id_block)
+
     if id_block is None:
         logger.warning(f"ID rejected from {file_path}")
         return _np.array([]).reshape(0, 12)