More usage of the PyGRASS message interface

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58211 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/python/temporal/abstract_space_time_dataset.py

@@ -2043,12 +2043,12 @@ class AbstractSpaceTimeDataset(AbstractDataset):
             statement += map.metadata.get_update_statement_mogrified(dbif)
 
             if map.get_layer():
-                core.verbose(_("Created register table <%s> for "
+                self.msgr.verbose(_("Created register table <%s> for "
                                "%s map <%s> with layer %s") %
                                 (map_register_table, map.get_type(),
                                  map.get_map_id(), map.get_layer()))
             else:
-                core.verbose(_("Created register table <%s> for %s map <%s>") %
+                self.msgr.verbose(_("Created register table <%s> for %s map <%s>") %
                                 (map_register_table, map.get_type(),
                                  map.get_map_id()))
 

lib/python/temporal/aggregation.py

@@ -120,7 +120,9 @@ def aggregate_raster_maps(inputs, base, start, end, count, method,
        @param dbif The temporal database interface to use
     """
 
-    core.verbose(_("Aggregate %s raster maps") % (len(inputs)))
+    msgr = get_tgis_message_interface()
+
+    msgr.verbose(_("Aggregate %s raster maps") % (len(inputs)))
     output = "%s_%i" % (base, count)
 
     mapset = libgis.G_mapset()
@@ -134,11 +136,11 @@ def aggregate_raster_maps(inputs, base, start, end, count, method,
             new_map.delete(dbif)
             new_map = RasterDataset(map_id)
         else:
-            core.error(_("Raster map <%s> is already in temporal database, " \
+            msgr.error(_("Raster map <%s> is already in temporal database, " \
                          "use overwrite flag to overwrite"))
             return
 
-    core.verbose(_("Compute aggregation of maps between %(st)s - %(end)s" % {
+    msgr.verbose(_("Compute aggregation of maps between %(st)s - %(end)s" % {
                    'st': str(start), 'end': str(end)}))
 
     # Create the r.series input file

lib/python/temporal/extract.py

@@ -53,6 +53,7 @@ def extract_dataset(input, output, type, where, expression, base, nprocs=1,
         core.fatal(_("You need to specify the base name of new created maps"))
 
     mapset = get_current_mapset()
+    msgr = get_tgis_message_interface()
 
     dbif = SQLDatabaseInterfaceConnection()
     dbif.connect()
@@ -108,25 +109,25 @@ def extract_dataset(input, output, type, where, expression, base, nprocs=1,
                         new_map.delete(dbif)
                         new_map = sp.get_new_map_instance(map_id)
                     else:
-                        core.error(_("Map <%s> is already in temporal database"
+                        msgr.error(_("Map <%s> is already in temporal database"
                                      ", use overwrite flag to overwrite") %
                                     (new_map.get_map_id()))
                         continue
 
                 # Add process to the process list
                 if type == "raster":
-                    #core.verbose(_("Apply r.mapcalc expression: \"%s\"")
-                    #             % expr)
+                    msgr.verbose(_("Apply r.mapcalc expression: \"%s\"")
+                                 % expr)
                     proc_list.append(Process(target=run_mapcalc2d,
                                              args=(expr,)))
                 elif type == "raster3d":
-                    #core.verbose(_("Apply r3.mapcalc expression: \"%s\"")
-                    #             % expr)
+                    msgr.verbose(_("Apply r3.mapcalc expression: \"%s\"")
+                                 % expr)
                     proc_list.append(Process(target=run_mapcalc3d,
                                              args=(expr,)))
                 elif type == "vector":
-                    #core.verbose(_("Apply v.extract where statement: \"%s\"")
-                    #             % expression)
+                    msgr.verbose(_("Apply v.extract where statement: \"%s\"")
+                                 % expression)
                     if row["layer"]:
                         proc_list.append(Process(target=run_vector_extraction,
                                                  args=(row["name"] + "@" + \

lib/python/temporal/mapcalc.py

@@ -80,6 +80,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
     dbif.connect()
 
     mapset = get_current_mapset()
+    msgr = get_tgis_message_interface()
 
     input_name_list = inputs.split(",")
 
@@ -101,9 +102,9 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
     # Sample all inputs by the first input and create a sample matrix
     if spatial:
-        core.message(_("Start spatio-temporal sampling"))
+        msgr.message(_("Start spatio-temporal sampling"))
     else:
-        core.message(_("Start temporal sampling"))
+        msgr.message(_("Start temporal sampling"))
     map_matrix = []
     id_list = []
     sample_map_list = []
@@ -120,7 +121,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
             # In case samples are not found
             if not list and len(list) == 0:
                 dbif.close()
-                core.message(_("No samples found for map calculation"))
+                msgr.message(_("No samples found for map calculation"))
                 return 0
 
             # The fist entries are the samples
@@ -147,7 +148,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
                     continue
 
                 if len(maplist) > 1:
-                    core.warning(_("Found more than a single map in a sample "
+                    msgr.warning(_("Found more than a single map in a sample "
                                    "granule. Only the first map is used for "
                                    "computation. Use t.rast.aggregate.ds to "
                                    "create synchronous raster datasets."))
@@ -165,7 +166,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
         if list is None:
             dbif.close()
-            core.message(_("No maps in input dataset"))
+            msgr.message(_("No maps in input dataset"))
             return 0
 
         map_name_list = []
@@ -181,7 +182,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
     if len(map_matrix) > 0:
 
-        core.message(_("Start mapcalc computation"))
+        msgr.message(_("Start mapcalc computation"))
 
         count = 0
         # Get the number of samples
@@ -231,7 +232,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
                     new_map.delete(dbif)
                     new_map = first_input.get_new_map_instance(map_id)
                 else:
-                    core.error(_("Map <%s> is already in temporal database, "
+                    msgr.error(_("Map <%s> is already in temporal database, "
                                  "use overwrite flag to overwrite"))
                     continue
 
@@ -251,7 +252,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
             map_list.append(new_map)
 
-            #core.verbose(_("Apply mapcalc expression: \"%s\"") % expr)
+            msgr.verbose(_("Apply mapcalc expression: \"%s\"") % expr)
 
             # Start the parallel r.mapcalc computation
             if type == "raster":
@@ -276,7 +277,7 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
                 proc_list = []
 
         # Register the new maps in the output space time dataset
-        core.message(_("Start map registration in temporal database"))
+        msgr.message(_("Start map registration in temporal database"))
 
         temporal_type, semantic_type, title, description = first_input.get_initial_values()