r3247 - /1.3/generic_fns/selection.py -- March 30, 2007 - 05:29

Author: macraild
Date: Thu Mar 29 20:40:50 2007
New Revision: 3247

URL: http://svn.gna.org/viewcvs/relax?rev=3247&view=rev
Log:
This time booleans actually work!


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=3247&r1=3246&r2=3247&view=diff
==============================================================================
--- 1.3/generic_fns/selection.py (original)
+++ 1.3/generic_fns/selection.py Thu Mar 29 20:40:50 2007
@@ -74,15 +74,15 @@
         
         if '&' in selectString:
             and_split = selectString.split('&')
-            part0 = Selection(and_split[0])
-            part1 = Selection(and_split[1])
-            return part0.intersection(part1)
+            Selection.__init__(self, and_split[0].strip())
+            part1 = Selection(and_split[1].strip())
+            self.intersection(part1)
 
         elif '|' in selectString:
             and_split = selectString.split('|')
-            part0 = Selection(and_split[0])
-            part1 = Selection(and_split[1])
-            return part0.union(part1)
+            Selection.__init__(self, and_split[0].strip())
+            part1 = Selection(and_split[1].strip())
+            self.union(part1)
 
         else:
             mol_token, res_token, spin_token = tokenise(selectString)