Changeset 4470

Timestamp:

May 21, 2007, 4:38:46 PM (18 years ago)

Author:

duncan

Message:

changing error messages for loading .txt/.csv files

Location:

anuga_core/source/anuga

Files:

• coordinate_transforms/geo_reference.py (modified) (1 diff)
• geospatial_data/geospatial_data.py (modified) (9 diffs)
• geospatial_data/test_geospatial_data.py (modified) (5 diffs)

anuga_core/source/anuga/coordinate_transforms/geo_reference.py

@@ -287 +287 @@
             other.zone = self.zone            
         else:    
-            msg = 'Both geospatial_data objects must be in the same '+\
+            msg = 'Geospatial data must be in the same '+\
                   'ZONE to allow reconciliation. I got zone %d and %d'\
                   %(self.zone, other.zone)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -463 +463 @@
         if self.attributes is None:
             if other.attributes is not None:
-                msg = 'Both geospatial_data objects must have the same \n'
+                msg = 'Geospatial data must have the same \n'
                 msg += 'attributes to allow addition.'
                 raise Exception, msg
@@ -478 +478 @@
 
                 else:
-                    msg = 'Both geospatial_data objects must have the same \n'
+                    msg = 'Geospatial data must have the same \n'
                     msg += 'attributes to allow addition.'
                     raise Exception, msg
@@ -492 +492 @@
 
     def import_points_file(self, file_name, delimiter=None, verbose=False):
-        """ load an .xya or .pts file
+        """ load an .txt, .csv or .xya or .pts file
         Note: will throw an IOError if it can't load the file.
         Catch these!
@@ -526 +526 @@
                 fd.close()    
                 msg = 'Could not open file %s ' %file_name
+                msg += 'Check the file location.'
                 raise IOError, msg
             except IOError, e:
@@ -543 +544 @@
         
         elif file_name[-4:]== ".txt" or file_name[-4:]== ".csv":
-            #let's do ticket#116 stuff
-            #
             try:
                 data_points, attributes, geo_reference =\
                              _read_csv_file(file_name, verbose)
-            except IOError, e:    
-                msg = 'Could not open file %s ' %file_name
-                raise IOError, msg        
+            except IOError, e:
+                # This should only be if a file is not found
+                msg = 'Could not open file %s. ' %file_name
+                msg += 'Check the file location.'
+                raise IOError, msg
+            except SyntaxError, e:
+                # This should only be if there is a format error
+                msg = 'Could not open file %s. \n' %file_name
+                msg += Error_message['IOError']
+                #print "msg", msg
+                raise SyntaxError, msg
         else:      
             msg = 'Extension %s is unknown' %file_name[-4:]
@@ -823 +830 @@
                 del self.file_pointer
                 raise
+            except SyntaxError:
+                self.file_pointer.close()
+                del self.header
+                del self.file_pointer
+                # This should only be if there is a format error
+                msg = 'Could not open file %s. \n' %self.file_name
+                msg += Error_message['IOError']
+                raise SyntaxError, msg
         return geo
+##################### Error messages ###########
+Error_message = {}
+Em = Error_message
+Em['IOError'] = "NOTE: The format for a comma seperated .txt/.csv file is:\n"
+Em['IOError'] += "           1st line:     [column names]\n"
+Em['IOError'] += "           other lines:  x, y, [attributes]\n"
+Em['IOError'] += "\n"
+Em['IOError'] += "           for example:\n"
+Em['IOError'] += "           x, y, elevation, friction\n"
+Em['IOError'] += "           0.6, 0.7, 4.9, 0.3\n"
+Em['IOError'] += "           1.9, 2.8, 5, 0.3\n"
+Em['IOError'] += "           2.7, 2.4, 5.2, 0.3\n"
+Em['IOError'] += "\n"
+Em['IOError'] += "The first two columns are assumed to be x, y coordinates.\n"
+Em['IOError'] += "The attributes must be numeric.\n"
 
 def _set_using_lat_long(latitudes,
@@ -924 +954 @@
     dic['attributelist']['elevation'] = [[7.0,5.0]
     """
-    
-    #from anuga.shallow_water.data_manager import Exposure_csv
-    #csv =Exposure_csv(file_name)
     
     file_pointer = open(file_name)
@@ -970 +997 @@
     #This is to remove the x and y headers.
     header = header[:]
-    x_header = header.pop(0)
-    y_header = header.pop(0)
+    try:
+        x_header = header.pop(0)
+        y_header = header.pop(0)
+    except IndexError:
+        # if there are not two columns this will occur.
+        # eg if it is a space seperated file
+        raise SyntaxError
     
     read_lines = 0
@@ -983 +1015 @@
             continue
         read_lines += 1
-        if True: # remove.. #if numbers != []:
-            try:
-                x = float(numbers[0])
-                y = float(numbers[1])
-                points.append([x,y])
-                numbers.pop(0)
-                numbers.pop(0)
-                if len(header) != len(numbers):
-                    
-                    file_pointer.close() 
-                    # It might not be a problem with the header
-                    #raise TitleAmountError
-                    msg = "File load error.  There might be a problem with the file header"
-                    raise IOError, msg
-                for i,num in enumerate(numbers):
-                    num.strip()
-                    if num != '\n' and num != '':
-                        #attributes.append(float(num))
-                        att_dict.setdefault(header[i],[]).append(float(num))
-            #except IOError:           
-            except ValueError:
-                raise SyntaxError
+        try:
+            x = float(numbers[0])
+            y = float(numbers[1])
+            points.append([x,y])
+            numbers.pop(0)
+            numbers.pop(0)
+            if len(header) != len(numbers):
+                file_pointer.close() 
+                msg = "File load error.  There might be a problem with the file header"
+                raise SyntaxError, msg
+            for i,num in enumerate(numbers):
+                num.strip()
+                if num != '\n' and num != '':
+                    #attributes.append(float(num))
+                    att_dict.setdefault(header[i],[]).append(float(num))
+        #except IOError:           
+        except ValueError:
+            raise SyntaxError
     if points == []:
         raise StopIteration

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -978 +978 @@
 
     def test_load_csv_lat_long_bad_blocking(self):
-        
+        """
+        test_load_csv_lat_long_bad_blocking(self):
+        Different zones in Geo references
+        """
         fileName = tempfile.mktemp(".csv")
         file = open(fileName,"w")
@@ -989 +992 @@
                                   load_file_now=False)
         
+        #for i in results:
+        #    pass
         try:
             for i in results:
@@ -1036 +1041 @@
     def test_load_csv_bad(self):
         """ test_load_csv_bad(self):
-        space delimited
+        header column, body column missmatch
+        (Format error)
         """
         import os
@@ -1053 +1059 @@
         # Blocking
         geo_list = []
+        #for i in results:
+        #    geo_list.append(i)
         try:
             for i in results:
                 geo_list.append(i)
-        except IOError:
+        except SyntaxError:
             pass
         else:
@@ -1063 +1071 @@
         os.remove(fileName)
 
-        
+    def test_load_csv_badII(self):
+        """ test_load_csv_bad(self):
+        header column, body column missmatch
+        (Format error)
+        """
+        import os
+       
+        fileName = tempfile.mktemp(".txt")
+        file = open(fileName,"w")
+        file.write(" x,y,elevation ,  speed \n\
+1.0, 0.0, 10.0, 0.0\n\
+0.0, 1.0, 0.0, 10\n\
+1.0, 0.0 ,10.4 yeah\n")
+        file.close()
+
+        results = Geospatial_data(fileName, max_read_lines=2,
+                                  load_file_now=False)
+
+        # Blocking
+        geo_list = []
+        #for i in results:
+        #    geo_list.append(i)
+        try:
+            for i in results:
+                geo_list.append(i)
+        except SyntaxError:
+            pass
+        else:
+            msg = 'bad file did not raise error!'
+            raise msg
+        os.remove(fileName)
+
+    def test_load_csv_badIII(self):
+        """ test_load_csv_bad(self):
+        space delimited
+        """
+        import os
+       
+        fileName = tempfile.mktemp(".txt")
+        file = open(fileName,"w")
+        file.write(" x y elevation   speed \n\
+1. 0.0 10.0 0.0\n\
+0.0 1.0 0.0 10.0\n\
+1.0 0.0 10.4 40.0\n")
+        file.close()
+
+        try:
+            results = Geospatial_data(fileName, max_read_lines=2,
+                                      load_file_now=True)
+        except SyntaxError:
+            pass
+        else:
+            msg = 'bad file did not raise error!'
+            raise msg
+        os.remove(fileName)
+        
+    def test_load_csv_badIV(self):
+        """ test_load_csv_bad(self):
+        header column, body column missmatch
+        (Format error)
+        """
+        import os
+       
+        fileName = tempfile.mktemp(".txt")
+        file = open(fileName,"w")
+        file.write(" x,y,elevation ,  speed \n\
+1.0, 0.0, 10.0, wow\n\
+0.0, 1.0, 0.0, ha\n\
+1.0, 0.0 ,10.4, yeah\n")
+        file.close()
+
+        results = Geospatial_data(fileName, max_read_lines=2,
+                                  load_file_now=False)
+
+        # Blocking
+        geo_list = []
+        #for i in results:
+         #   geo_list.append(i)
+        try:
+            for i in results:
+                geo_list.append(i)
+        except SyntaxError:
+            pass
+        else:
+            msg = 'bad file did not raise error!'
+            raise msg
+        os.remove(fileName)
+
     def test_load_pts_blocking(self):
         #This is pts!