Changeset 4573

Timestamp:

Jul 2, 2007, 11:15:16 AM (17 years ago)

Author:

duncan

Message:

small fixes

File:

• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (5 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -147 +147 @@
                 msg = 'No file specified yet a delimiter is provided!'
                 raise ValueError, msg
-            file_name = None #FIXME (Ole): Isn't this line superfluous
             
             if latitudes is not None or longitudes is not None or \
@@ -759 +758 @@
         if self.file_name[-4:] == ".xya":
             # FIXME (Ole): shouldn't the xya format be replaced by txt/csv?
-
+            #  Currently both file formats are used.
+            
             #let's just read it all
             pass
@@ -783 +783 @@
             
         else:
-            # It looks like the file is assumed to be a csv file
+            # assume the file is a csv file
             file_pointer = open(self.file_name)
             self.header, self.file_pointer = \
@@ -798 +798 @@
         if self.file_name[-4:]== ".xya" :
             # FIXME (Ole): shouldn't the xya format be replaced by txt/csv? 
+            #  Currently both file formats are used.
             
             if not hasattr(self,'finished_reading') or \
@@ -843 +844 @@
             
         else:
+            # assume the file is a csv file
             try:
                 pointlist, att_dict, geo_ref, self.file_pointer = \