Changes in trunk/python/selector.py [1826:1930]

File:

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

trunk/python/selector.py

@@ -1 @@
-from asap._asap import selector as _selector
+import re
+from asap._asap import selector as _selector, srctype
 from asap.utils import unique, _to_list
 
@@ -7 +8 @@
     scantables to specific rows.
     """
-    fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query"]
+    fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query", "types", "rows"]
 
     def __init__(self, *args, **kw):
@@ -148 +149 @@
         Example:
             # select all off scans with integration times over 60 seconds.
-            selection.set_query("SRCTYPE == 1 AND INTERVAL > 60.0")
-        """
+            selection.set_query("SRCTYPE == PSOFF AND INTERVAL > 60.0")
+        """
+        rx = re.compile("((SRCTYPE *[!=][=] *)([a-zA-Z.]+))", re.I)
+        for r in rx.findall(query):
+            sval = None
+            stype = r[-1].lower()
+            if stype.find('srctype.') == -1:
+                stype = ".".join(["srctype", stype])
+            try:
+                sval = eval(stype)
+                sval = "%s%d" % (r[1], sval)
+            except:
+                continue
+            query = query.replace(r[0], sval)
         taql = "SELECT FROM $1 WHERE " + query
         self._settaql(taql)
@@ -203 +216 @@
     def get_types(self):
         return list(self._gettypes())
+    def get_rows(self):
+        return list(self._getrows())
     def get_query(self):
         prefix = "SELECT FROM $1 WHERE "
@@ -220 +235 @@
              "POLNO": self.get_pols(),
              "QUERY": self.get_query(),
+             "SRCTYPE": self.get_types(),
+             "ROWS": self.get_rows(),
              "Sort Order": self.get_order()
              }