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

[svn_grass at osgeo.org]

Author: huhabla
Date: 2015-10-19 15:15:19 -0700 (Mon, 19 Oct 2015)
New Revision: 66541

Modified:
   grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py
Log:
temporal framework: Fixed bug in algebra expression that contains temporal topological statements in the if section

Modified: grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py	2015-10-19 22:13:30 UTC (rev 66540)
+++ grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py	2015-10-19 22:15:19 UTC (rev 66541)
@@ -1509,10 +1509,10 @@
                 theninput = self.check_stds(t[7])
                 elseinput = str(t[9])
         elif len(t) == 13:
-            if isinstance(t[7],  int):
+            if t[7] == 'null':
                 theninput = str(t[7] + t[8] + t[9])
                 elseinput = self.check_stds(t[11])
-            elif isinstance(t[9],  int):
+            elif t[9] == 'null':
                 theninput = self.check_stds(t[7])
                 elseinput = str(t[9] + t[10] + t[11])