Changeset 2875

Timestamp:

12/06/13 13:21:08 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5858

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sel = sd.selector()

sel.set_msselection_field()
print sel._gettaql()

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed behavior when empty string is passed as an argument.
Also, documentation is added.

File:

• trunk/python/selector.py (modified) (2 diffs)

trunk/python/selector.py

@@ -204 +204 @@
     def set_msselection_field(self, selection):
         """
+        Set a field selection in msselection syntax. The msselection
+        suppports the following syntax:
+
+        pattern match:
+            - UNIX style pattern match for source name using '*'
+              (compatible with set_name)
+
+        field id selection:
+            - simple number in string ('0', '1', etc.)
+            - range specification using '~' ('0~1', etc.)
+            - range specification using '>' or '<' in combination
+              with '=' ('>=1', '<3', etc.)
+
+        comma separated multiple selection:
+            - selections can be combined by using ',' ('0,>1',
+              'mysource*,2~4', etc.)
         """
         selection_list =  map(string.strip, selection.split(','))
         query_list = list(self.generate_query(selection_list))
-        query = 'SELECT FROM $1 WHERE ' + ' || '.join(query_list)
-        self._settaql(query)
+        if len(query_list) > 0:
+            query = 'SELECT FROM $1 WHERE ' + ' || '.join(query_list)
+            self._settaql(query)
 
     def generate_query(self, selection_list):
@@ -217 +234 @@
                 a = FieldIdRegexGenerator(s)
                 yield '(%s)'%(a.get_regex())
-            else:
+            elif len(s) > 0:
                 #print '"%s" is UNIX style pattern match'%(s)
                 yield '(SRCNAME == pattern(\'%s\'))'%(s)