r5962 - /1.3/generic_fns/selection.py -- April 23, 2008 - 23:37

Author: bugman
Date: Wed Apr 23 23:37:52 2008
New Revision: 5962

URL: http://svn.gna.org/viewcvs/relax?rev=5962&view=rev
Log:
The Selection.contains_*() methods now call the wildcard_match() function for 
comparisons.


Modified:
    1.3/generic_fns/selection.py

Modified: 1.3/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/selection.py?rev=5962&r1=5961&r2=5962&view=diff
==============================================================================
--- 1.3/generic_fns/selection.py (original)
+++ 1.3/generic_fns/selection.py Wed Apr 23 23:37:52 2008
@@ -283,7 +283,7 @@
             return self._intersect[0].contains_mol(mol) and 
self._intersect[1].contains_mol(mol)
 
         # The check.
-        if mol in self.molecules:
+        if wildcard_match(mol, self.molecules):
             return True
 
         # Nothingness.
@@ -323,7 +323,7 @@
         select_res = False
 
         # The residue checks.
-        if res_num in self.residues or res_name in self.residues:
+        if res_num in self.residues or wildcard_match(res_name, 
self.residues):
             select_res = True
 
         # Nothingness.
@@ -370,7 +370,7 @@
         select_spin = False
 
         # The spin checks.
-        if spin_num in self.spins or spin_name in self.spins:
+        if spin_num in self.spins or wildcard_match(spin_name, self.spins):
             select_spin = True
 
         # Nothingness.