r8611 - /branches/multi_structure/generic_fns/structure/api_base.py -- January 22, 2009 - 17:08

Author: bugman
Date: Thu Jan 22 17:08:18 2009
New Revision: 8611

URL: http://svn.gna.org/viewcvs/relax?rev=8611&view=rev
Log:
The MolContainers are now properly set up.  Before the wrong classes were 
initialised.


Modified:
    branches/multi_structure/generic_fns/structure/api_base.py

Modified: branches/multi_structure/generic_fns/structure/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/generic_fns/structure/api_base.py?rev=8611&r1=8610&r2=8611&view=diff
==============================================================================
--- branches/multi_structure/generic_fns/structure/api_base.py (original)
+++ branches/multi_structure/generic_fns/structure/api_base.py Thu Jan 22 
17:08:18 2009
@@ -971,17 +971,16 @@
         if not self.is_empty():
             raise RelaxFromXMLNotEmptyError, self.__class__.__name__
 
-        # Some imports (here to break circular import issues).
-        from internal import Internal
-        from scientific import Scientific
-
         # Loop over the molecules.
         for mol_node in mol_nodes:
+            # Some imports (here to break circular import issues).
+            if id == 'internal':
+                from internal import MolContainer
+            elif id == 'scientific':
+                from scientific import MolContainer
+
             # Initialise a MolContainer instance.
-            if id == 'internal':
-                mol_cont = Internal()
-            elif id == 'scientific':
-                mol_cont = Scientific()
+            mol_cont = MolContainer()
 
             # Get the molecule name.
             name = mol_node.getAttribute('name')
@@ -992,7 +991,7 @@
             self.add_item(mol_name=name, mol_cont=mol_cont)
 
             # Execute the specific MolContainer from_xml() method.
-            self[-1].from_xml(mol_node)
+            #self[-1].from_xml(mol_node)
 
 
     def to_xml(self, doc, element):