r7359 - /1.3/data/pipe_container.py -- September 26, 2008 - 18:13

Author: bugman
Date: Fri Sep 26 18:13:12 2008
New Revision: 7359

URL: http://svn.gna.org/viewcvs/relax?rev=7359&view=rev
Log:
Fixes for the from_xml() method for the structural object.


Modified:
    1.3/data/pipe_container.py

Modified: 1.3/data/pipe_container.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=7359&r1=7358&r2=7359&view=diff
==============================================================================
--- 1.3/data/pipe_container.py (original)
+++ 1.3/data/pipe_container.py Fri Sep 26 18:13:12 2008
@@ -148,16 +148,18 @@
             parser = str(str_nodes[0].getAttribute('id'))
 
             # Create the structural object.
+            fail = False
             if parser == 'scientific':
                 self.structure = 
generic_fns.structure.scientific.Scientific_data()
-            elif parser == 'intrnal':
+            elif parser == 'internal':
                 self.structure = generic_fns.structure.internal.Internal()
             else:
                 warn(RelaxWarning("The structural file parser " + `parser` + 
" is unknown.  The structure will not be loaded."))
-                pass
+                fail = True
 
             # Fill its contents.
-            self.structure.from_xml(str_nodes[0])
+            if not fail:
+                self.structure.from_xml(str_nodes[0])
 
 
     def is_empty(self):