Author: magnuse
Date: 2006-04-18 15:02:33 +0200 (Tue, 18 Apr 2006)
New Revision: 2762

Modified:
   
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
Log:
The entire fast filter string is now used in the static initializer. Multiple 
domains added for a few site searches.


Modified: 
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
===================================================================
--- 
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
  2006-04-18 12:54:02 UTC (rev 2761)
+++ 
trunk/src/java/no/schibstedsok/front/searchportal/query/transform/SimpleSiteSearchTransformer.java
  2006-04-18 13:02:33 UTC (rev 2762)
@@ -33,24 +33,24 @@
 
     static{
         final Map<String,String> defaultSites = new HashMap<String,String>();
-        defaultSites.put("ds", "dinside.no");
-        defaultSites.put("it", "itavisen.no");
-        defaultSites.put("di", "digi.no");
-        defaultSites.put("pr", "propaganda-as.no");
-        defaultSites.put("im", "imarkedet.no");
-        defaultSites.put("nrk", "nrk.no");
-        defaultSites.put("af", "aftenposten.no");
-        defaultSites.put("fv", "fedrelandsvennen.no");
-        defaultSites.put("aa", "adressa.no");
-        defaultSites.put("sa", "aftenbladet.no");
-        defaultSites.put("bt", "bt.no");
 
+        defaultSites.put("ds", "+site:dinside.no");
+        defaultSites.put("it", "+site:itavisen.no");
+        defaultSites.put("di", "+site:digi.no");
+        defaultSites.put("pr", "+site:propaganda-as.no");
+        defaultSites.put("im", "+site:imarkedet.no");
+        defaultSites.put("nrk", "+site:nrk.no");
+        defaultSites.put("af", "+site:(aftenposten.no forbruker.no)");
+        defaultSites.put("fv", "+site:(fedrelandsvennen.no fvn.no)");
+        defaultSites.put("aa", "+site:adressa.no");
+        defaultSites.put("sa", "+site:aftenbladet.no");
+        defaultSites.put("bt", "+site:bt.no");
+
         DEFAULT_SITES = Collections.unmodifiableMap(defaultSites);
     }
 
     private Map<String,String> sites;
     private String parameterName;
-    private String filterName;
 
     public String getFilter(final Map parameters) {
 
@@ -67,11 +67,7 @@
                 }
 
                 if (s.containsKey(paramValue[0])) {
-                    final StringBuilder filter = new StringBuilder("+");
-                    filter.append(filterName);
-                    filter.append(':');
-                    filter.append(s.get(paramValue[0]));
-                    return filter.toString();
+                    return s.get(paramValue[0]);
                 }
             }
         }
@@ -81,7 +77,6 @@
     public Object clone() throws CloneNotSupportedException {
         final SimpleSiteSearchTransformer retValue = 
(SimpleSiteSearchTransformer)super.clone();
         retValue.parameterName = parameterName;
-        retValue.filterName = filterName;
         retValue.sites = sites;
         return retValue;
     }

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to