Author: bpoussin Date: 2013-02-21 20:18:13 +0100 (Thu, 21 Feb 2013) New Revision: 1533 Url: http://nuiton.org/projects/wikitty/repository/revisions/1533 Log: amelioration des logs le toString de FunctionValue ajouter des " autour de la valeur Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorToString.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2013-02-21 14:32:58 UTC (rev 1532) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2013-02-21 19:18:13 UTC (rev 1533) @@ -36,7 +36,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.query.conditions.Aggregate; import org.nuiton.wikitty.query.conditions.And; import org.nuiton.wikitty.query.conditions.Between; import org.nuiton.wikitty.query.conditions.Condition; @@ -62,7 +61,6 @@ import org.nuiton.wikitty.query.conditions.True; import org.nuiton.wikitty.query.conditions.Unlike; import org.nuiton.wikitty.query.function.FunctionFieldValue; -import org.nuiton.wikitty.query.function.FunctionFusion; import org.nuiton.wikitty.query.function.FunctionValue; import org.parboiled.BaseParser; import org.parboiled.Context; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorToString.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorToString.java 2013-02-21 14:32:58 UTC (rev 1532) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorToString.java 2013-02-21 19:18:13 UTC (rev 1533) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -364,7 +365,7 @@ @Override public void visit(FunctionValue function) { - text += String.valueOf(function.getValue()); + text += '"' + String.valueOf(function.getValue()).replaceAll("\"", "\\\"") + '"'; } @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2013-02-21 14:32:58 UTC (rev 1532) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2013-02-21 19:18:13 UTC (rev 1533) @@ -977,12 +977,17 @@ if (c == null) { result.add(null); } else { - long startTime = System.nanoTime(); - WikittyQueryResult<Map<String, Object>> searchResult = - getSearchEngine().findAllByQuery(tx, c); - long estimatedTime = System.nanoTime() - startTime; - searchResult.setTimeQuery(estimatedTime); - result.add(searchResult); + try { + long startTime = System.nanoTime(); + WikittyQueryResult<Map<String, Object>> searchResult = + getSearchEngine().findAllByQuery(tx, c); + long estimatedTime = System.nanoTime() - startTime; + searchResult.setTimeQuery(estimatedTime); + result.add(searchResult); + } catch (Exception eee) { + throw new WikittyException(String.format( + "Can't evaluate query '%s'", c), eee); + } } }