[GRASS-SVN] r66313 - grass/branches/releasebranch_7_0/lib/python/temporal

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-09-23 12:37:39 -0700 (Wed, 23 Sep 2015)
New Revision: 66313

Modified:
   grass/branches/releasebranch_7_0/lib/python/temporal/extract.py
Log:
temporal framework: Fixed stds name replacement to avoid conflicts with basenames (trunk, r66308)

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/extract.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/extract.py	2015-09-23 19:26:15 UTC (rev 66312)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/extract.py	2015-09-23 19:37:39 UTC (rev 66313)
@@ -91,11 +91,12 @@
 
                 # We need to modify the r(3).mapcalc expression
                 if type != "vector":
-                    expr = "%s = %s" % (map_name, expression)
-
+                    expr = expression
                     expr = expr.replace(sp.base.get_map_id(), row["id"])
                     expr = expr.replace(sp.base.get_name(), row["id"])
 
+                    expr = "%s = %s" % (map_name, expr)
+
                     # We need to build the id
                     map_id = AbstractMapDataset.build_id(map_name, mapset)
                 else: