Fixing removal of characters when no operation selected

base33 · Sep 21, 2015 · 42b3870 · 42b3870
1 parent 1efd61f
commit 42b3870
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Umbraco.Examine.Linq/ExpressionTreeVisitor.cs b/Umbraco.Examine.Linq/ExpressionTreeVisitor.cs
@@ -136,7 +136,8 @@ protected override Expression VisitMemberExpression(MemberExpression expression)
 
         protected override Expression VisitConstantExpression(ConstantExpression expression)
         {
-            string value = "";
+            string value = "";
+			string operation = "";
 
             if(expression.Value is string)
             {
@@ -151,7 +152,7 @@ protected override Expression VisitConstantExpression(ConstantExpression express
             else if (expression.Value is DateTime)
             {
                 var formattedDateTime = ((DateTime)expression.Value).ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture);//((DateTime)expression.Value).ToString("o");
-                string operation = currentPart.ToString().Substring(currentPart.Length - 2);
+                operation = currentPart.ToString().Substring(currentPart.Length - 2);
                 if (operation == "eq")
                 {
                     value = formattedDateTime;
@@ -176,7 +177,7 @@ protected override Expression VisitConstantExpression(ConstantExpression express
             else if(expression.Value is int || expression.Value is double)
             {
                 var formattedInt = expression.Value is double ? (Convert.ToInt64((double)expression.Value)).ToString() : ((int)expression.Value).ToString();
-                string operation = currentPart.ToString().Substring(currentPart.Length - 2);
+                operation = currentPart.ToString().Substring(currentPart.Length - 2);
                 if(operation == "eq")
                 {
                     value = formattedInt;
@@ -201,9 +202,11 @@ protected override Expression VisitConstantExpression(ConstantExpression express
             else if (expression.Value is bool || expression.Value is Boolean)
                 value = ((bool)expression.Value) ? "1" : "0";
             else
-                value = expression.Value.ToString();
+                value = expression.Value.ToString();
+
+			if (!string.IsNullOrEmpty(operation))
+				currentPart.Length = currentPart.Length - 2; //clear the last 2 characters
 
-            currentPart.Length = currentPart.Length - 2; //clear the last 2 characters
             currentPart.Append(value);
 
             return expression;