Changeset 2881 for trunk

Timestamp:

12/17/13 16:58:32 (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: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on handling existing TaQL query string.
If original query is related to FIELDNAME or SRCNAME,
it is overwritten. Otherwise, the new query is appended
to the original one.

File:

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

trunk/python/selector.py

@@ -224 +224 @@
         query_list = list(self.generate_query(selection_list))
         if len(query_list) > 0:
-            query = 'SELECT FROM $1 WHERE ' + ' || '.join(query_list)
+            original_query = self.get_query()
+            if len(original_query) == 0 or re.match('.*(SRC|FIELD)NAME.*',original_query):
+                query = 'SELECT FROM $1 WHERE ' + ' || '.join(query_list)
+            else:
+                query = 'SELECT FROM $1 WHERE (' + original_query + ') && (' + ' || '.join(query_list) + ')'
             self._settaql(query)
 
@@ -338 +342 @@
                 s = map(string.strip, pattern.split('~'))
                 if len(s) == 2 and s[0].isdigit() and s[1].isdigit():
-                    self.id = [int(s[0])-1,int(s[1])]
+                    id0 = int(s[0])
+                    id1 = int(s[1])
+                    if id0 == 0:
+                        self.id = id1
+                        self.template = string.Template('FIELDNAME == regex(\'.+__${reg}$\')')
+                    else:
+                        self.id = [id0-1,id1]
+                        self.template = string.Template('FIELDNAME == regex(\'.+__${reg}$\') && FIELDNAME != regex(\'.+__${optreg}$\')')
                 else:
                     raise RuntimeError('Invalid syntax: %s'%(pattern))
-                self.template = string.Template('FIELDNAME == regex(\'.+__${reg}$\') && FIELDNAME != regex(\'.+__${optreg}$\')')
             else:
                 raise RuntimeError('Invalid syntax: %s'%(pattern))