Author: ssmiweve
Date: 2007-06-26 18:16:33 +0200 (Tue, 26 Jun 2007)
New Revision: 5436

Modified:
   
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
Log:
small cleanup :$

Modified: 
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
===================================================================
--- 
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
    2007-06-26 16:16:18 UTC (rev 5435)
+++ 
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
    2007-06-26 16:16:33 UTC (rev 5436)
@@ -48,6 +48,8 @@
 /**
  * Base class for commands querying a FAST EPS Server.
  * See 
https://dev.schibstedsok.no/confluence/display/TECHDEV/FAST+ESP+5.0+Documentation
+ * 
+ * @version $Id$
  */
 public abstract class AbstractESPFastSearchCommand extends 
AbstractSearchCommand {
 
@@ -125,40 +127,7 @@
         searchView = initialiseSearchView();
     }
 
-    /**
-     * Default collapsing from the configuration, can be overridden in 
subcommands..
-     * @return true if collapsing is enabled
-     */
-    protected boolean isCollapsingEnabled() {
-        return cfg.isCollapsingEnabled();
-    }
 
-    /**
-     * Default sortby, can be overridden by subcommands.
-     * @return sortby field
-     */
-    protected String getSortBy() {
-        String sortBy = cfg.getSortBy();
-
-        if (getParameters().containsKey("userSortBy")) {
-
-            final String userSortBy = getParameter("userSortBy");
-            LOG.debug("execute: SortBy " + userSortBy);
-
-            if ("standard".equals(userSortBy)) {
-                sortBy = "-frontpagename -contentprofile -docdatetime";
-            } else if ("datetime".equals(userSortBy)) {
-                sortBy = "-frontpagename -docdatetime";
-            } else if ("standard_nettby".equals(userSortBy)) {
-                sortBy = "-contentprofile -publishedtime";
-            } else if ("datetime_nettby".equals(userSortBy)) {
-                sortBy = "-publishedtime";
-            }
-        }
-
-        return sortBy;
-    }
-
     // Public --------------------------------------------------------
 
     /**
@@ -199,7 +168,7 @@
                 }
             }
 
-            String sortBy = getSortBy();
+            final String sortBy = getSortBy();
 
             query.setParameter(new SearchParameter("sesat:uniqueId",
                     context.getDataModel().getParameters().getUniqueId()));
@@ -244,6 +213,40 @@
     // Protected -----------------------------------------------------
 
     /**
+     * Default collapsing from the configuration, can be overridden in 
subcommands..
+     * @return true if collapsing is enabled
+     */
+    protected boolean isCollapsingEnabled() {
+        return cfg.isCollapsingEnabled();
+    }
+
+    /**
+     * Default sortby, can be overridden by subcommands.
+     * @return sortby field
+     */
+    protected String getSortBy() {
+        String sortBy = cfg.getSortBy();
+
+        if (getParameters().containsKey("userSortBy")) {
+
+            final String userSortBy = getParameter("userSortBy");
+            LOG.debug("execute: SortBy " + userSortBy);
+
+            if ("standard".equals(userSortBy)) {
+                sortBy = "-frontpagename -contentprofile -docdatetime";
+            } else if ("datetime".equals(userSortBy)) {
+                sortBy = "-frontpagename -docdatetime";
+            } else if ("standard_nettby".equals(userSortBy)) {
+                sortBy = "-contentprofile -publishedtime";
+            } else if ("datetime_nettby".equals(userSortBy)) {
+                sortBy = "-publishedtime";
+            }
+        }
+
+        return sortBy;
+    }
+    
+    /**
      * [EMAIL PROTECTED]
      */
     protected String escapeFieldedLeaf(final LeafClause clause) {


Property changes on: 
branches/2.14/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
___________________________________________________________________
Name: svn:keywords
   + Id

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

Reply via email to