Author: gttersen
Date: 2007-06-13 18:23:55 +0200 (Wed, 13 Jun 2007)
New Revision: 5322
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/ClusteringESPFastCommand.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/CombineModifiersResultHandler.java
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
Log:
newsAggregator: aftenposten skin
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/ClusteringESPFastCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/ClusteringESPFastCommand.java
2007-06-13 16:22:19 UTC (rev 5321)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/ClusteringESPFastCommand.java
2007-06-13 16:23:55 UTC (rev 5322)
@@ -43,7 +43,7 @@
final ClusteringEspFastCommandConfig config = getSearchConfiguration();
final StringDataObject clusterId =
datamodel.getParameters().getValue(config.getClusterIdParameter());
- if (clusterId == null) {
+ if (clusterId == null && ! config.isClusteringDisabled()) {
LOG.debug("--- Modifying query. ---");
final int resultsPerCluster = config.getResultsPerCluster();
final int resultCount = config.getResultsToReturn() *
resultsPerCluster;
@@ -61,11 +61,18 @@
* @return the FAST IQueryReslt to make the searchResult from
* @throws IOException
*/
- protected FastSearchResult createSearchResult(final IQueryResult result)
throws IOException {
+ protected FastSearchResult<ResultItem> createSearchResult(final
IQueryResult result) throws IOException {
try {
final ClusteringEspFastCommandConfig config =
getSearchConfiguration();
StringDataObject clusterId =
datamodel.getParameters().getValue(config.getClusterIdParameter());
- if (clusterId == null) {
+ if (config.isClusteringDisabled()) {
+ FastSearchResult<ResultItem> searchResult =
super.createSearchResult(result);
+ int offset = getOffset();
+ if (offset + config.getResultsToReturn() <
result.getDocCount()) {
+ addNextOffsetField(offset + config.getResultsToReturn(),
searchResult);
+ }
+ return searchResult;
+ } else if (clusterId == null) {
return createClusteredSearchResult(config, getOffset(),
result);
} else {
return createCollapsedResults(config, getOffset(), result);
@@ -81,7 +88,7 @@
return super.createSearchResult(result);
}
- private FastSearchResult createClusteredSearchResult(
+ private FastSearchResult<ResultItem> createClusteredSearchResult(
final ClusteringEspFastCommandConfig config,
final int offset,
final IQueryResult result) throws IllegalType, EmptyValueException
{
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
2007-06-13 16:22:19 UTC (rev 5321)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsEspSearchCommand.java
2007-06-13 16:23:55 UTC (rev 5322)
@@ -86,7 +86,7 @@
}
@Override
- protected FastSearchResult createSearchResult(final IQueryResult result)
throws IOException {
+ protected FastSearchResult<ResultItem> createSearchResult(final
IQueryResult result) throws IOException {
final NewsEspCommandConfig config = getSearchConfiguration();
try {
return createCollapsedResults(config, getOffset(), result);
@@ -232,7 +232,7 @@
* @throws com.fastsearch.esp.search.result.EmptyValueException
*
*/
- protected FastSearchResult createCollapsedResults(
+ protected FastSearchResult<ResultItem> createCollapsedResults(
final NewsEspCommandConfig config,
final int offset,
final IQueryResult result) throws IllegalType, EmptyValueException
{
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/CombineModifiersResultHandler.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/CombineModifiersResultHandler.java
2007-06-13 16:22:19 UTC (rev 5321)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/CombineModifiersResultHandler.java
2007-06-13 16:23:55 UTC (rev 5322)
@@ -43,8 +43,8 @@
// The business
if (sourceModifierList != null && sourceModifierList.size() > 0) {
for (Modifier sourceModifier : sourceModifierList) {
- LOG.debug("Combining modifier: " + sourceModifier.getName() +
"=" + sourceModifier.getCount());
final String targetModifierName =
modifierMap.get(sourceModifier.getName());
+// LOG.debug("Combining modifier: " + sourceModifier.getName()
+ "=" + sourceModifier.getCount() + " to " + targetModifierName);
if (targetModifierName != null) {
Modifier targetModifier =
targetModifierMap.get(targetModifierName);
if (targetModifier == null) {
Modified:
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
2007-06-13 16:22:19 UTC (rev 5321)
+++
trunk/search-command-config-spi/src/main/java/no/schibstedsok/searchportal/mode/config/ClusteringEspFastCommandConfig.java
2007-06-13 16:23:55 UTC (rev 5322)
@@ -16,6 +16,7 @@
private String clusterIdParameter = "clusterId";
private int resultsPerCluster;
private String clusterField;
+ private boolean clusteringDisabled;
/**
* @return
@@ -31,6 +32,14 @@
this.clusterIdParameter = clusterIdParameter;
}
+ public boolean isClusteringDisabled() {
+ return clusteringDisabled;
+ }
+
+ public void setClusteringDisabled(boolean clusteringDisabled) {
+ this.clusteringDisabled = clusteringDisabled;
+ }
+
/**
* @param resultsPerCluster
*/
@@ -71,6 +80,7 @@
.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,
"clusteringDisabled", ParseType.Boolean, element, "false");
return this;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
