Changeset 2941 for inundation/load_mesh

Timestamp:

May 23, 2006, 9:11:57 AM (19 years ago)

Author:

duncan

Message:

added more tests to geo_ref. It throws a different error as well now. Updated cornell room

File:

• inundation/load_mesh/loadASCII.py (modified) (5 diffs)

inundation/load_mesh/loadASCII.py

@@ -82 +82 @@
 from os.path import splitext
 
-from coordinate_transforms.geo_reference import Geo_reference,TITLE
+from coordinate_transforms.geo_reference import Geo_reference,TITLE, TitleError
 
 import exceptions
@@ -105 +105 @@
             msg = 'Extension %s is unknown' %ofile[-4:]
             raise IOError, msg
-    except (SyntaxError,IndexError, ValueError): #FIXME No test for ValueError
+    except (TitleError,SyntaxError,IndexError, ValueError): #FIXME No test for ValueError
             msg = 'File could not be opened'
             raise IOError, msg  
@@ -993 +993 @@
 
     #FIXME (Ole): This function should really return a Geospatial_data object.      #FIXME (DSG): Do you know it does, in the points dic?
+    #No.  Where this function is used, geospatial objects should be used.
     
     if ofile[-4:]== ".xya":
@@ -1000 +1001 @@
                     fd = open(ofile)
                     points_dict = _read_xya_file(fd, ',')
-                except SyntaxError:
+                except TitleError: # this is catching the error thrown by geo_ref
                     fd.close()
                     fd = open(ofile)
@@ -1009 +1010 @@
             fd.close()
         except (IndexError,ValueError,SyntaxError):
-            fd.close()    
+            fd.close()
+            msg = 'Could not open file %s ' %ofile
+            raise IOError, msg
+        except TitleError:
+            print "reclassifying title error"
+            fd.close()
             msg = 'Could not open file %s ' %ofile
             raise IOError, msg