Author: gttersen
Date: 2007-05-15 13:06:31 +0200 (Tue, 15 May 2007)
New Revision: 5085
Modified:
branches/2.12/query-transform-config-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformerConfig.java
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
Log:
NewsAggregator fixed timezone bug
Modified:
branches/2.12/query-transform-config-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformerConfig.java
===================================================================
---
branches/2.12/query-transform-config-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformerConfig.java
2007-05-15 11:05:33 UTC (rev 5084)
+++
branches/2.12/query-transform-config-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformerConfig.java
2007-05-15 11:06:31 UTC (rev 5085)
@@ -29,8 +29,10 @@
private static final String DEFAULT_TYPE = "default-type";
private static final String UNCLUSTERED_DELAY = "unclustered-delay";
private static final String UNCLUSTERED_DELAY_IN_MINUTES =
"unclustered-delay-in-minutes";
+ private static final String TIME_ZONE = "time-zone";
private static final String DEFAULT_CONVERT_ELEMENT = "default-convert";
+ private String timeZone = "UTC";
private String queryType;
private String queryParameter;
private String typeParameter;
@@ -72,6 +74,14 @@
return unclusteredDelayInMinutes;
}
+ public String getTimeZone() {
+ return timeZone;
+ }
+
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+
@Override
public NewsCaseQueryTransformerConfig readQueryTransformer(final Element
element) {
queryType = element.getAttribute(QUERY_TYPE);
@@ -91,6 +101,11 @@
if (optionalParameter != null && optionalParameter.length() > 0) {
unclusteredDelayInMinutes = Integer.parseInt(optionalParameter);
}
+ optionalParameter = element.getAttribute(TIME_ZONE);
+ if (optionalParameter != null && optionalParameter.length() > 0) {
+ timeZone = optionalParameter;
+ }
+
NodeList convertNodeList =
element.getElementsByTagName(DEFAULT_CONVERT_ELEMENT);
if (convertNodeList.getLength() > 0) {
typeConversions = new HashMap<String, String[]>();
Modified:
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
===================================================================
---
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
2007-05-15 11:05:33 UTC (rev 5084)
+++
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
2007-05-15 11:06:31 UTC (rev 5085)
@@ -32,6 +32,7 @@
*/
public NewsCaseQueryTransformer(final QueryTransformerConfig config) {
this.config = (NewsCaseQueryTransformerConfig) config;
+ sdf.setTimeZone(TimeZone.getTimeZone(this.config.getTimeZone()));
}
@@ -68,7 +69,7 @@
private String addUnclusteredDelayFilter(String transformedQuery) {
if (transformedQuery != null && transformedQuery.length() > 0) {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Calendar cal =
Calendar.getInstance(TimeZone.getTimeZone(config.getTimeZone()));
cal.add(Calendar.MINUTE, -config.getUnclusteredDelayInMinutes());
StringBuilder sb = new StringBuilder(transformedQuery);
sb.insert(0, "and(");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
