r8644 - /branches/ave_noe/generic_fns/noesy.py -- January 26, 2009 - 13:30

Author: bugman
Date: Mon Jan 26 13:30:06 2009
New Revision: 8644

URL: http://svn.gna.org/viewcvs/relax?rev=8644&view=rev
Log:
The non-implemented function generic_fns.xplor.parse_noe_restraints() is now 
being called.


Modified:
    branches/ave_noe/generic_fns/noesy.py

Modified: branches/ave_noe/generic_fns/noesy.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/ave_noe/generic_fns/noesy.py?rev=8644&r1=8643&r2=8644&view=diff
==============================================================================
--- branches/ave_noe/generic_fns/noesy.py (original)
+++ branches/ave_noe/generic_fns/noesy.py Mon Jan 26 13:30:06 2009
@@ -25,10 +25,12 @@
 
 # Python module imports.
 from re import search
+from string import split
 
 # relax module imports.
 from generic_fns import pipes
 from generic_fns.mol_res_spin import exists_mol_res_spin_data
+from generic_fns.xplor import parse_noe_restraints
 from relax_errors import RelaxNoSequenceError
 from relax_io import open_read_file
 
@@ -89,7 +91,11 @@
 
     # Open the file.
     file = open_read_file(file_name=file, dir=dir)
-    lines = file.readlines()
+    data = file.read()
+    file.close()
+
+    # The lines of the file.
+    lines = split(data, '\n')
 
     # Determine the file type.
     format = __file_format(lines)
@@ -106,4 +112,6 @@
         if upper_col == None:
             raise RelaxError, "The upper_col argument must be specified for 
the generically formatted NOE restraint file."
 
-
+    # Parse and extract the NOE restraints.
+    if format == 'xplor':
+        restraints = parse_noe_restraints(data)