[Mulgara-svn] r1533 - trunk/src/jar/querylang/java/org/mulgara/itql

[pag at mulgara.org]

Author: pag
Date: 2009-02-20 11:19:11 -0800 (Fri, 20 Feb 2009)
New Revision: 1533

Modified:
   trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java
Log:
Resetting variable name generation with the parser. These should always happen together, and it wasn't being done in the parseQuery method

Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java	2009-02-20 00:10:04 UTC (rev 1532)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java	2009-02-20 19:19:11 UTC (rev 1533)
@@ -200,8 +200,6 @@
     // log that we're going to execute the command
     if (logger.isDebugEnabled()) logger.debug("Parsing command " + command);
 
-    // Reset the variable incrementer in the query.
-    variableFactory.reset();
     resetInterpreter();
 
     // log the iTQL command - system property itql.command.log must be set
@@ -1235,6 +1233,8 @@
   private void resetInterpreter() {
     lastCommand = null;
     lastError = null;
+    // Reset the variable incrementer in the query.
+    variableFactory.reset();
   }