add lower/upper support to search string (fixes #2970)

jef · jef · commit 2019d63b596e · 2010-08-27T11:37:20.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14154 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgssearchstringlexer.ll b/src/core/qgssearchstringlexer.ll
@@ -91,6 +91,8 @@ string      "'"{str_char}*"'"
 "to int" { yylval.op = QgsSearchTreeNode::opTOINT; return FUNCTION;}
 "to real" { yylval.op = QgsSearchTreeNode::opTOREAL; return FUNCTION;}
 "to string" { yylval.op = QgsSearchTreeNode::opTOSTRING; return FUNCTION;}
+"lower" { yylval.op = QgsSearchTreeNode::opLOWER; return FUNCTION;}
+"upper" { yylval.op = QgsSearchTreeNode::opUPPER; return FUNCTION;}
 
 "||"   { return CONCAT; }
 
diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp
@@ -192,7 +192,8 @@ QString QgsSearchTreeNode::makeSearchString()
   {
     if ( mOp == opSQRT || mOp == opSIN || mOp == opCOS || mOp == opTAN ||
          mOp == opASIN || mOp == opACOS || mOp == opATAN ||
-         mOp == opTOINT || mOp == opTOREAL || mOp == opTOSTRING )
+         mOp == opTOINT || mOp == opTOREAL || mOp == opTOSTRING ||
+         mOp == opLOWER || mOp == opUPPER )
     {
       // functions
       switch ( mOp )
@@ -207,6 +208,8 @@ QString QgsSearchTreeNode::makeSearchString()
         case opTOINT: str += "to int"; break;
         case opTOREAL: str += "to real"; break;
         case opTOSTRING: str += "to string"; break;
+        case opLOWER: str += "lower"; break;
+        case opUPPER: str += "upper"; break;
         default: str += "?";
       }
       // currently all functions take one parameter
@@ -672,6 +675,10 @@ QgsSearchTreeValue QgsSearchTreeNode::valueAgainst( const QgsFieldMap& fields, c
           return QgsSearchTreeValue( val1 );
         case opTOSTRING:
           return QgsSearchTreeValue( QString::number( val1 ) );
+        case opLOWER:
+          return QgsSearchTreeValue( value1.string().toLower() );
+        case opUPPER:
+          return QgsSearchTreeValue( value1.string().toUpper() );
       }
     }
 
diff --git a/src/core/qgssearchtreenode.h b/src/core/qgssearchtreenode.h
@@ -96,6 +96,8 @@ class CORE_EXPORT QgsSearchTreeNode
 
       // string handling
       opCONCAT,
+      opLOWER,
+      opUPPER,
 
       opROWNUM
     };

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ QString QgsSearchTreeNode::makeSearchString()`
`192`	`192`	`{`
`193`	`193`	`if ( mOp == opSQRT \|\| mOp == opSIN \|\| mOp == opCOS \|\| mOp == opTAN \|\|`
`194`	`194`	`mOp == opASIN \|\| mOp == opACOS \|\| mOp == opATAN \|\|`
`195`		`- mOp == opTOINT \|\| mOp == opTOREAL \|\| mOp == opTOSTRING )`
	`195`	`+ mOp == opTOINT \|\| mOp == opTOREAL \|\| mOp == opTOSTRING \|\|`
	`196`	`+ mOp == opLOWER \|\| mOp == opUPPER )`
`196`	`197`	`{`
`197`	`198`	`// functions`
`198`	`199`	`switch ( mOp )`
`@@ -207,6 +208,8 @@ QString QgsSearchTreeNode::makeSearchString()`
`207`	`208`	`case opTOINT: str += "to int"; break;`
`208`	`209`	`case opTOREAL: str += "to real"; break;`
`209`	`210`	`case opTOSTRING: str += "to string"; break;`
	`211`	`+ case opLOWER: str += "lower"; break;`
	`212`	`+ case opUPPER: str += "upper"; break;`
`210`	`213`	`default: str += "?";`
`211`	`214`	`}`
`212`	`215`	`// currently all functions take one parameter`
`@@ -672,6 +675,10 @@ QgsSearchTreeValue QgsSearchTreeNode::valueAgainst( const QgsFieldMap& fields, c`
`672`	`675`	`return QgsSearchTreeValue( val1 );`
`673`	`676`	`case opTOSTRING:`
`674`	`677`	`return QgsSearchTreeValue( QString::number( val1 ) );`
	`678`	`+ case opLOWER:`
	`679`	`+ return QgsSearchTreeValue( value1.string().toLower() );`
	`680`	`+ case opUPPER:`
	`681`	`+ return QgsSearchTreeValue( value1.string().toUpper() );`
`675`	`682`	`}`
`676`	`683`	`}`
`677`	`684`