Author: itthkjer
Date: 2006-05-05 15:33:17 +0200 (Fri, 05 May 2006)
New Revision: 2865
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
Log:
last merge from 2.0
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
2006-05-05 13:32:49 UTC (rev 2864)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
2006-05-05 13:33:17 UTC (rev 2865)
@@ -70,6 +70,24 @@
return s.get(paramValue[0]);
}
}
+ } else {
+ // return null if empty
+ final String[] query = (String[]) parameters.get("q");
+ if (query[0].trim().equals(""))
+ return null;
+
+ // The site is given in the psite parameter
+ final String[] privateSite = (String[]) parameters.get("psite");
+
+ if (privateSite != null && privateSite.length > 0) {
+ final String[] def = (String[]) parameters.get("s");
+// final String[] track = (String []) parameters.get("ss_lt");
+
+ // Also make sure that the statistics parameter is present
+ if ((def == null || def.length == 0 || def[0].equals("pss"))) {
+ return "+site:" + privateSite[0];
+ }
+ }
}
return null;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
