r6800 - in /1.3/generic_fns: mol_res_spin.py structure/scientific.py -- July 07, 2008 - 16:07

Author: bugman
Date: Mon Jul  7 15:31:24 2008
New Revision: 6800

URL: http://svn.gna.org/viewcvs/relax?rev=6800&view=rev
Log:
Fixed all calls to generic_fns.mol_res_spin.wildcard_match().

The function is now called generic_fns.relax_re.search().


Modified:
    1.3/generic_fns/mol_res_spin.py
    1.3/generic_fns/structure/scientific.py

Modified: 1.3/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/mol_res_spin.py?rev=6800&r1=6799&r2=6800&view=diff
==============================================================================
--- 1.3/generic_fns/mol_res_spin.py (original)
+++ 1.3/generic_fns/mol_res_spin.py Mon Jul  7 15:31:24 2008
@@ -46,6 +46,7 @@
 from data import Relax_data_store; ds = Relax_data_store()
 from data.mol_res_spin import MoleculeContainer, ResidueContainer, 
SpinContainer
 from generic_fns import pipes
+from generic_fns import relax_re
 from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoSequenceError, 
RelaxRegExpError, RelaxResSelectDisallowError, RelaxSpinSelectDisallowError
 from relax_warnings import RelaxWarning
 
@@ -220,7 +221,7 @@
                 select_mol = True
 
             # A true match.
-            elif wildcard_match(mol.name, self.molecules):
+            elif relax_re.search(mol.name, self.molecules):
                 select_mol = True
         else:
             # No molecule container sent in, therefore the molecule is 
assumed to match.
@@ -233,7 +234,7 @@
                 select_res = True
 
             # A true match.
-            elif wildcard_match(res.name, self.residues) or res.num in 
self.residues:
+            elif relax_re.search(res.name, self.residues) or res.num in 
self.residues:
                 select_res = True
         else:
             # No residue container sent in, therefore the residue is assumed 
to match.
@@ -246,7 +247,7 @@
                 select_spin = True
 
             # A true match.
-            elif wildcard_match(spin.name, self.spins) or spin.num in 
self.spins:
+            elif relax_re.search(spin.name, self.spins) or spin.num in 
self.spins:
                 select_spin = True
         else:
             # No spin container sent in, therefore the spin is assumed to 
match.
@@ -298,7 +299,7 @@
             return self._intersect[0].contains_mol(mol) and 
self._intersect[1].contains_mol(mol)
 
         # The check.
-        if wildcard_match(mol, self.molecules):
+        if relax_re.search(mol, self.molecules):
             return True
 
         # Nothingness.
@@ -338,7 +339,7 @@
         select_res = False
 
         # The residue checks.
-        if res_num in self.residues or wildcard_match(res_name, 
self.residues):
+        if res_num in self.residues or relax_re.search(res_name, 
self.residues):
             select_res = True
 
         # Nothingness.
@@ -385,7 +386,7 @@
         select_spin = False
 
         # The spin checks.
-        if spin_num in self.spins or wildcard_match(spin_name, self.spins):
+        if spin_num in self.spins or relax_re.search(spin_name, self.spins):
             select_spin = True
 
         # Nothingness.

Modified: 1.3/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=6800&r1=6799&r2=6800&view=diff
==============================================================================
--- 1.3/generic_fns/structure/scientific.py (original)
+++ 1.3/generic_fns/structure/scientific.py Mon Jul  7 15:31:24 2008
@@ -36,7 +36,7 @@
 # relax module imports.
 from api_base import Base_struct_API
 from data import Relax_data_store; ds = Relax_data_store()
-from generic_fns.mol_res_spin import Selection, parse_token, tokenise, 
wildcard_match
+from generic_fns.mol_res_spin import Selection, parse_token, tokenise
 from relax_errors import RelaxError, RelaxNoPdbChainError, RelaxNoResError, 
RelaxPdbLoadError
 from relax_warnings import RelaxNoAtomWarning, RelaxZeroVectorWarning