Author: gttersen
Date: 2007-04-24 23:34:33 +0200 (Tue, 24 Apr 2007)
New Revision: 4864
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMediumQueryTransformer.java
Log:
Fixes for newsAggregator
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
===================================================================
---
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
2007-04-24 21:24:03 UTC (rev 4863)
+++
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsCaseQueryTransformer.java
2007-04-24 21:34:33 UTC (rev 4864)
@@ -67,14 +67,18 @@
}
private String addUnclusteredDelayFilter(String transformedQuery) {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- cal.add(Calendar.MINUTE, -config.getUnclusteredDelayInMinutes());
- StringBuilder sb = new StringBuilder(transformedQuery);
- sb.insert(0, "and(");
- sb.append(",cluster:range(1,max) or processingtime:range(min,");
- sb.append(sdf.format(cal.getTime()));
- sb.append("))");
- return sb.toString();
+ if (transformedQuery != null && transformedQuery.length() > 0) {
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ cal.add(Calendar.MINUTE, -config.getUnclusteredDelayInMinutes());
+ StringBuilder sb = new StringBuilder(transformedQuery);
+ sb.insert(0, "and(");
+ sb.append(",cluster:range(1,max) or processingtime:range(min,");
+ sb.append(sdf.format(cal.getTime()));
+ sb.append("))");
+ return sb.toString();
+ } else {
+ return transformedQuery;
+ }
}
private String getTransformedTermsQuery() {
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMediumQueryTransformer.java
===================================================================
---
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMediumQueryTransformer.java
2007-04-24 21:24:03 UTC (rev 4863)
+++
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMediumQueryTransformer.java
2007-04-24 21:34:33 UTC (rev 4864)
@@ -13,11 +13,12 @@
public void visitImpl(final Clause clause) {
String medium = (String)
getContext().getDataModel().getJunkYard().getValue(config.getMediumParameter());
- if (!NewsMediumQueryTransformerConfig.ALL_MEDIUMS.equals(medium)) {
+ final String originalQuery = getTransformedTermsQuery();
+ if (!NewsMediumQueryTransformerConfig.ALL_MEDIUMS.equals(medium) &&
originalQuery.length() > 0) {
if (medium == null || medium.length() == 0) {
medium = config.getDefaultMedium();
}
- StringBuilder query = new
StringBuilder(getTransformedTermsQuery());
+ StringBuilder query = new StringBuilder(originalQuery);
query.insert(0, "and(");
query.append(",
").append(config.getMediumPrefix()).append(':').append(medium).append(')');
for (Clause keyClause :
getContext().getTransformedTerms().keySet()) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
