Author: ssmiweve
Date: 2008-11-19 09:25:10 +0100 (Wed, 19 Nov 2008)
New Revision: 6950
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PicSearchCommand.java
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/BaseFilterBuilder.java
Log:
prevent NoSuchElementException when Tokenizer is initially empty.
and fix to java.lang.IllegalAccessError: tried to access method
no.sesat.search.mode.command.AbstractSearchCommand.getOffset()I from class
no.sesat.search.mode.command.PicSearchCommand$1
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
2008-11-19 07:51:47 UTC (rev 6949)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/PictureCommandConfig.java
2008-11-19 08:25:10 UTC (rev 6950)
@@ -20,7 +20,9 @@
import no.sesat.search.mode.config.CommandConfig.Controller;
import no.sesat.search.mode.config.querybuilder.InfixQueryBuilderConfig;
-/**
+/** A search command that uses the picsearch API.
+ * [EMAIL PROTECTED] http://www.picsearch.com/}
+ * [EMAIL PROTECTED] http://about.picsearch.com/image_search/}
*
* @version <tt>$Id$</tt>
*/
Modified:
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PicSearchCommand.java
===================================================================
---
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PicSearchCommand.java
2008-11-19 07:51:47 UTC (rev 6949)
+++
trunk/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/PicSearchCommand.java
2008-11-19 08:25:10 UTC (rev 6950)
@@ -18,7 +18,6 @@
import no.sesat.search.site.config.SiteConfiguration;
-import no.sesat.search.http.HTTPClient;
import no.sesat.search.result.BasicResultList;
import no.sesat.search.result.BasicResultItem;
import no.sesat.search.mode.config.PictureCommandConfig;
@@ -40,18 +39,27 @@
/**
*
- * A search command that uses the picsearch API.
+ * @see PictureCommandConfig
*
*
* @version <tt>$Id$</tt>
*/
public class PicSearchCommand extends AbstractXmlSearchCommand {
+ // Constants -----------------------------------------------------
+
private static final Logger LOG = Logger.getLogger(PicSearchCommand.class);
- private final int port;
private static final String REQ_URL_FMT =
"/query?ie=UTF-8&tldb={0}&filter={1}&custid={2}&version=2.6"
+ "&thumbs={3}&q={4}&start={5}&site={6}&color={7}&size={8}";
+ // Attributes ----------------------------------------------------
+
+ private final int port;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
/**
* Creates a new command in given context.
*
@@ -100,7 +108,7 @@
cfg.getCustomerId(),
cfg.getResultsToReturn(),
query,
- PicSearchCommand.this.getOffset()+1,
+ PicSearchCommand.this.getOffset() + 1,
PicSearchCommand.this.getFilterBuilder().getFilter("site").replace(' ', ','),
color,
size);
@@ -119,6 +127,8 @@
}
+ // Public --------------------------------------------------------
+
public ResultList<ResultItem> execute() {
final BasicResultList<ResultItem> searchResult = new
BasicResultList<ResultItem>();
@@ -147,6 +157,10 @@
}
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
/**
* Visits full names as separate words rather than as an entity.
*
@@ -188,4 +202,12 @@
return super.getFilterBuilder();
}
+ @Override
+ protected int getOffset() {
+ return super.getOffset();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
}
Modified:
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/BaseFilterBuilder.java
===================================================================
---
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/BaseFilterBuilder.java
2008-11-19 07:51:47 UTC (rev 6949)
+++
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/BaseFilterBuilder.java
2008-11-19 08:25:10 UTC (rev 6950)
@@ -95,20 +95,22 @@
final StringTokenizer tokeniser = new
StringTokenizer(getFilterString());
- for(String[] pair = tokeniser.nextToken().split(":");
- tokeniser.hasMoreTokens();
- pair = tokeniser.nextToken().split(":")){
+ if(tokeniser.hasMoreTokens()){
+ for(String[] pair = tokeniser.nextToken().split(":");
+ tokeniser.hasMoreTokens();
+ pair = tokeniser.nextToken().split(":")){
- if(pair[0].equals(string)){
+ if(pair[0].equals(string)){
- if(sb.length() > 0){ sb.append(' '); }
- sb.append(pair[1]);
+ if(sb.length() > 0){ sb.append(' '); }
+ sb.append(pair[1]);
- }else if(null == string && 1 == pair.length){
+ }else if(null == string && 1 == pair.length){
- if(sb.length() > 0){ sb.append(' '); }
- sb.append(pair[0]);
+ if(sb.length() > 0){ sb.append(' '); }
+ sb.append(pair[0]);
+ }
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
