[GRASS-SVN] r60828 - in grass/branches/releasebranch_7_0: . lib/python/temporal

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-06-14 05:14:08 -0700 (Sat, 14 Jun 2014)
New Revision: 60828

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/python/temporal/abstract_space_time_dataset.py
   grass/branches/releasebranch_7_0/lib/python/temporal/register.py
   grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py
Log:
temporal: backport of r60732 + r60733


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Added: svn:mergeinfo
   + /grass/trunk:60732-60733

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/abstract_space_time_dataset.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/abstract_space_time_dataset.py	2014-06-14 12:11:06 UTC (rev 60827)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/abstract_space_time_dataset.py	2014-06-14 12:14:08 UTC (rev 60828)
@@ -1775,7 +1775,7 @@
 
         date_list.append((start, end))
 
-        self. _update_map_timestamps(maps, date_list, dbif)
+        self._update_map_timestamps(maps, date_list, dbif)
 
         if connected:
             dbif.close()

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/register.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/register.py	2014-06-14 12:11:06 UTC (rev 60827)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/register.py	2014-06-14 12:14:08 UTC (rev 60828)
@@ -30,7 +30,7 @@
 def register_maps_in_space_time_dataset(
     type, name, maps=None, file=None, start=None,
     end=None, unit=None, increment=None, dbif=None,
-        interval=False, fs="|"):
+        interval=False, fs="|", update_cmd_list=True):
     """!Use this method to register maps in space time datasets.
 
        Additionally a start time string and an increment string can be
@@ -60,6 +60,8 @@
        @param interval If True, time intervals are created in case the start
                        time and an increment is provided
        @param fs Field separator used in input file
+       @param update_cmd_list If is True, the command that was invoking this process
+                              will be written to the process history
     """
     start_time_in_file = False
     end_time_in_file = False
@@ -322,7 +324,8 @@
     if name and map_object_list:
         msgr.message(_("Update space time raster dataset"))
         sp.update_from_registered_maps(dbif)
-        sp.update_command_string(dbif=dbif)
+        if update_cmd_list is True:
+            sp.update_command_string(dbif=dbif)
 
     # Update affected datasets
     if datatsets_to_modify:

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py	2014-06-14 12:11:06 UTC (rev 60827)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py	2014-06-14 12:14:08 UTC (rev 60828)
@@ -442,7 +442,8 @@
         register_maps_in_space_time_dataset(
             type=sp.get_new_map_instance(None).get_type(),
             name=output, file=new_list_file_name, start="file",
-            end="file", unit=relative_time_unit, dbif=None, fs=fs)
+            end="file", unit=relative_time_unit, dbif=None, fs=fs,
+            update_cmd_list=False)
 
         os.chdir(old_cwd)
     except: