r5792 - in /1.2: ./ generic_fns/palmer.py -- April 16, 2008 - 21:03

Author: bugman
Date: Wed Apr 16 21:03:02 2008
New Revision: 5792

URL: http://svn.gna.org/viewcvs/relax?rev=5792&view=rev
Log:
Merged revisions 5663 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r5663 | bugman | 2008-04-13 23:45:21 +0200 (Sun, 13 Apr 2008) | 5 lines
  
  Bug fix for the get_mf_data() function.
  
  The call to re.search() needed the '*' commented out as '\*'.
........

Modified:
    1.2/   (props changed)
    1.2/generic_fns/palmer.py

Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 16 21:03:02 2008
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117,5255,5396-5398,5462-5465,5611-5612,5622
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117,5255,5396-5398,5462-5465,5611-5612,5622,5663

Modified: 1.2/generic_fns/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/generic_fns/palmer.py?rev=5792&r1=5791&r2=5792&view=diff
==============================================================================
--- 1.2/generic_fns/palmer.py (original)
+++ 1.2/generic_fns/palmer.py Wed Apr 16 21:03:02 2008
@@ -611,7 +611,7 @@
         err = row[4]
 
         # The Modelfree4 '*' column fusion bug.
-        if search('*', val) or search('*', err):
+        if search('\*', val) or search('\*', err):
             # Split by the '*' character.
             val_row = split(val, '*')
             err_row = split(err, '*')