[GRASS-SVN] r66308 - grass/trunk/lib/python/temporal

[svn_grass at osgeo.org]

Author: huhabla
Date: 2015-09-23 07:35:57 -0700 (Wed, 23 Sep 2015)
New Revision: 66308

Modified:
   grass/trunk/lib/python/temporal/extract.py
Log:
temporal framework: Fixed stds name replacement to avoid conflicts with basenames


Modified: grass/trunk/lib/python/temporal/extract.py
===================================================================
--- grass/trunk/lib/python/temporal/extract.py	2015-09-23 13:59:24 UTC (rev 66307)
+++ grass/trunk/lib/python/temporal/extract.py	2015-09-23 14:35:57 UTC (rev 66308)
@@ -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: