From: <fxp...@us...> - 2011-05-25 06:43:22
|
Revision: 7758 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=7758&view=rev Author: fxprunayre Date: 2011-05-25 06:43:15 +0000 (Wed, 25 May 2011) Log Message: ----------- Cleaning : Use logger when adding debug info. Modified Paths: -------------- trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java trunk/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java trunk/web/src/main/java/org/fao/geonet/kernel/search/log/QueryInfo.java Modified: trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java =================================================================== --- trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java 2011-05-25 06:21:03 UTC (rev 7757) +++ trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java 2011-05-25 06:43:15 UTC (rev 7758) @@ -132,22 +132,20 @@ throws CatalogException { Element luceneExpr = filterToLucene(context, filterExpr); - System.out.println("\n\n\n*** CatS: after filter2lucene:\n"+ Xml.getString(luceneExpr)); + Log.debug(Geonet.CSW_SEARCH, "CatS: after filter2lucene:\n"+ Xml.getString(luceneExpr)); if (luceneExpr != null) { checkForErrors(luceneExpr); remapFields(luceneExpr); } - System.out.println("\n\n\n*** CatS: after remapfields:\n"+ Xml.getString(luceneExpr)); + Log.debug(Geonet.CSW_SEARCH, "CatS: after remapfields:\n"+ Xml.getString(luceneExpr)); try { if (luceneExpr != null) { convertPhrases(luceneExpr); - - System.out.println("\n\n\n*** CatS: after convertphrases:\n"+ Xml.getString(luceneExpr)); - + Log.debug(Geonet.CSW_SEARCH, "CatS: after convertphrases:\n"+ Xml.getString(luceneExpr)); } return performSearch(context, @@ -330,8 +328,9 @@ String filterVersion, Sort sort, ResultType resultType, int startPosition, int maxRecords, int maxHitsInSummary) throws Exception { - if (luceneExpr != null) System.out.println("\n\n\n*** CatS performsearch: luceneXpr:\n"+ Xml.getString(luceneExpr)); - if (filterExpr != null) System.out.println("\n\n\n*** CatS performsearch: filterXpr:\n"+ Xml.getString(filterExpr)); + if (filterExpr != null) { + Log.debug(Geonet.CSW_SEARCH, "CatS performsearch: filterXpr:\n"+ Xml.getString(filterExpr)); + } GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME); Modified: trunk/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java =================================================================== --- trunk/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java 2011-05-25 06:21:03 UTC (rev 7757) +++ trunk/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java 2011-05-25 06:43:15 UTC (rev 7758) @@ -613,7 +613,7 @@ @SuppressWarnings({"deprecation"}) public static Query makeQuery(Element xmlQuery, PerFieldAnalyzerWrapper analyzer, HashSet<String> tokenizedFieldSet, HashMap<String, LuceneConfigNumericField> numericFieldSet) throws Exception { - System.out.println("\n\n\n* * makeQuery input XML:\n" + Xml.getString(xmlQuery)); + Log.debug(Geonet.SEARCH_ENGINE, "MakeQuery input XML:\n" + Xml.getString(xmlQuery)); String name = xmlQuery.getName(); Query returnValue; Modified: trunk/web/src/main/java/org/fao/geonet/kernel/search/log/QueryInfo.java =================================================================== --- trunk/web/src/main/java/org/fao/geonet/kernel/search/log/QueryInfo.java 2011-05-25 06:21:03 UTC (rev 7757) +++ trunk/web/src/main/java/org/fao/geonet/kernel/search/log/QueryInfo.java 2011-05-25 06:43:15 UTC (rev 7758) @@ -152,15 +152,15 @@ @Override public String toString() { - StringBuilder b = new StringBuilder("QueryInfo fields:\n"); + StringBuilder b = new StringBuilder("QueryInfo fields:\t"); - b.append("luc. type : ").append(this.getLuceneQueryType()).append("\n"); - b.append("field : ").append(this.getField()).append("\n"); - b.append("text : ").append(this.getText()).append("\n"); - b.append("similarity: ").append(this.getSimilarity()).append("\n"); - b.append("lowerText : ").append(this.getLowerText()).append("\n"); - b.append("upperText : ").append(this.getUpperText()).append("\n"); - b.append("inclusive : ").append(this.getInclusive()).append("\n"); + b.append("luc. type : ").append(this.getLuceneQueryType()).append("\t"); + b.append("field : ").append(this.getField()).append("\t"); + b.append("text : ").append(this.getText()).append("\t"); + b.append("similarity: ").append(this.getSimilarity()).append("\t"); + b.append("lowerText : ").append(this.getLowerText()).append("\t"); + b.append("upperText : ").append(this.getUpperText()).append("\t"); + b.append("inclusive : ").append(this.getInclusive()).append("\t"); return b.toString(); } @@ -197,7 +197,7 @@ dbms.abort(); Log.warning(Geonet.SEARCH_LOGGER, "an error occuring during QueryInfo database storage. Aborting :" + sqle.getMessage() + - "\n" + + ". " + "Is rollback occured ?"); sqle.printStackTrace(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |