r7415 - /1.3/generic_fns/structure/api_base.py -- September 27, 2008 - 18:55

Author: bugman
Date: Sat Sep 27 18:55:16 2008
New Revision: 7415

URL: http://svn.gna.org/viewcvs/relax?rev=7415&view=rev
Log:
Updated the from_xml() method to catch RelaxErrors.


Modified:
    1.3/generic_fns/structure/api_base.py

Modified: 1.3/generic_fns/structure/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/api_base.py?rev=7415&r1=7414&r2=7415&view=diff
==============================================================================
--- 1.3/generic_fns/structure/api_base.py (original)
+++ 1.3/generic_fns/structure/api_base.py Sat Sep 27 18:55:16 2008
@@ -35,7 +35,7 @@
 
 # relax module import.
 from data.relax_xml import fill_object_contents, xml_to_object
-from relax_errors import RelaxFileError, RelaxImplementError
+from relax_errors import RelaxError, RelaxFileError, RelaxImplementError
 from relax_warnings import RelaxWarning
 
 
@@ -232,16 +232,28 @@
 
         # Loop over the structures and load them.
         for i in xrange(self.num):
-            # Now load the structure from file again.
-            loaded = self.load_pdb(file_path=self.path[i] + sep + 
self.file[i], model=None, struct_index=i)
+            # Load the structure from file and path.
+            if self.path[i]:
+                try:
+                    loaded = self.load_pdb(file_path=self.path[i] + sep + 
self.file[i], model=None, struct_index=i)
+                except RelaxError:
+                    loaded = False
+            else:
+                loaded = False
 
             # Try without the path to search for the file in the current 
directory.
             if not loaded:
-                loaded = self.load_pdb(file_path=self.file[i], model=None, 
struct_index=i)
+                try:
+                    loaded = self.load_pdb(file_path=self.file[i], 
model=None, struct_index=i)
+                except RelaxError:
+                    loaded = False
 
             # Try in the path of the results file.
             if not loaded:
-                loaded = self.load_pdb(file_path=dir + sep + self.file[i], 
model=None, struct_index=i)
+                try:
+                    loaded = self.load_pdb(file_path=dir + sep + 
self.file[i], model=None, struct_index=i)
+                except RelaxError:
+                    loaded = False
 
             # Can't load the file.
             if not loaded: