Author: ssthkjer Date: 2006-12-22 11:51:51 +0100 (Fri, 22 Dec 2006) New Revision: 4222
Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSimpleFastSearchCommand.java trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/FastSearchConfiguration.java trunk/war/src/webapp/dtds/modes.dtd Log: https://jira.sesam.no/jira/browse/SEARCH-1346, spellcheck sweden. new attribute in modes.xml which for spellinglanguage Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java =================================================================== --- trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java 2006-12-21 15:16:33 UTC (rev 4221) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java 2006-12-22 10:51:51 UTC (rev 4222) @@ -456,6 +456,7 @@ fillBeanProperty(sc, inherit, "sortBy", ParseType.String , commandE, ""); fillBeanProperty(sc, inherit, "spamScoreLimit", ParseType.Int , commandE, "-1"); fillBeanProperty(sc, inherit, "spellcheck", ParseType.Boolean , commandE, "false"); + fillBeanProperty(sc, inherit, "spellchecklanguage", ParseType.String , commandE, ""); fillBeanProperty(sc, inherit, "lemmatise", ParseType.Boolean , commandE, "false"); // navigators Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSimpleFastSearchCommand.java =================================================================== --- trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSimpleFastSearchCommand.java 2006-12-21 15:16:33 UTC (rev 4221) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSimpleFastSearchCommand.java 2006-12-22 10:51:51 UTC (rev 4222) @@ -749,10 +749,8 @@ } params.setParameter(new SearchParameter(BaseParameter.QUERY, queryString)); params.setParameter(new SearchParameter(BaseParameter.COLLAPSING, getSearchConfiguration().isCollapsing())); + params.setParameter(new SearchParameter(BaseParameter.LANGUAGE, getSearchConfiguration().getSpellchecklanguage())); - params.setParameter(new SearchParameter(BaseParameter.LANGUAGE, "no")); - - if (getNavigators() != null && getNavigators().size() > 0) { params.setParameter(new SearchParameter(BaseParameter.NAVIGATION, true)); } Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/FastSearchConfiguration.java =================================================================== --- trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/FastSearchConfiguration.java 2006-12-21 15:16:33 UTC (rev 4221) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/FastSearchConfiguration.java 2006-12-22 10:51:51 UTC (rev 4222) @@ -47,6 +47,7 @@ private Map searchParameters; private boolean lemmatise; private boolean spellcheck; + private String spellchecklanguage; private final Map<String, Navigator> navigators = new HashMap<String,Navigator>(); private String sortBy; private boolean collapsing; @@ -80,6 +81,7 @@ searchParameters = fsc.searchParameters; lemmatise = fsc.lemmatise; spellcheck = fsc.spellcheck; + spellchecklanguage = fsc.spellchecklanguage; navigators.putAll(fsc.navigators); sortBy = fsc.sortBy; collapsing = fsc.collapsing; @@ -171,7 +173,16 @@ public void setSpellcheck(final boolean spellcheckEnabled) { this.spellcheck = spellcheckEnabled; } + + public String getSpellchecklanguage() { + return spellchecklanguage; + } + public void setSpellchecklanguage(final String spellchecklanguage) { + this.spellchecklanguage = spellchecklanguage; + } + + public Map<String, Navigator> getNavigators() { return navigators; } Modified: trunk/war/src/webapp/dtds/modes.dtd =================================================================== --- trunk/war/src/webapp/dtds/modes.dtd 2006-12-21 15:16:33 UTC (rev 4221) +++ trunk/war/src/webapp/dtds/modes.dtd 2006-12-22 10:51:51 UTC (rev 4222) @@ -62,6 +62,7 @@ id CDATA #IMPLIED spam-score-limit CDATA #IMPLIED spellcheck CDATA #IMPLIED + spellchecklanguage CDATA #IMPLIED synonyms CDATA #IMPLIED result-fields CDATA #IMPLIED results-to-return CDATA #IMPLIED @@ -161,6 +162,7 @@ <!ELEMENT web-command (result-handlers|query-transformers)*> <!ATTLIST web-command spellcheck CDATA #IMPLIED + spellchecklanguage CDATA #IMPLIED results-to-return CDATA #IMPLIED result-fields CDATA #IMPLIED paging CDATA #IMPLIED _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
