Author: gttersen
Date: 2007-07-24 13:50:18 +0200 (Tue, 24 Jul 2007)
New Revision: 5554
Added:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/util/ModifierStringComparator.java
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigatableESPFastCommand.java
trunk/result-spi/src/main/java/no/schibstedsok/searchportal/result/Navigator.java
Log:
AGGREG-446
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigatableESPFastCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigatableESPFastCommand.java
2007-07-24 07:26:38 UTC (rev 5553)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NavigatableESPFastCommand.java
2007-07-24 11:50:18 UTC (rev 5554)
@@ -18,6 +18,7 @@
import no.schibstedsok.searchportal.result.Navigator;
import no.schibstedsok.searchportal.util.Channels;
import no.schibstedsok.searchportal.util.ModifierDateComparator;
+import no.schibstedsok.searchportal.util.ModifierStringComparator;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -103,7 +104,7 @@
}
if (null != getNavigators() && searchResult instanceof
FastSearchResult) {
- collectModifiers(getIQueryResult(),
(FastSearchResult)searchResult);
+ collectModifiers(getIQueryResult(), (FastSearchResult<? extends
ResultItem>)searchResult);
}
return searchResult;
@@ -282,7 +283,7 @@
return getSearchConfiguration().getNavigators();
}
- private void collectModifiers(IQueryResult result, FastSearchResult
searchResult) {
+ private void collectModifiers(IQueryResult result, FastSearchResult<?
extends ResultItem> searchResult) {
for (String navigatorKey : navigatedTo.keySet()) {
@@ -290,7 +291,7 @@
}
}
- private void collectModifier(String navigatorKey, IQueryResult result,
FastSearchResult searchResult) {
+ private void collectModifier(String navigatorKey, IQueryResult result,
FastSearchResult<? extends ResultItem> searchResult) {
final Navigator nav = navigatedTo.get(navigatorKey);
INavigator navigator = null;
@@ -333,6 +334,10 @@
case YEAR_MONTH:
Collections.sort(searchResult.getModifiers(navigatorKey),
ModifierDateComparator.YEAR_MONTH);
break;
+ case ALPHABETICAL:
+
Collections.sort(searchResult.getModifiers(navigatorKey),
ModifierStringComparator.ALPHABETICAL);
+ case ALPHABETICAL_DESCENDING:
+
Collections.sort(searchResult.getModifiers(navigatorKey),
Collections.reverseOrder(ModifierStringComparator.ALPHABETICAL));
case NONE:
// Use the soting the index returns
break;
Added:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/util/ModifierStringComparator.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/util/ModifierStringComparator.java
(rev 0)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/util/ModifierStringComparator.java
2007-07-24 11:50:18 UTC (rev 5554)
@@ -0,0 +1,15 @@
+package no.schibstedsok.searchportal.util;
+
+import no.schibstedsok.searchportal.result.Modifier;
+
+import java.util.Comparator;
+
+/**
+ * @author Geir H. Pettersen(T-Rank)
+ */
+public enum ModifierStringComparator implements Comparator<Modifier> {
+ ALPHABETICAL;
+ public int compare(Modifier m1, Modifier m2) {
+ return m1.getName().compareTo(m2.getName());
+ }
+}
Modified:
trunk/result-spi/src/main/java/no/schibstedsok/searchportal/result/Navigator.java
===================================================================
---
trunk/result-spi/src/main/java/no/schibstedsok/searchportal/result/Navigator.java
2007-07-24 07:26:38 UTC (rev 5553)
+++
trunk/result-spi/src/main/java/no/schibstedsok/searchportal/result/Navigator.java
2007-07-24 11:50:18 UTC (rev 5554)
@@ -32,6 +32,8 @@
DAY_MONTH_YEAR(),
DAY_MONTH_YEAR_DESCENDING,
YEAR_MONTH,
+ ALPHABETICAL,
+ ALPHABETICAL_DESCENDING,
NONE
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
