Author: gttersen
Date: 2007-03-27 17:15:55 +0200 (Tue, 27 Mar 2007)
New Revision: 4665
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/AgefilterQueryTransformer.java
Log:
Last split change introduced a bug. Fixed the bug, and removed some unnecessary
double code.
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/AgefilterQueryTransformer.java
===================================================================
---
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/AgefilterQueryTransformer.java
2007-03-27 13:19:25 UTC (rev 4664)
+++
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/AgefilterQueryTransformer.java
2007-03-27 15:15:55 UTC (rev 4665)
@@ -6,6 +6,8 @@
package no.schibstedsok.searchportal.query.transform;
+import org.apache.log4j.Logger;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -17,6 +19,7 @@
* @version $Id$
*/
public final class AgefilterQueryTransformer extends AbstractQueryTransformer {
+ private static final Logger LOG =
Logger.getLogger(AgefilterQueryTransformer.class);
private static final String FAST_DATE_FMT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
private static final String AGE_PARAMETER = "age";
@@ -24,10 +27,9 @@
private final AgefilterQueryTransformerConfig config;
/**
- *
* @param config
*/
- public AgefilterQueryTransformer(final QueryTransformerConfig config){
+ public AgefilterQueryTransformer(final QueryTransformerConfig config) {
this.config = (AgefilterQueryTransformerConfig) config;
}
@@ -41,7 +43,7 @@
: (String) parameters.get(AGE_PARAMETER);
}
- if (config.getAgeSymbol() != null &&
!config.getAgeSymbol().equals("")) {
+ if (ageSymbol != null && !ageSymbol.equals("")) {
final Calendar cal = Calendar.getInstance();
cal.add(Calendar.SECOND, -getAgeInSeconds(ageSymbol));
@@ -60,7 +62,6 @@
}
/**
- *
* @param ageSymbol
* @return
*/
@@ -69,8 +70,6 @@
return 60 * 60 * 24 * 7;
} else if (ageSymbol.equals("m")) {
return 60 * 60 * 24 * 30;
- } else if (ageSymbol.equals("h")) {
- return 60 * 60;
} else if (ageSymbol.equals("d")) {
return 60 * 60 * 24;
} else if (ageSymbol.equals("h")) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
