Author: ssmiweve Date: 2009-08-11 23:13:10 +0200 (Tue, 11 Aug 2009) New Revision: 7265
Modified: trunk/ trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooWebSearchCommand.java Log: svn merge http://sesat.no/svn/sesat-kernel/branches/2.18/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/2.10:4629-4745 /branches/2.11:4751-4933 /branches/2.12:4943-5106 /branches/2.13:5177-5378 /branches/2.14:5379-5508 /branches/2.15:5746-5995 /branches/2.16:6024-6122,6344-6499 /branches/2.16.0:6154-6343 /branches/2.17:6340-6980 /branches/2.18:6960-7262 /branches/2.6:3862-3877 /branches/2.7:4074-4160 /branches/2.8:4295-4446 /branches/2.9:4457-4626 /branches/MAP_SEARCHv2:3935-4544 /trunk:1-6959 + /branches/2.10:4629-4745 /branches/2.11:4751-4933 /branches/2.12:4943-5106 /branches/2.13:5177-5378 /branches/2.14:5379-5508 /branches/2.15:5746-5995 /branches/2.16:6024-6122,6344-6499 /branches/2.16.0:6154-6343 /branches/2.17:6340-6980 /branches/2.18:6960-7264 /branches/2.6:3862-3877 /branches/2.7:4074-4160 /branches/2.8:4295-4446 /branches/2.9:4457-4626 /branches/MAP_SEARCHv2:3935-4544 /trunk:1-6959 Modified: trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooWebSearchCommand.java =================================================================== --- trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooWebSearchCommand.java 2009-08-11 21:06:29 UTC (rev 7264) +++ trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooWebSearchCommand.java 2009-08-11 21:13:10 UTC (rev 7265) @@ -1,5 +1,5 @@ /* - * Copyright (2008) Schibsted ASA + * Copyright (2008-2009) Schibsted ASA * This file is part of SESAT. * * SESAT is free software: you can redistribute it and/or modify @@ -46,6 +46,8 @@ */ public class YahooWebSearchCommand extends AbstractYahooSearchCommand { + // Constants ----------------------------------------------------- + private static final Logger LOG = Logger.getLogger(YahooWebSearchCommand.class); private static final String ERR_FAILED_CREATING_URL = "Failed to create command url"; @@ -57,6 +59,12 @@ private static final String TOTALHITS_ATTRIBUTE ="totalResultsAvailable"; private static final String RESULT_ELEMENT = "Result"; + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + /** * Create new command. * @@ -103,6 +111,8 @@ }); } + // Public -------------------------------------------------------- + public ResultList<ResultItem> execute() { try { @@ -157,6 +167,21 @@ return (YahooWebCommandConfig)super.getSearchConfiguration(); } + @Override + public String getTransformedQuery() { + final String tq = super.getTransformedQuery(); + if(tq == null) { + LOG.debug("transformedQuery is null, using \"\""); + return ""; + } + return tq; + } + + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + /** * * @param result @@ -178,13 +203,21 @@ } @Override - public String getTransformedQuery() { - final String tq = super.getTransformedQuery(); - if(tq == null) { - LOG.debug("transformedQuery is null, using \"\""); - return ""; - } - return tq; + protected String getFilter() { + return super.getFilter(); } + @Override + protected int getOffset() { + return super.getOffset(); + } + + @Override + protected String getParameter(String paramName) { + return super.getParameter(paramName); + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- } _______________________________________________ Kernel-commits mailing list Kernel-commits@sesat.no http://sesat.no/mailman/listinfo/kernel-commits
