From d8ad4cdd2ae4e27feee34f78ab6ad22162c691c1 Mon Sep 17 00:00:00 2001
From: Constantin <jucovschi@gmail.com>
Date: Fri, 30 Jul 2010 12:16:46 +0200
Subject: extended sdom operation to also work on any general expressions.
 Needed to support GDAL driver.

---
 qlparser/oql.yy | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'qlparser/oql.yy')

diff --git a/qlparser/oql.yy b/qlparser/oql.yy
index c2c2130..7a5df11 100644
--- a/qlparser/oql.yy
+++ b/qlparser/oql.yy
@@ -794,16 +794,14 @@ mintervalExp: LEPAR spatialOpList REPAR
 	  FREESTACK($1)
 	  FREESTACK($3)
 	}
-	| SDOM LRPAR collectionIterator RRPAR
+	| SDOM LRPAR generalExp RRPAR
 	{
-	  QtVariable* var = new QtVariable( $3.value );
-	  var->setParseInfo( *($3.info) );
-	  $$ = new QtSDom( var );
+	  $$ = new QtSDom( $3 );
 	  $$->setParseInfo( *($1.info) );
+	  parseQueryTree->removeDynamicObject( $3 );
 	  parseQueryTree->addDynamicObject( $$ );
 	  FREESTACK($1)
 	  FREESTACK($2)
-	  FREESTACK($3)
 	  FREESTACK($4)
 	};
 
-- 
cgit