Author: ssthkjer Date: 2007-01-03 10:24:41 +0100 (Wed, 03 Jan 2007) New Revision: 4248
Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java Log: https://jira.sesam.no/jira/browse/SEARCH-1271 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-03 08:31:47 UTC (rev 4247) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java 2007-01-03 09:24:41 UTC (rev 4248) @@ -83,6 +83,7 @@ final String contentSource = getParameter("contentsource"); final String newsCountry = getParameter("newscountry"); + final String newsSource = getParameter("newssource"); // AAhhrghh. Need to provide backwards compatibility. // People are linking us using contentsource="Norske nyheter" @@ -98,14 +99,16 @@ } // Add filter to remove papernews from norwegian newssearch - // and only display news fresher than 2 years (deal with Retriever) + // and only display news fresher than 2 years except for some newssources (deal with Retriever) if (!contentSource.equals("Mediearkivet")) { filterBuilder.append(" -meta.collection:mano"); - 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); + if (!newsSource.equals("DinSide") && !newsSource.equals("Digi.no") && !newsSource.equals("ITavisen") && !newsSource.equals("iMarkedet") && !newsSource.equals("Propaganda")) { + 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); + } } } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
