fix init_dbif() returned values better interpretation

lib/python/temporal/abstract_dataset.py

@@ -347,7 +347,7 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
            :param dbif: The database interface to be used
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         self.base.select(dbif)
         self.temporal_extent.select(dbif)
@@ -356,7 +356,7 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
         if self.is_stds() is False:
             self.stds_register.select(dbif)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
     def is_in_db(self, dbif=None):
@@ -389,7 +389,7 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
                               "mapset") % {"ds": self.get_id(),
                                            "type": self.get_type()})
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # Build the INSERT SQL statement
         statement = self.base.get_insert_statement_mogrified(dbif)
@@ -401,11 +401,11 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
 
         if execute:
             dbif.execute_transaction(statement)
-            if connected:
+            if connection_state_changed:
                 dbif.close()
             return ""
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
         return statement
 
@@ -429,7 +429,7 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
                               "mapset") % {"ds": self.get_id(),
                                            "type": self.get_type()})
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # Build the UPDATE SQL statement
         statement = self.base.get_update_statement_mogrified(dbif, ident)
@@ -444,11 +444,11 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
 
         if execute:
             dbif.execute_transaction(statement)
-            if connected:
+            if connection_state_changed:
                 dbif.close()
             return ""
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
         return statement
 
@@ -472,7 +472,7 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
                               "mapset") % {"ds": self.get_id(),
                                            "type": self.get_type()})
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # Build the UPDATE SQL statement
         statement = self.base.get_update_all_statement_mogrified(dbif, ident)
@@ -488,11 +488,11 @@ class AbstractDataset(SpatialTopologyDatasetConnector,
 
         if execute:
             dbif.execute_transaction(statement)
-            if connected:
+            if connection_state_changed:
                 dbif.close()
             return ""
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
         return statement
 

lib/python/temporal/abstract_map_dataset.py

@@ -428,11 +428,11 @@ class AbstractMapDataset(AbstractDataset):
                                            "type": self.get_type()})
 
         if self.set_absolute_time(start_time, end_time):
-            dbif, connected = init_dbif(dbif)
+            dbif, connection_state_changed = init_dbif(dbif)
             self.absolute_time.update_all(dbif)
             self.base.update(dbif)
 
-            if connected:
+            if connection_state_changed:
                 dbif.close()
 
             if get_enable_timestamp_write():
@@ -524,11 +524,11 @@ class AbstractMapDataset(AbstractDataset):
                                            "type": self.get_type()})
 
         if self.set_relative_time(start_time, end_time, unit):
-            dbif, connected = init_dbif(dbif)
+            dbif, connection_state_changed = init_dbif(dbif)
             self.relative_time.update_all(dbif)
             self.base.update(dbif)
 
-            if connected:
+            if connection_state_changed:
                 dbif.close()
 
             if get_enable_timestamp_write():
@@ -844,7 +844,7 @@ class AbstractMapDataset(AbstractDataset):
                               "mapset") % {"ds": self.get_id(),
                                            "type": self.get_type()})
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
         statement = ""
 
         if self.is_in_db(dbif):
@@ -872,7 +872,7 @@ class AbstractMapDataset(AbstractDataset):
 
         self.reset(None)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return statement
@@ -913,7 +913,7 @@ class AbstractMapDataset(AbstractDataset):
                                            "type": self.get_type()})
 
         statement = ""
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # Get all datasets in which this map is registered
         datasets = self.get_registered_stds(dbif)
@@ -935,7 +935,7 @@ class AbstractMapDataset(AbstractDataset):
             dbif.execute_transaction(statement)
             statement = ""
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return statement
@@ -949,7 +949,7 @@ class AbstractMapDataset(AbstractDataset):
            :return: A list of ids of all space time datasets in
                         which this map is registered
         """
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         self.stds_register.select(dbif)
         datasets = self.stds_register.get_registered_stds()
@@ -959,7 +959,7 @@ class AbstractMapDataset(AbstractDataset):
         else:
             datasets = None
 
-        if connected:
+        if connection_state_changed:
             dbif.close
 
         return datasets
@@ -976,7 +976,7 @@ class AbstractMapDataset(AbstractDataset):
 
            :return: The SQL statements if execute=False, else an empty string
         """
-        dbif, connected = init_dbif(dbif=dbif)
+        dbif, connection_state_changed = init_dbif(dbif=dbif)
 
         datasets = self.get_registered_stds(dbif=dbif)
 
@@ -989,7 +989,7 @@ class AbstractMapDataset(AbstractDataset):
 
         # Check if the dataset is already present
         if stds_id in datasets:
-            if connected:
+            if connection_state_changed:
                 dbif.close
             return ""
 
@@ -1004,7 +1004,7 @@ class AbstractMapDataset(AbstractDataset):
         else:
             statement = self.stds_register.get_update_statement_mogrified(dbif=dbif)
 
-        if connected:
+        if connection_state_changed:
             dbif.close
 
         return statement
@@ -1022,19 +1022,19 @@ class AbstractMapDataset(AbstractDataset):
 
            :return: The SQL statements if execute=False, else an empty string
         """
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         datasets = self.get_registered_stds(dbif=dbif)
 
         # Check if no datasets are present
         if datasets is None:
-            if connected:
+            if connection_state_changed:
                 dbif.close
             return ""
 
         # Check if the dataset is already present
         if stds_id not in datasets:
-            if connected:
+            if connection_state_changed:
                 dbif.close
             return ""
 
@@ -1049,7 +1049,7 @@ class AbstractMapDataset(AbstractDataset):
         else:
             statement = self.stds_register.get_update_statement_mogrified(dbif=dbif)
 
-        if connected:
+        if connection_state_changed:
             dbif.close
 
         return statement

lib/python/temporal/abstract_space_time_dataset.py

@@ -359,7 +359,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                     empty string otherwise
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # We need to create the register table if it does not exist
         stds_register_table = self.get_map_register()
@@ -403,7 +403,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
             dbif.execute_transaction(statement)
             statement = ""
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return statement
@@ -718,7 +718,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                               "dataset must be interval"))
             return None
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
         relations = copy.deepcopy(method)
 
         # Tune the temporal relations
@@ -792,7 +792,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
             obj_list.append(result)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return obj_list
@@ -971,7 +971,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
             use_follows = False
             use_precedes = False
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         obj_list = []
         sample_maps = stds.get_registered_maps_as_objects_with_gaps(
@@ -1023,7 +1023,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
             obj_list.append(copy.copy(result))
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return obj_list
@@ -1074,7 +1074,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                    granule, or None in case nothing found
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         if gran is None:
             gran = self.get_granularity()
@@ -1106,7 +1106,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                                                                      start,
                                                                      end,
                                                                      gran)
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return l
@@ -1329,7 +1329,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
            :return: ordered object list, in case nothing found None is returned
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         obj_list = []
 
@@ -1360,7 +1360,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                         map.set_spatial_extent_from_values(0, 0, 0, 0, 0, 0)
                         obj_list.append(copy.copy(map))
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return obj_list
@@ -1386,13 +1386,13 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                    In case nothing found None is returned
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
         obj_list = self.get_registered_maps_as_objects(where, order, dbif)
 
         tb = SpatioTemporalTopologyBuilder()
         tb.build(obj_list)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return obj_list
@@ -1418,7 +1418,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                    In case nothing found None is returned
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         obj_list = []
 
@@ -1465,7 +1465,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
                 obj_list.append(copy.copy(map))
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return obj_list
@@ -1550,7 +1550,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                    In case nothing found None is returned
         """
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         rows = None
 
@@ -1582,13 +1582,13 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                 dbif.execute(sql, mapset=self.base.mapset)
                 rows = dbif.fetchall(mapset=self.base.mapset)
             except:
-                if connected:
+                if connection_state_changed:
                     dbif.close()
                 self.msgr.error(_("Unable to get map ids from register table "
                                   "<%s>") % (self.get_map_register()))
                 raise
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         return rows
@@ -1704,7 +1704,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
             self.msgr.error(_("Wrong granularity format: %s" % (gran)))
             return False
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         maps = self.get_registered_maps_as_objects(dbif=dbif)
 
@@ -1732,7 +1732,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
         self. _update_map_timestamps(maps, date_list, dbif)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
     @staticmethod
@@ -1869,7 +1869,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                               "mapset") % ({"ds": self.get_id()},
                                            {"type": self.get_type()}))
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         maps = self.get_registered_maps_as_objects(dbif=dbif)
 
@@ -1904,7 +1904,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
         self._update_map_timestamps(maps, date_list, dbif)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
     def _update_map_timestamps(self, maps, date_list, dbif):
@@ -1971,7 +1971,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                               "mapset") % ({"ds": self.get_id()},
                                            {"type": self.get_type()}))
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         if dbif.get_dbmi().__name__ != "sqlite3":
             self.msgr.fatal(_("Renaming of space time datasets is not "
@@ -2018,7 +2018,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
         # Execute the accumulated statements
         dbif.execute_transaction(statement)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
     def delete(self, dbif=None, execute=True):
@@ -2052,7 +2052,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                                            "type": self.get_type()})
 
         statement = ""
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # SELECT all needed information from the database
         self.metadata.select(dbif)
@@ -2080,7 +2080,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
         self.reset(None)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         if execute:
@@ -2097,7 +2097,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
         """
         stds_register_table = self.get_map_register()
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         is_registered = False
 
@@ -2119,7 +2119,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
             if row is not None and row[0] == map_id:
                 is_registered = True
 
-        if connected is True:
+        if connection_state_changed is True:
             dbif.close()
 
         return is_registered
@@ -2147,7 +2147,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                               "not match the current mapset") %
                             {"ds": self.get_id(), "type": self.get_type()})
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         if map.is_in_db(dbif) is False:
             dbif.close()
@@ -2269,7 +2269,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
         # Now execute the insert transaction
         dbif.execute_transaction(statement)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         # increase the counter
@@ -2304,7 +2304,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
 
         statement = ""
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         # Check if the map is registered in the space time raster dataset
         if self.is_map_registered(map.get_id(), dbif) is False:
@@ -2319,7 +2319,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
                                     "time dataset <%(base)s>") %
                                   {'map': map.get_map_id(),
                                    'base': self.base.get_id()})
-            if connected is True:
+            if connection_state_changed is True:
                 dbif.close()
             return ""
 
@@ -2344,7 +2344,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
             dbif.execute_transaction(statement)
             statement = ""
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
         # decrease the counter
@@ -2383,7 +2383,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
         if not self.get_map_register():
             return
 
-        dbif, connected = init_dbif(dbif)
+        dbif, connection_state_changed = init_dbif(dbif)
 
         map_time = None
 
@@ -2547,7 +2547,7 @@ class AbstractSpaceTimeDataset(AbstractDataset):
         self.base.set_mtime(datetime.now())
         self.base.update(dbif)
 
-        if connected:
+        if connection_state_changed:
             dbif.close()
 
 ###############################################################################

lib/python/temporal/aggregation.py

@@ -223,7 +223,7 @@ def aggregate_by_topology(granularity_list, granularity, map_list, topo_list,
 
     msgr = get_tgis_message_interface()
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     topo_builder = SpatioTemporalTopologyBuilder()
     topo_builder.build(mapsA=granularity_list, mapsB=map_list, spatial=spatial)
@@ -329,7 +329,7 @@ def aggregate_by_topology(granularity_list, granularity, map_list, topo_list,
 
     process_queue.wait()
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     msgr.percent(1, 1, 1)

lib/python/temporal/core.py

@@ -10,7 +10,7 @@ Usage:
     >>> # Create the temporal database
     >>> tgis.init()
     >>> # Establish a database connection
-    >>> dbif, connected = tgis.init_dbif(None)
+    >>> dbif, connection_state_changed = tgis.init_dbif(None)
     >>> dbif.connect()
     >>> # Execute a SQL statement
     >>> dbif.execute_transaction("SELECT datetime(0, 'unixepoch', 'localtime');")
@@ -379,7 +379,7 @@ def get_tgis_metadata(dbif=None):
        :returns: The selected rows with key/value columns or None
     """
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     # Select metadata if the table is present
     try:
@@ -389,7 +389,7 @@ def get_tgis_metadata(dbif=None):
     except:
         rows = None
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return rows
@@ -927,7 +927,7 @@ def _create_tgis_metadata_table(content, dbif=None):
                       that should be stored in the metadata table
        :param dbif: The database interface to be used
     """
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
     statement = "CREATE TABLE tgis_metadata (key VARCHAR NOT NULL, value VARCHAR);\n"
     dbif.execute_transaction(statement)
 
@@ -936,7 +936,7 @@ def _create_tgis_metadata_table(content, dbif=None):
                     "(\'%s\' , \'%s\');\n" % (str(key), str(content[key]))
         dbif.execute_transaction(statement)
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
 ###############################################################################
@@ -1424,34 +1424,36 @@ class DBConnection(object):
 def init_dbif(dbif):
     """This method checks if the database interface connection exists,
         if not a new one will be created, connected and True will be returned.
-        If the database interface exists but is connected, the connection will
-        be established.
+        If the database interface exists but is not connected, the connection
+        will be established.
 
-        :returns: the tuple (dbif, True|False)
+        :returns: the tuple (dbif, connection_state_changed)
 
         Usage code sample:
 
         .. code-block:: python
 
-            dbif, connect = tgis.init_dbif(None)
+            dbif, connection_state_changed = tgis.init_dbif(None)
 
             sql = dbif.mogrify_sql_statement(["SELECT * FROM raster_base WHERE ? = ?"],
                                                    ["id", "soil@PERMANENT"])
             dbif.execute_transaction(sql)
 
-            if connect:
+            if connection_state_changed:
                 dbif.close()
 
     """
+    connection_state_changed = False
+
     if dbif is None:
         dbif = SQLDatabaseInterfaceConnection()
         dbif.connect()
-        return dbif, True
+        connection_state_changed = True
     elif dbif.is_connected() is False:
         dbif.connect()
-        return dbif, True
+        connection_state_changed = True
 
-    return dbif, False
+    return dbif, connection_state_changed
 
 ###############################################################################
 

lib/python/temporal/gui_support.py

@@ -35,7 +35,7 @@ def tlist_grouped(type, group_type=False, dbif=None):
     :return: directory of mapsets/elements
     """
     result = {}
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     mapset = None
     if type == 'stds':
@@ -70,7 +70,7 @@ def tlist_grouped(type, group_type=False, dbif=None):
             else:
                 result[mapset].append(name)
 
-    if connected is True:
+    if connection_state_changed is True:
         dbif.close()
 
     return result
@@ -87,7 +87,7 @@ def tlist(type, dbif=None):
     """
     id = None
     sp = dataset_factory(type, id)
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     mapsets = get_available_temporal_mapsets()
 
@@ -115,7 +115,7 @@ def tlist(type, dbif=None):
                 for col in row:
                     output.append(str(col))
 
-    if connected is True:
+    if connection_state_changed is True:
         dbif.close()
 
     return output

lib/python/temporal/list_stds.py

@@ -76,7 +76,7 @@ def get_dataset_list(type, temporal_type, columns=None, where=None,
     id = None
     sp = dataset_factory(type, id)
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     mapsets = get_available_temporal_mapsets()
 
@@ -109,7 +109,7 @@ def get_dataset_list(type, temporal_type, columns=None, where=None,
         if rows:
             result[mapset] = rows
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return result
@@ -151,7 +151,7 @@ def list_maps_of_stds(type, input, columns, order, where, separator,
         :param outpath: The path to file where to save output
     """
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
     msgr = get_tgis_message_interface()
 
     sp = open_old_stds(input, type, dbif)
@@ -312,7 +312,7 @@ def list_maps_of_stds(type, input, columns, order, where, separator,
                         print(output)
     if outpath:
         outfile.close()
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
 ###############################################################################

lib/python/temporal/open_stds.py

@@ -68,7 +68,7 @@ def open_old_stds(name, type, dbif=None):
     else:
         msgr.fatal(_("Unknown type: %s") % (type))
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     if not sp.is_in_db(dbif):
         dbif.close()
@@ -77,7 +77,7 @@ def open_old_stds(name, type, dbif=None):
                     'name': name})
     # Read content from temporal database
     sp.select(dbif)
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return sp
@@ -128,14 +128,14 @@ def check_new_stds(name, type, dbif=None, overwrite=False):
         msgr.error(_("Unknown type: %s") % (type))
         return None
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     if sp.is_in_db(dbif) and overwrite is False:
         msgr.fatal(_("Space time %(sp)s dataset <%(name)s> is already in the"
                      " database. Use the overwrite flag.") % {
                    'sp': sp.get_new_map_instance(None).get_type(),
                    'name': name})
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return sp
@@ -161,7 +161,7 @@ def open_new_stds(name, type, temporaltype, title, descr, semantic,
 
        This function will raise a FatalError in case of an error.
     """
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
     msgr = get_tgis_message_interface()
     sp = check_new_stds(name, type, dbif, overwrite)
 
@@ -182,7 +182,7 @@ def open_new_stds(name, type, temporaltype, title, descr, semantic,
 
     sp.insert(dbif)
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return sp
@@ -208,19 +208,19 @@ def check_new_map_dataset(name, layer=None, type="raster",
     mapset = get_current_mapset()
     msgr = get_tgis_message_interface()
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
     map_id = AbstractMapDataset.build_id(name, mapset, layer)
 
     new_map = dataset_factory(type, map_id)
     # Check if new map is in the temporal database
     if new_map.is_in_db(dbif):
         if not overwrite:
-            if connected:
+            if connection_state_changed:
                 dbif.close()
             msgr.fatal(_("Map <%s> is already in temporal database,"
                          " use overwrite flag to overwrite") % (map_id))
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return new_map
@@ -246,7 +246,7 @@ def open_new_map_dataset(name, layer=None, type="raster",
 
     mapset = get_current_mapset()
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
     new_map = check_new_map_dataset(name, layer, type, overwrite, dbif)
 
     # Check if new map is in the temporal database
@@ -259,7 +259,7 @@ def open_new_map_dataset(name, layer=None, type="raster",
     if temporal_extent:
         new_map.set_temporal_extent(temporal_extent)
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return new_map

lib/python/temporal/register.py

@@ -103,7 +103,7 @@ def register_maps_in_space_time_dataset(
         msgr.fatal(_("Please specify %s= or %s=") % ("maps", "file"))
     # We may need the mapset
     mapset = get_current_mapset()
-    dbif, connected = init_dbif(None)
+    dbif, connection_state_changed = init_dbif(None)
 
     # The name of the space time dataset is optional
     if name:
@@ -393,7 +393,7 @@ def register_maps_in_space_time_dataset(
             ds.select(dbif)
             ds.update_from_registered_maps(dbif)
 
-    if connected is True:
+    if connection_state_changed is True:
         dbif.close()
 
     msgr.percent(num_maps, num_maps, 1)
@@ -504,7 +504,7 @@ def register_map_object_list(type, map_list, output_stds,
     import grass.pygrass.modules as pymod
     import copy
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     filename = gscript.tempfile(True)
     file = open(filename, 'w')
@@ -560,7 +560,7 @@ def register_map_object_list(type, map_list, output_stds,
             if map.is_in_db(dbif):
                 map.delete(dbif)
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
 if __name__ == "__main__":

lib/python/temporal/spatio_temporal_relationships.py

@@ -50,7 +50,7 @@ class SpatioTemporalTopologyBuilder(object):
 
             tb.build(maps)
 
-            dbif, connected = init_dbif(None)
+            dbif, connection_state_changed = init_dbif(None)
 
             for map in tb:
                 map.select(dbif)
@@ -782,13 +782,13 @@ def print_temporal_topology_relationships(maps1, maps2=None, dbif=None):
 
     tb.build(maps1, maps2)
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     for _map in tb:
         _map.select(dbif)
         _map.print_info()
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return
@@ -815,13 +815,13 @@ def print_spatio_temporal_topology_relationships(maps1, maps2=None,
 
     tb.build(maps1, maps2, spatial)
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     for _map in tb:
         _map.select(dbif)
         _map.print_info()
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return
@@ -845,7 +845,7 @@ def count_temporal_topology_relationships(maps1, maps2=None, dbif=None):
     tb = SpatioTemporalTopologyBuilder()
     tb.build(maps1, maps2)
 
-    dbif, connected = init_dbif(dbif)
+    dbif, connection_state_changed = init_dbif(dbif)
 
     relations = None
 
@@ -857,7 +857,7 @@ def count_temporal_topology_relationships(maps1, maps2=None, dbif=None):
         else:
             relations = _map.get_number_of_relations()
 
-    if connected:
+    if connection_state_changed:
         dbif.close()
 
     return relations

lib/python/temporal/temporal_algebra.py

@@ -858,7 +858,7 @@ class TemporalAlgebraParser(object):
         grans = []
         start_times = []
         ttypes = {}
-        dbif, connected = init_dbif(self.dbif)
+        dbif, connection_state_changed = init_dbif(self.dbif)
 
         for name in name_list:
             stds = open_old_stds(name, stdstype, dbif)
@@ -2182,7 +2182,7 @@ class TemporalAlgebraParser(object):
         """
 
         if self.run:
-            dbif, connected = init_dbif(self.dbif)
+            dbif, connection_state_changed = init_dbif(self.dbif)
             map_type = None
             if isinstance(t[3], list):
                 num = len(t[3])
@@ -2343,7 +2343,7 @@ class TemporalAlgebraParser(object):
                                                    'mean', dbif,
                                                    overwrite=self.overwrite)
 
-            if connected:
+            if connection_state_changed:
                 dbif.close()
             t[0] = t[3]
         else:

lib/python/temporal/temporal_raster_base_algebra.py

@@ -748,7 +748,7 @@ class TemporalRasterBaseAlgebraParser(TemporalAlgebraParser):
                     register_list.append(map_i)
 
                 # Open connection to temporal database.
-                dbif, connect = init_dbif(self.dbif)
+                dbif, _ = init_dbif(self.dbif)
 
                 # Create result space time dataset.
                 if self.dry_run is False:

lib/python/temporal/temporal_vector_algebra.py

@@ -373,7 +373,7 @@ class TemporalVectorAlgebraParser(TemporalAlgebraParser):
         # Execute the command lists
         if self.run:
             # Open connection to temporal database.
-            dbif, connected = init_dbif(dbif=self.dbif)
+            dbif, connection_state_changed = init_dbif(dbif=self.dbif)
             if isinstance(t[3], list):
                 num = len(t[3])
                 count = 0
@@ -507,7 +507,7 @@ class TemporalVectorAlgebraParser(TemporalAlgebraParser):
 
             # Remove intermediate maps
             self.remove_maps()
-            if connected:
+            if connection_state_changed:
                 dbif.close()
             t[0] = t[3]
 

temporal/t.info/t.info.py

@@ -73,7 +73,7 @@ def main():
     # Make sure the temporal database exists
     tgis.init()
 
-    dbif, connected = tgis.init_dbif(None)
+    dbif, connection_state_changed = tgis.init_dbif(None)
 
     rows = tgis.get_tgis_metadata(dbif)