Author: gttersen
Date: 2007-05-03 10:47:04 +0200 (Thu, 03 May 2007)
New Revision: 4981

Modified:
   
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
   
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NewsEspCommandConfig.java
Log:
newsAggregator fixes

Modified: 
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
===================================================================
--- 
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
  2007-05-03 00:17:42 UTC (rev 4980)
+++ 
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
  2007-05-03 08:47:04 UTC (rev 4981)
@@ -92,16 +92,14 @@
 
 
     /**
-     * 
-     * @return 
+     * @return
      */
     public String getDefaultSort() {
         return defaultSort;
     }
 
     /**
-     * 
-     * @param defaultSort 
+     * @param defaultSort
      */
     public void setDefaultSort(String defaultSort) {
         this.defaultSort = defaultSort;
@@ -111,22 +109,19 @@
     public CommandConfig readSearchConfiguration(
             final Element element,
             final SearchConfiguration inherit) {
-        
+
         super.readSearchConfiguration(element, inherit);
-        
+
         AbstractDocumentFactory
                 .fillBeanProperty(this, inherit, "clusterIdParameter", 
ParseType.String, element, "clusterId");
         AbstractDocumentFactory.fillBeanProperty(this, inherit, 
"resultsPerCluster", ParseType.Int, element, "");
         AbstractDocumentFactory.fillBeanProperty(this, inherit, 
"clusterField", ParseType.String, element, "cluster");
-        AbstractDocumentFactory.fillBeanProperty(this, inherit, 
"clusterMaxFetch", ParseType.Int, element, "10");
-        AbstractDocumentFactory
-                .fillBeanProperty(this, inherit, "nestedResultsField", 
ParseType.String, element, "entries");
         AbstractDocumentFactory.fillBeanProperty(this, inherit, "sortField", 
ParseType.String, element, "publishedtime");
         AbstractDocumentFactory.fillBeanProperty(this, inherit, "defaultSort", 
ParseType.String, element, "descending");
         AbstractDocumentFactory.fillBeanProperty(this, inherit, 
"userSortParameter", ParseType.String, element, "sort");
 
         return this;
     }
-    
-    
+
+
 }

Modified: 
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NewsEspCommandConfig.java
===================================================================
--- 
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NewsEspCommandConfig.java
    2007-05-03 00:17:42 UTC (rev 4980)
+++ 
branches/2.12/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/NewsEspCommandConfig.java
    2007-05-03 08:47:04 UTC (rev 4981)
@@ -6,14 +6,13 @@
 import org.w3c.dom.Element;
 
 /**
- * 
  * @author geir
  * @version $Id$
  */
 @Controller("NewsEspSearchCommand")
 public class NewsEspCommandConfig extends NavigatableEspFastCommandConfig {
     /**
-     * 
+     *
      */
     public static final String ALL_MEDIUMS = "all";
     private String mediumPrefix = "medium";
@@ -56,40 +55,35 @@
     }
 
     /**
-     * 
-     * @param mediumPrefix 
+     * @param mediumPrefix
      */
     public void setMediumPrefix(String mediumPrefix) {
         this.mediumPrefix = mediumPrefix;
     }
 
     /**
-     * 
-     * @return 
+     * @return
      */
     public String getDefaultMedium() {
         return defaultMedium;
     }
 
     /**
-     * 
-     * @param defaultMedium 
+     * @param defaultMedium
      */
     public void setDefaultMedium(String defaultMedium) {
         this.defaultMedium = defaultMedium;
     }
 
     /**
-     * 
-     * @return 
+     * @return
      */
     public String getMediumParameter() {
         return mediumParameter;
     }
 
     /**
-     * 
-     * @param mediumParameter 
+     * @param mediumParameter
      */
     public void setMediumParameter(String mediumParameter) {
         this.mediumParameter = mediumParameter;
@@ -99,9 +93,9 @@
     public CommandConfig readSearchConfiguration(
             final Element element,
             final SearchConfiguration inherit) {
-        
+
         super.readSearchConfiguration(element, inherit);
-        
+
         AbstractDocumentFactory
                 .fillBeanProperty(this, inherit, "mediumPrefix", 
ParseType.String, element, "medium");
         AbstractDocumentFactory
@@ -109,12 +103,16 @@
         AbstractDocumentFactory
                 .fillBeanProperty(this, inherit, "mediumParameter", 
ParseType.String, element, "medium");
         AbstractDocumentFactory
+                .fillBeanProperty(this, inherit, "nestedResultsField", 
ParseType.String, element, "entries");
+        AbstractDocumentFactory
+                .fillBeanProperty(this, inherit, "collapsingMaxFetch", 
ParseType.Int, element, "10");
+        AbstractDocumentFactory
                 .fillBeanProperty(this, inherit, "ignoreOffset", 
ParseType.Boolean, element, "false");
-        
+
         return this;
     }
-    
-    
+
+
     public boolean isIgnoreOffset() {
         return ignoreOffset;
     }

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

Reply via email to