소스 검색

Bugfix in t.sample and t.unregister.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53085 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert 12 년 전
부모
커밋
81d8421d63
2개의 변경된 파일16개의 추가작업 그리고 14개의 파일을 삭제
  1. 15 13
      lib/python/temporal/space_time_datasets_tools.py
  2. 1 1
      temporal/t.unregister/t.unregister.py

+ 15 - 13
lib/python/temporal/space_time_datasets_tools.py

@@ -223,19 +223,20 @@ def register_maps_in_space_time_dataset(
             
             # Safe the datasets that must be updated
             datasets = map.get_registered_datasets(dbif)
-            for dataset in datasets:
-                datatsets_to_modify[dataset["id"]] = dataset["id"]
-            
-            if name and map.get_temporal_type() != sp.get_temporal_type():
-                dbif.close()
-                if map.get_layer():
-                    core.fatal(_("Unable to register %s map <%s> with layer. "
-                                 "The temporal types are different.") %
-                               (map.get_type(), map.get_map_id(), map.get_layer()))
-                else:
-                    core.fatal(_("Unable to register %s map <%s>. "
-                                 "The temporal types are different.") %
-                               (map.get_type(), map.get_map_id()))
+            if datasets:
+                for dataset in datasets:
+                    datatsets_to_modify[dataset["id"]] = dataset["id"]
+                
+                if name and map.get_temporal_type() != sp.get_temporal_type():
+                    dbif.close()
+                    if map.get_layer():
+                        core.fatal(_("Unable to register %s map <%s> with layer. "
+                                     "The temporal types are different.") %
+                                   (map.get_type(), map.get_map_id(), map.get_layer()))
+                    else:
+                        core.fatal(_("Unable to register %s map <%s>. "
+                                     "The temporal types are different.") %
+                                   (map.get_type(), map.get_map_id()))
 
         # Load the data from the grass file database
         map.load()
@@ -664,6 +665,7 @@ def sample_stds_by_stds_topology(intype, sampletype, inputs, sampler, header, se
             string += "%s%s" % ("end_time", separator)
             string += "%s%s" % ("interval_length", separator)
             string += "%s" % ("distance_from_begin")
+            print string
 
         first_time, dummy = mapmatrizes[0][0]["granule"].get_valid_time()
 

+ 1 - 1
temporal/t.unregister/t.unregister.py

@@ -94,7 +94,7 @@ def main():
     dummy = tgis.RasterDataset(None)
 
     # Map names as comma separated string
-    if maps is not None:
+    if maps is not None and maps != "":
         if maps.find(",") == -1:
             maplist = [maps, ]
         else: