Author: ssmiweve
Date: 2008-03-04 14:44:33 +0100 (Tue, 04 Mar 2008)
New Revision: 6216
Modified:
branches/2.16/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsAggregatorSearchCommand.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsClusteringESPFastCommand.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java
branches/2.16/generic.sesam/war/src/main/conf/modes.xml
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/SearchCommand.java
Log:
SEARCH-4264 - Nyhetss?\195?\184k, netts?\195?\184kberikelsen tar i bruk offset
fra URL-en
Modified:
branches/2.16/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
===================================================================
---
branches/2.16/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -322,7 +322,8 @@
if (searchResult != null) {
// Information we need about and for the
enrichment
- final SearchConfiguration config =
results.get(task).getSearchConfiguration();
+ final SearchCommand command =
results.get(task);
+ final SearchConfiguration config =
command.getSearchConfiguration();
final String name = config.getName();
final EnrichmentHint eHint =
context.getSearchTab().getEnrichmentByCommand(name);
@@ -335,7 +336,7 @@
hitsToShow |= searchResult.getHitCount() > 0;
hits.put(name, searchResult.getHitCount());
- if( searchResult.getHitCount() <= 0 &&
config.isPaging() ){
+ if( searchResult.getHitCount() <= 0 &&
command.isPaginated() ){
noHitsOutput.append("<command id=\"" +
config.getName()
+ "\" name=\"" +
config.getStatisticalName()
+ "\" type=\"" +
config.getClass().getSimpleName()
Modified:
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
===================================================================
---
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -39,8 +39,6 @@
private String userSortParameter;
private String sortField;
private String defaultSort;
-
- private boolean ignoreOffset = false;
private String relevanceSortField;
private String maxAge;
private int maxAgeAmount;
@@ -161,21 +159,6 @@
this.mediumParameter = mediumParameter;
}
- /** Getter for the ignoreOffset property.
- * @return the ignoreOffset value
- */
- public boolean isIgnoreOffset() {
- return ignoreOffset;
- }
-
- /** Setter for the ignoreOffset property.
- * @param ignoreOffset the new ignoreOffset value
- */
- public void setIgnoreOffset(final boolean ignoreOffset) {
- this.ignoreOffset = ignoreOffset;
- }
-
-
/** Getter for the relevanceSortField property.
* @return the relevanceSortField value
*/
@@ -257,8 +240,6 @@
.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");
AbstractDocumentFactory.fillBeanProperty(this, inherit, "sortField",
ParseType.String, element, "publishedtime");
AbstractDocumentFactory.fillBeanProperty(this, inherit, "defaultSort",
ParseType.String, element, "descending");
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsAggregatorSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsAggregatorSearchCommand.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsAggregatorSearchCommand.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -355,7 +355,6 @@
addResult(config, searchResultItem, tmpSearchResult,
collapseMap, true);
}
sortResults(tmpSearchResult, sort);
- offset = config.isIgnoreOffset() ? 0 : offset;
int lastIndex =
Math.min(tmpSearchResult.getResults().size(), offset +
config.getResultsToReturn());
for (int i = offset; i < lastIndex; i++) {
searchResult.addResult(tmpSearchResult.getResults().get(i));
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsClusteringESPFastCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsClusteringESPFastCommand.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsClusteringESPFastCommand.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -124,7 +124,7 @@
ResultList<ResultItem> clusterEntry = null;
LOG.debug("HitCount=" + result.getDocCount() + ", clusterField=" +
clusterField + ", offset=" + offset);
- final int firstHit = config.isIgnoreOffset() ? 0 : offset;
+ final int firstHit = offset;
for (int i = firstHit; i < result.getDocCount(); i++) {
try {
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -104,9 +104,6 @@
}
query.setParameter(BaseParameter.HITS,
Math.max(config.getCollapsingMaxFetch(), config.getResultsToReturn()));
- if (config.isIgnoreOffset()) {
- query.setParameter(new SearchParameter(BaseParameter.OFFSET, 0));
- }
if (config.getMaxAge() != null) {
final Calendar cal =
Calendar.getInstance(TimeZone.getTimeZone("UTC"));
Modified: branches/2.16/generic.sesam/war/src/main/conf/modes.xml
===================================================================
--- branches/2.16/generic.sesam/war/src/main/conf/modes.xml 2008-03-04
10:15:26 UTC (rev 6215)
+++ branches/2.16/generic.sesam/war/src/main/conf/modes.xml 2008-03-04
13:44:33 UTC (rev 6216)
@@ -33,7 +33,7 @@
<command id="default-command"
field-filters="site,size"
- paging="false"
+
query-parameter=""
result-fields=""
results-to-return="1"/>
Modified:
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
===================================================================
---
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -73,7 +73,6 @@
private final Map<String,String> resultFields = new
HashMap<String,String>();
private int resultsToReturn;
- private boolean paging = false;
private String queryParameter;
private boolean alwaysRun = true;
@@ -95,19 +94,7 @@
public CommandConfig(){}
// Public --------------------------------------------------------
-
- /**
- * Sets the paging enabled status of this configuration. The default is
- * false.
- *
- * @param pagingEnabled
- */
- public final void setPaging(final boolean pagingEnabled) {
- LOG.trace("setPagingEnabled() " + pagingEnabled);
- this.paging = pagingEnabled;
- }
-
/**
* Returns a (defensive copy) list of [EMAIL PROTECTED]
QueryTransformerConfig} that should be applied
* to the query before it is sent to the search command.
@@ -150,11 +137,6 @@
}
/** [EMAIL PROTECTED] **/
- public final boolean isPaging() {
- return paging;
- }
-
- /** [EMAIL PROTECTED] **/
public final void addResultField(final String... fieldName) {
resultFields.put(fieldName[0].trim(), (fieldName.length >1 ?
fieldName[1] : fieldName[0]).trim());
}
@@ -313,7 +295,6 @@
}
}
- AbstractDocumentFactory.fillBeanProperty(this, inherit, "paging",
ParseType.Boolean, element, "false");
AbstractDocumentFactory.fillBeanProperty(this, inherit,
"queryParameter", ParseType.String, element, "");
// result-fields
Modified:
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
===================================================================
---
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -78,15 +78,6 @@
int getResultsToReturn();
/**
- * Returns true if paging shoud be enabled to this configuration. This
- * is typically only set to true for one of the configurations in a
- * [EMAIL PROTECTED] no.sesat.search.mode.SearchMode}
- *
- * @return true if paging is enabled.
- */
- boolean isPaging();
-
- /**
* @return
*/
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -589,9 +589,8 @@
protected int getOffset(){
int offset = 0;
- final Nav offsetNav =
context.getDataModel().getNavigation().getConfiguration().getNavMap().get(OFFSET_KEY);
- if(null != offsetNav &&
getSearchConfiguration().getName().equals(offsetNav.getCommandName())){
+ if(isPaginated()){
final StringDataObject offsetString =
context.getDataModel().getParameters().getValue(OFFSET_KEY);
if( null != offsetString ){
offset = Integer.parseInt(offsetString.getUtf8UrlEncoded());
@@ -599,6 +598,12 @@
}
return offset;
}
+
+ public boolean isPaginated(){
+
+ final Nav offsetNav =
context.getDataModel().getNavigation().getConfiguration().getNavMap().get(OFFSET_KEY);
+ return null != offsetNav &&
getSearchConfiguration().getName().equals(offsetNav.getCommandName());
+ }
/**
* TODO comment me.
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/SearchCommand.java
===================================================================
---
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/SearchCommand.java
2008-03-04 10:15:26 UTC (rev 6215)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/SearchCommand.java
2008-03-04 13:44:33 UTC (rev 6216)
@@ -56,4 +56,6 @@
boolean isCancelled();
+ boolean isPaginated();
+
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
