Author: ssthkjer Date: 2007-01-02 14:18:01 +0100 (Tue, 02 Jan 2007) New Revision: 4243
Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/FastSearchConfiguration.java Log: https://jira.sesam.no/jira/browse/SEARCH-1271, getting the hitcount in navigator to work 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 2007-01-02 12:45:38 UTC (rev 4242) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java 2007-01-02 13:18:01 UTC (rev 4243) @@ -437,6 +437,7 @@ fillBeanProperty(sc, inherit, "filter", ParseType.String , commandE, ""); fillBeanProperty(sc, inherit, "ignoreNavigation", ParseType.Boolean , commandE, "false"); + fillBeanProperty(sc, inherit, "norwegianNewsNavigator", ParseType.Boolean , commandE, "false"); fillBeanProperty(sc, inherit, "offensiveScoreLimit", ParseType.Int , commandE, "-1"); fillBeanProperty(sc, inherit, "qtPipeline", ParseType.String , commandE, ""); fillBeanProperty(sc, inherit, "queryServerUrl", ParseType.String , commandE, ""); Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java =================================================================== --- trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java 2007-01-02 12:45:38 UTC (rev 4242) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java 2007-01-02 13:18:01 UTC (rev 4243) @@ -108,6 +108,15 @@ filterBuilder.append(" +docdatetime:>" + xx); } } + + if (getSearchConfiguration().isNorwegianNewsNavigator()) { + GregorianCalendar calendar = new java.util.GregorianCalendar(); + calendar.add( java.util.Calendar.MONTH, -24 ); + final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + String xx = formatter.format(calendar.getTime()); + filterBuilder.append(" +docdatetime:>" + xx); + filterBuilder.append(" +newscountry:Norge"); + } } } return filterBuilder.toString(); 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 2007-01-02 12:45:38 UTC (rev 4242) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/FastSearchConfiguration.java 2007-01-02 13:18:01 UTC (rev 4243) @@ -60,6 +60,7 @@ private String resultView; private boolean clustering = false; private boolean ignoreNavigation = false; + private boolean norwegianNewsNavigator = false; private int offensiveScoreLimit = 0; private int spamScoreLimit = 0; @@ -92,6 +93,7 @@ resultView = fsc.resultView; clustering = fsc.clustering; ignoreNavigation = fsc.ignoreNavigation; + norwegianNewsNavigator = fsc.norwegianNewsNavigator; offensiveScoreLimit = fsc.offensiveScoreLimit; spamScoreLimit = fsc.spamScoreLimit; filter = fsc.filter; @@ -251,6 +253,14 @@ this.ignoreNavigation = ignoreNavigationEnabled; } + public boolean isNorwegianNewsNavigator() { + return norwegianNewsNavigator; + } + + public void setNorwegianNewsNavigator(final boolean norwegianNewsNavigatorEnabled) { + this.norwegianNewsNavigator = norwegianNewsNavigatorEnabled; + } + public int getOffensiveScoreLimit() { return offensiveScoreLimit; } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
