Changeset 1543 for tags/asap2.3.1/src/STSelector.cpp

Timestamp:

03/26/09 10:41:07 (15 years ago)

Author:

Malte Marquarding

Message:

merged in bug fixes from trunk

File:

• tags/asap2.3.1/src/STSelector.cpp (modified) (2 diffs)

tags/asap2.3.1/src/STSelector.cpp

@@ -104 +104 @@
 void STSelector::setTaQL( const std::string& taql )
 {
-  taql_ = "USING STYLE PYTHON " + taql;
+  taql_ = taql;
 }
 
@@ -143 +143 @@
   if ( taql_.size() > 0 ) {
     Table tmpt = tab;
+    std::string pytaql = "USING STYLE PYTHON " + taql_;
 
     if ( !query.isNull() ) { // taql and selection
-      tmpt = tableCommand(taql_, tab(query));
+      tmpt = tableCommand(pytaql, tab(query));
     } else { // taql only
-      tmpt = tableCommand(taql_, tab);
+      tmpt = tableCommand(pytaql, tab);
     }
     return sort(tmpt);