issue-94-patch

git-svn-id: http://solrnet.googlecode.com/svn/trunk@516 66c3f25c-543c-0410-ae2e-6f2ca0bd8c61
SolrNet · Feb 6, 2010 · baeb72c · baeb72c
1 parent ca2c799
commit baeb72c
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/SolrNet/SolrMultipleCriteriaQuery.cs b/SolrNet/SolrMultipleCriteriaQuery.cs
@@ -15,6 +15,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.Text;
 using SolrNet.Utils;
 
 namespace SolrNet {
@@ -78,12 +79,22 @@ public class Operator {
 		/// </summary>
 		public override string Query {
 			get {
-			    var queryStrings = Func.Filter(queries, x => x != null && !string.IsNullOrEmpty(x.Query));
-                var q = Func.Join(string.Format(" {0} ", oper), queryStrings, query => query.Query, true);
-                if (!string.IsNullOrEmpty(q))
-                    q = "(" + q + ")";
-			    return q;
-			}
+                var queryBuilder = new StringBuilder();
+                foreach (var query in Queries) {
+                    if (query == null) 
+                        continue;
+                    var q = query.Query;
+                    if (string.IsNullOrEmpty(q)) 
+                        continue;
+                    if (queryBuilder.Length > 0)
+                        queryBuilder.AppendFormat(" {0} ", oper);
+                    queryBuilder.Append(q);
+                }
+                var queryString = queryBuilder.ToString();
+                if (!string.IsNullOrEmpty(queryString)) 
+                    queryString = "(" + queryString + ")";
+                return queryString;
+            }
 		}
 	}
 }