Author: gttersen
Date: 2007-03-27 23:39:59 +0200 (Tue, 27 Mar 2007)
New Revision: 4668
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddLastWeekModifierResultHandler.java
Log:
Changes to navigation
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
2007-03-27 21:39:29 UTC (rev 4667)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsAggregatorSearchCommand.java
2007-03-27 21:39:59 UTC (rev 4668)
@@ -53,8 +53,6 @@
public SearchResult execute() {
NewsAggregatorSearchConfiguration config = getSearchConfiguration();
-
-
StringDataObject clusterId =
datamodel.getParameters().getValue(PARAM_CLUSTER_ID);
String xmlFile = getXmlFileName(datamodel, config);
LOG.debug("Loading xml file at: " + config.getXmlSource() + xmlFile);
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddLastWeekModifierResultHandler.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddLastWeekModifierResultHandler.java
2007-03-27 21:39:29 UTC (rev 4667)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/AddLastWeekModifierResultHandler.java
2007-03-27 21:39:59 UTC (rev 4668)
@@ -4,7 +4,6 @@
import no.schibstedsok.searchportal.datamodel.DataModel;
import no.schibstedsok.searchportal.result.FastSearchResult;
import no.schibstedsok.searchportal.result.Modifier;
-import no.schibstedsok.searchportal.result.Navigator;
import no.schibstedsok.searchportal.result.SearchResult;
import org.apache.log4j.Logger;
@@ -16,7 +15,7 @@
import java.util.TimeZone;
/**
- * Adds a modifier to the searchResult with a navigator to the last week based
on day modifiers.
+ * Adds a modifier to the searchResult with a count for the last week based on
day modifiers.
* <p/>
* <b>Note:</b> The implementation of this depends on that the day modifiers
are sorted descending (last date first)
* <b>Note:</b> This will only work on searchResults that are actually
FastSearchResult
@@ -41,22 +40,24 @@
calendar.add(Calendar.DAY_OF_YEAR, -(DAYS_IN_WEEK + 1));
// Going through day modifiers and counting
- int maxModifiersToProcess = Math.min(DAYS_IN_WEEK,
dayModifiers.size());
- for (int i = 0; i < maxModifiersToProcess; i++) {
- final Modifier modifier = dayModifiers.get(i);
- final Date modifierDate = sdf.parse(modifier.getName());
- if (modifierDate.after(calendar.getTime())) {
- weekCount += modifier.getCount();
- } else {
- // Some dates missing, no point in going furthe into
the list.
- break;
+ if (dayModifiers != null) {
+ int maxModifiersToProcess = Math.min(DAYS_IN_WEEK,
dayModifiers.size());
+ for (int i = 0; i < maxModifiersToProcess; i++) {
+ final Modifier modifier = dayModifiers.get(i);
+ final Date modifierDate =
sdf.parse(modifier.getName());
+ if (modifierDate.after(calendar.getTime())) {
+ weekCount += modifier.getCount();
+ } else {
+ // Some dates missing, no point in going furthe
into the list.
+ break;
+ }
}
}
// Creating the new modifier
calendar.add(Calendar.DAY_OF_YEAR, 1);
String fromDate = sdf.format(calendar.getTime());
- LOG.debug("Creating modifier. Adding at " +
targetNavigatorField + ", vaule=" + fromDate);
- Modifier newModifier = new Modifier(fromDate, weekCount, new
Navigator(fromDate, targetNavigatorField, null, null));
+ LOG.debug("Creating modifier. Adding at " +
targetNavigatorField + ", value=" + fromDate);
+ Modifier newModifier = new Modifier(fromDate, weekCount, null);
fastResult.addModifier(targetNavigatorField, newModifier);
} else {
LOG.error("Can not use " +
AddLastWeekModifierResultHandler.class.getName() + " on a generic searchResult.
Must be a " + FastSearchResult.class.getName());
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
