Fix #9459 (layer fails to render when rule-based symbology make use of $atlasfeatureid)

wonder-sk · wonder-sk · commit 684dd890a335 · 2014-02-11T23:57:02.000+07:00
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -57,6 +57,9 @@ class QgsExpression
     static void unsetSpecialColumn( const QString& name );
     //! Return the value of the given special column or a null QVariant if undefined
     static QVariant specialColumn( const QString& name );
+    //! Check whether a special column exists
+    //! @note added in 2.2
+    static bool hasSpecialColumn( const QString& name );
 
     void setScale( double scale );
 
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1583,6 +1583,28 @@ QVariant QgsExpression::specialColumn( const QString& name )
   return it.value();
 }
 
+bool QgsExpression::hasSpecialColumn( const QString& name )
+{
+  static bool initialized = false;
+  if ( !initialized )
+  {
+    // Pre-register special columns that will exist within QGIS so that expressions that may use them are parsed correctly.
+    // This is really sub-optimal, we should get rid of the special columns and instead have contexts in which some values
+    // are defined and some are not ($rownum makes sense only in field calculator, $scale only when rendering, $page only for composer etc.)
+
+    QStringList lst;
+    lst << "$page" << "$feature" << "$numpages" << "$numfeatures" << "$atlasfeatureid" << "$atlasgeometry" << "$map";
+    foreach ( QString c, lst )
+      setSpecialColumn( c, QVariant() );
+
+    initialized = true;
+  }
+
+  if ( functionIndex( name ) != -1 )
+    return false;
+  return gmSpecialColumns.contains( name );
+}
+
 QList<QgsExpression::Function*> QgsExpression::specialColumns()
 {
   QList<Function*> defs;
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -147,6 +147,9 @@ class CORE_EXPORT QgsExpression
     static void unsetSpecialColumn( const QString& name );
     //! Return the value of the given special column or a null QVariant if undefined
     static QVariant specialColumn( const QString& name );
+    //! Check whether a special column exists
+    //! @note added in 2.2
+    static bool hasSpecialColumn( const QString& name );
 
     void setScale( double scale ) { mScale = scale; }
 
diff --git a/src/core/qgsexpressionparser.yy b/src/core/qgsexpressionparser.yy
@@ -193,8 +193,7 @@ expression:
           int fnIndex = QgsExpression::functionIndex(*$1);
           if (fnIndex == -1)
           {
-	    QVariant userVar = QgsExpression::specialColumn( *$1 );
-	    if ( userVar.isNull() )
+      if ( !QgsExpression::hasSpecialColumn( *$1 ) )
 	    {
 	      exp_error("Special column is not known");
 	      YYERROR;

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ expression:`
`193`	`193`	`int fnIndex = QgsExpression::functionIndex(*$1);`
`194`	`194`	`if (fnIndex == -1)`
`195`	`195`	`{`
`196`		`- QVariant userVar = QgsExpression::specialColumn( *$1 );`
`197`		`- if ( userVar.isNull() )`
	`196`	`+ if ( !QgsExpression::hasSpecialColumn( *$1 ) )`
`198`	`197`	`{`
`199`	`198`	`exp_error("Special column is not known");`
`200`	`199`	`YYERROR;`