Dump CASE correctly in QgsExpression::dump()

qgis · Jan 27, 2014 · eb9a22e · eb9a22e
1 parent 578a83a
commit eb9a22e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -2315,13 +2315,14 @@ bool QgsExpression::NodeCondition::prepare( QgsExpression* parent, const QgsFiel
 
 QString QgsExpression::NodeCondition::dump() const
 {
-  QString msg = "CONDITION:\n";
+  QString msg = QString("CASE ");
   foreach ( WhenThen* cond, mConditions )
   {
-    msg += QString( "- WHEN %1 THEN %2\n" ).arg( cond->mWhenExp->dump() ).arg( cond->mThenExp->dump() );
+    msg += QString( "WHEN %1 THEN %2" ).arg( cond->mWhenExp->dump() ).arg( cond->mThenExp->dump() );
   }
   if ( mElseExp )
-    msg += QString( "- ELSE %1" ).arg( mElseExp->dump() );
+    msg += QString( "ELSE %1" ).arg( mElseExp->dump() );
+  msg += QString(" END");
   return msg;
 }
 

diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -152,12 +152,9 @@ class CORE_EXPORT QgsExpression
 
     int scale() {return mScale; }
 
-    //! Return the expression string that was given when created.
-    const QString expression() const { return mExp; }
+    const QString expression() const { return dump(); }
 
-    //! Return the a debugging string of the expression.
-    //! This can be used for debugging. Use {@link expression()}
-    //! if you need the full expression string.
+    //! Return the expression string that represents this QgsExpression.
     QString dump() const;
 
     //! Return calculator used for distance and area calculations