Author: ssanbern
Date: 2007-01-11 11:08:44 +0100 (Thu, 11 Jan 2007)
New Revision: 4316

Modified:
   
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/BlocketSearchCommand.java
Log:
implement logging

Modified: 
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/BlocketSearchCommand.java
===================================================================
--- 
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/BlocketSearchCommand.java
     2007-01-10 14:08:12 UTC (rev 4315)
+++ 
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/BlocketSearchCommand.java
     2007-01-11 10:08:44 UTC (rev 4316)
@@ -37,10 +37,7 @@
        public SearchResult execute() {
 
                final TokenEvaluationEngine engine = 
context.getTokenEvaluationEngine();
-
-               final boolean isBlocket = 
engine.evaluateQuery(TokenPredicate.BLOCKET,
-                               context.getQuery());
-
+               
                BlocketSearchConfiguration bsc = (BlocketSearchConfiguration) 
context
                                .getSearchConfiguration();
 
@@ -49,34 +46,37 @@
                final SearchLocator service = new SearchLocator();
 
                final SearchResult result = new BasicSearchResult(this);
-               if (isBlocket) {
-                       try {
-                               final SearchPortType port = service
-                                               .getsearchPort(new 
java.net.URL(service
-                                                               
.getsearchPortAddress()));
-                               String query = getTransformedQuery();
+               
+               try {
+                       final SearchPortType port = service
+                                       .getsearchPort(new java.net.URL(service
+                                                       
.getsearchPortAddress()));
+                       String query = getTransformedQuery();
 
-                               LongHolder lholder = new LongHolder();
-                               StringHolder sholder = new StringHolder();
-                               String trimQ = 
StringUtils.deleteWhitespace(query);
-                               String categoryIndex = (String) m.get(trimQ);
-                               if (categoryIndex != null) {
-                                       port.search(query, 
Integer.parseInt(categoryIndex),
-                                                       lholder, sholder);
-                               }
+                       LongHolder lholder = new LongHolder();
+                       StringHolder sholder = new StringHolder();
+                       String trimQ = StringUtils.deleteWhitespace(query);
+                       String categoryIndex = (String) m.get(trimQ);
+                       
+                       LOG.debug("Executing blocket search command with 
searchquery: "
+                                       + query);
+                       if (categoryIndex != null) {
+                               port.search(query, 
Integer.parseInt(categoryIndex),
+                                               lholder, sholder);
+                       }
 
-                               String nads = Long.toString(lholder.value);
-                               if(!nads.equalsIgnoreCase("0"))
-                               {
-                                       result.addField("searchquery", query);
-                                       result.addField("numberofads", nads);
-                                       result.addField("blocketbackurl", 
sholder.value);
+                       String nads = Long.toString(lholder.value);
+                       if((nads!=null)&&(!nads.equalsIgnoreCase("0")))
+                       {
+                               result.addField("searchquery", query);
+                               result.addField("numberofads", nads);
+                               result.addField("blocketbackurl", 
sholder.value);
+                               
+                               result.setHitCount(Integer.parseInt(nads));
 
-                                       result.setHitCount(1);
-
-                               }
-                               
-                       } catch (ServiceException se) {
+                       }
+                       
+               } catch (ServiceException se) {
                                LOG.error(ERR_FAILED_BLOCKET_SEARCH, se);
                                throw new InfrastructureException(se);
                        } catch (MalformedURLException murle) {
@@ -87,7 +87,7 @@
                                throw new InfrastructureException(re);
                        }
 
-               }
+               
 
                return result;
 

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

Reply via email to