in GSA api enable usage of solr fq-attribute together with GSA

site-attribute
12 years ago · 5c7ddc67fe
parent 9fc0c4df98
commit 5c7ddc67fe
1 changed files with 4 additions and 1 deletions
--- a/htroot/gsa/searchresult.java
+++ b/htroot/gsa/searchresult.java
@ -155,7 +155,10 @@ public class searchresult {
        // add sites operator
        String[] site = post.remove("site"); // example: col1|col2
        if (site != null && site[0].length() > 0) {
-            post.put(CommonParams.FQ, QueryModifier.parseCollectionExpression(site[0]));
+            String origfq = post.get(CommonParams.FQ);
+            String sitefq = QueryModifier.parseCollectionExpression(site[0]);
+            post.put(CommonParams.FQ, origfq == null || origfq.length() == 0 ? sitefq :
+                "(" + origfq + ") AND (" + sitefq + ")");
        }
        
        // get the embedded connector