Author: ssthkjer Date: 2007-02-13 15:38:19 +0100 (Tue, 13 Feb 2007) New Revision: 4434
Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java Log: https://jira.sesam.no/jira/browse/SEARCH-1524 - remove unused code 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-02-13 14:30:34 UTC (rev 4433) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/NewsSearchCommand.java 2007-02-13 14:38:19 UTC (rev 4434) @@ -132,14 +132,9 @@ } } else { - final String nav_newsdateOnly = getParameter("nav_newsdateOnly2"); GregorianCalendar calendar = new java.util.GregorianCalendar(); final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - if (nav_newsdateOnly.equals("newsdatenavigator")) { - calendar.add( java.util.Calendar.DATE, -49 ); - } else { - calendar.add( java.util.Calendar.MONTH, -24 ); - } + calendar.add( java.util.Calendar.MONTH, -24 ); String newsdate = formatter.format(calendar.getTime()); @@ -169,16 +164,12 @@ filterBuilder.append(" AND newscountry:Norge"); } filterBuilder.append(" ANDNOT meta.collection:mano"); - if (nav_newsdateOnly.equals("newsdatenavigator")) { - filterBuilder.append(" AND docdatetime:>" + newsdate); - } else { - filterBuilder.append(" AND ( docdatetime:>" + newsdate); - filterBuilder.append(" OR newssource:Digi.no"); - filterBuilder.append(" OR newssource:DinSide"); - filterBuilder.append(" OR newssource:ITavisen"); - filterBuilder.append(" OR newssource:iMarkedet"); - filterBuilder.append(" OR newssource:Propaganda )"); - } + filterBuilder.append(" AND ( docdatetime:>" + newsdate); + filterBuilder.append(" OR newssource:Digi.no"); + filterBuilder.append(" OR newssource:DinSide"); + filterBuilder.append(" OR newssource:ITavisen"); + filterBuilder.append(" OR newssource:iMarkedet"); + filterBuilder.append(" OR newssource:Propaganda )"); // PAPERNEWS: } else { filterBuilder.append(" AND contentsource:" + contentSource); _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
