Author: sshafroi
Date: 2008-11-21 16:19:34 +0100 (Fri, 21 Nov 2008)
New Revision: 6971
Modified:
branches/2.18/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/AgefilterQueryTransformer.java
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
SEARCH-5189 - Blogger: Feil i datonavigator
Filter stringen inneholdt flere : og derfor ville 2 testen feile. Se diff.
Modified:
branches/2.18/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/AgefilterQueryTransformer.java
===================================================================
---
branches/2.18/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/AgefilterQueryTransformer.java
2008-11-21 12:26:15 UTC (rev 6970)
+++
branches/2.18/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/AgefilterQueryTransformer.java
2008-11-21 15:19:34 UTC (rev 6971)
@@ -1,4 +1,4 @@
-/*
+/* Copyright (2008) Schibsted Søk AS
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -52,7 +52,7 @@
public String getFilter(final Map parameters) {
String ageSymbol = config.getAgeSymbol();
- if (config.getAgeSymbol() == null) {
+ if (ageSymbol == null) {
ageSymbol = parameters.get(AGE_PARAMETER) instanceof String[]
? ((String[]) parameters.get(AGE_PARAMETER))[0]
: (String) parameters.get(AGE_PARAMETER);
@@ -78,7 +78,7 @@
/**
* @param ageSymbol
- * @return
+ * @return Number of seconds that one unit of the ageSymbol represents.
*/
public int getAgeInSeconds(final String ageSymbol) {
if (ageSymbol.equals("w")) {
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-11-21 12:26:15 UTC (rev 6970)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-11-21 15:19:34 UTC (rev 6971)
@@ -906,12 +906,11 @@
* @param filter
*/
protected void addFilterString(final String filter){
-
if(null != filter && filter.length() > 0){
+ final int pos = filter.indexOf(":");
- final String[] pair = filter.split(":");
- if(2 == pair.length){
- filterBuilder.addFilter(pair[0], pair[1]);
+ if(pos > 0){
+ filterBuilder.addFilter(filter.substring(0, pos),
filter.substring(pos+1));
}else{
filterBuilder.addFilter(null, filter);
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
