r6383 - /1.3/generic_fns/results.py -- June 22, 2008 - 13:38

Author: bugman
Date: Sun Jun 22 13:22:20 2008
New Revision: 6383

URL: http://svn.gna.org/viewcvs/relax?rev=6383&view=rev
Log:
The generic_fns.xml module is now accessed directly from the generic_fns code.


Modified:
    1.3/generic_fns/results.py

Modified: 1.3/generic_fns/results.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/results.py?rev=6383&r1=6382&r2=6383&view=diff
==============================================================================
--- 1.3/generic_fns/results.py (original)
+++ 1.3/generic_fns/results.py Sun Jun 22 13:22:20 2008
@@ -25,6 +25,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+from generic_fns import xml
 from relax_errors import RelaxError, RelaxFileEmptyError, RelaxNoPipeError
 from relax_io import extract_data, open_write_file, strip
 from specific_fns.setup import get_specific_fn, get_string
@@ -63,8 +64,7 @@
 
     # Specific results writing function.
     if format == 'xml':
-        format = 'XML'
-        self.write_function = 
self.relax.specific_setup.setup('write_xml_results', function_type, 
raise_error=0)
+        self.write_function = xml.write
     elif format == 'columnar':
         self.write_function = 
self.relax.specific_setup.setup('write_columnar_results', function_type, 
raise_error=0)
     else:
@@ -87,8 +87,7 @@
 
     # Specific results writing function.
     if format == 'xml':
-        format = 'XML'
-        read_function = get_specific_fn('read_xml_results', 
ds[ds.current_pipe].pipe_type, raise_error=False)
+        read_function = xml.read
     elif format == 'columnar':
         read_function = get_specific_fn('read_columnar_results', 
ds[ds.current_pipe].pipe_type, raise_error=False)
     else:
@@ -129,8 +128,7 @@
 
     # Specific results writing function.
     if format == 'xml':
-        format = 'XML'
-        write_function = get_specific_fn('write_xml_results', 
ds[ds.current_pipe].pipe_type, raise_error=False)
+        write_function = xml.write
     elif format == 'columnar':
         write_function = get_specific_fn('write_columnar_results', 
ds[ds.current_pipe].pipe_type, raise_error=False)
     else: