Author: mickw
Date: 2006-04-05 11:41:44 +0200 (Wed, 05 Apr 2006)
New Revision: 2717
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/configuration/YellowSearchConfiguration.java
trunk/src/java/no/schibstedsok/front/searchportal/query/parser/AbstractQueryParser.java
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
Log:
small changes/formatting/cleanup and autoboxing.
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/configuration/YellowSearchConfiguration.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/configuration/YellowSearchConfiguration.java
2006-04-05 09:00:20 UTC (rev 2716)
+++
trunk/src/java/no/schibstedsok/front/searchportal/configuration/YellowSearchConfiguration.java
2006-04-05 09:41:44 UTC (rev 2717)
@@ -15,7 +15,6 @@
* @author <a href="[EMAIL PROTECTED]">Magnus Eklund</a>
* @version $Revision$
*/
-public class YellowSearchConfiguration extends FastConfiguration implements
- SearchConfiguration {
+public class YellowSearchConfiguration extends FastConfiguration {
}
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/parser/AbstractQueryParser.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/parser/AbstractQueryParser.java
2006-04-05 09:00:20 UTC (rev 2716)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/parser/AbstractQueryParser.java
2006-04-05 09:41:44 UTC (rev 2717)
@@ -105,14 +105,15 @@
}
protected final Context createContext(final String input){
+
return ContextWrapper.wrap(
QueryParser.Context.class,
- new QueryStringContext(){
- public String getQueryString(){
- return input;
- }
- },
- context
+ new QueryStringContext(){
+ public String getQueryString(){
+ return input;
+ }
+ },
+ context
);
}
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
2006-04-05 09:00:20 UTC (rev 2716)
+++
trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java
2006-04-05 09:41:44 UTC (rev 2717)
@@ -262,18 +262,18 @@
if (searchResult != null) {
- final SearchCommand command =
searchResult.getSearchCommand();
- final SearchConfiguration configuration =
command.getSearchConfiguration();
+ final SearchConfiguration configuration
+ =
searchResult.getSearchCommand().getSearchConfiguration();
hitsToShow |= searchResult.getHitCount() > 0;
- hits.put(configuration.getName(),
Integer.valueOf(searchResult.getHitCount()));
+ hits.put(configuration.getName(),
searchResult.getHitCount());
final Integer score =
scores.get(configuration.getName());
- if (score != null && configuration.getRule() != null
&& score.intValue() >= configuration.getRuleThreshold()) {
+ if (score != null && configuration.getRule() != null
&& score >= configuration.getRuleThreshold()) {
if (searchResult.getResults().size() > 0 &&
score.intValue() > 15) {
- final Enrichment e = new
Enrichment(score.intValue(), configuration.getName());
+ final Enrichment e = new Enrichment(score,
configuration.getName());
enrichments.add(e);
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
