Author: bpoussin Date: 2012-08-24 01:33:41 +0200 (Fri, 24 Aug 2012) New Revision: 1504 Url: http://nuiton.org/repositories/revision/wikitty/1504 Log: amelioration du convertisseur, si une sous requete ne retourne pas de resultat, ca ne plante plus Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-08-23 11:06:44 UTC (rev 1503) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-08-23 23:33:41 UTC (rev 1504) @@ -156,17 +156,18 @@ private String escape2solr(String value) { String result; - if (value != null) { + if (StringUtils.isNotEmpty(value)) { final String LUCENE_REPLACE_PATTERN = "\\+" + "|-" + "|&&" + "|\\|" + "|!" + "|\\(|\\)" + "|\\[|\\]" + "|\\{|\\}" + "|\"" + "|:"; result = value.replaceAll(LUCENE_REPLACE_PATTERN, "\\\\$0"); + if (result.contains(" ")) { + result = "\"" + result + "\""; + } } else { - throw new WikittyException("Parse error, value must be not empty"); +// throw new WikittyException("Parse error, value must be not empty"); + result = "\"\""; } - if (result.contains(" ")) { - result = "\"" + result + "\""; - } return result; }