Author: gttersen
Date: 2007-05-09 00:48:02 +0200 (Wed, 09 May 2007)
New Revision: 5023
Modified:
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsMyNewsSearchCommand.java
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMyNewsQueryTransformer.java
Log:
NewsAggregator changes
Modified:
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsMyNewsSearchCommand.java
===================================================================
---
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsMyNewsSearchCommand.java
2007-05-08 20:58:25 UTC (rev 5022)
+++
branches/2.12/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsMyNewsSearchCommand.java
2007-05-08 22:48:02 UTC (rev 5023)
@@ -87,13 +87,15 @@
// count all cookies
position++;
}
- mergedResult.setHitCount(position + 1 + offset);
+ mergedResult.setHitCount(position + offset);
setNextOffset(mergedResult, config.getResultsToReturn());
return mergedResult;
} else {
- return new BasicSearchResult(this);
+ BasicSearchResult searchResult = new BasicSearchResult(this);
+ searchResult.setHitCount(0);
+ return searchResult;
}
}
Modified:
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMyNewsQueryTransformer.java
===================================================================
---
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMyNewsQueryTransformer.java
2007-05-08 20:58:25 UTC (rev 5022)
+++
branches/2.12/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/NewsMyNewsQueryTransformer.java
2007-05-08 22:48:02 UTC (rev 5023)
@@ -63,8 +63,7 @@
} else {
newQuery.append(',');
}
- String fastCompatibleString =
matcher.group(1).replace('?', ' ');
-
newQuery.append('\"').append(fastCompatibleString).append('\"');
+
newQuery.append('\"').append(matcher.group(1)).append('\"');
}
}
if (newQuery.length() > 0 && config.getFilterField() != null) {
@@ -83,10 +82,11 @@
}
LOG.debug("Group at pos: " + pos + " is " + matcher.group(0) +
", looking for " + config.getType());
if (matcher.groupCount() > 0 &&
matcher.group(2).equals(config.getType())) {
+ final String fastCompatibleString =
matcher.group(1).replace('?', ' ');
if (config.getFilterField() == null) {
- return matcher.group(1);
+ return fastCompatibleString;
} else {
- return config.getFilterField() + ":(\"" +
matcher.group(1) + "\")";
+ return config.getFilterField() + ":(\"" +
fastCompatibleString + "\")";
}
} else {
return "";
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
