- Wikitty-commits - mailman.cloud.codelutin.com

Jenkins build became unstable: wikitty » Wikitty :: api #585
by admin+hudson＠codelutin.com April 3, 2013

April 3, 2013

See <http://ci.nuiton.org/jenkins/job/wikitty/org.nuiton.wikitty$wikitty-api/585…>

1 1

r1565 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty wikitty-solr/src/license
by bpoussin＠users.nuiton.org April 3, 2013

April 3, 2013

Author: bpoussin Date: 2013-04-03 22:44:50 +0200 (Wed, 03 Apr 2013) New Revision: 1565 Url: http://nuiton.org/projects/wikitty/repository/revisions/1565 Log: fixes #2620: Support relative date for String date representation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java 2013-03-26 09:10:14 UTC (rev 1564) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java 2013-04-03 20:44:50 UTC (rev 1565) @@ -340,6 +340,12 @@ } String[] ops = splitter.split(math); + // si 0 n'est pas vide, alors il y a une erreur, car on ne doit pas avoir de + // valeur dans 0 et un operateur (:=/+-) dans 1 + if (StringUtils.length(ops[0]) != 0) { + throw new ParseException + ("Math expression must began with operator: \"" + ops[0] + "\"", 0); + } int pos = 1; // on passe le 0 qui est vide vu la regex utilisee while ( pos < ops.length ) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-26 09:10:14 UTC (rev 1564) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-04-03 20:44:50 UTC (rev 1565) @@ -135,7 +135,7 @@ solrDateFormat.getPattern(), DATE_FORMAT, SOLR_DATE_FORMAT, - new SimpleDateFormat().toPattern(), + new SimpleDateFormat().toPattern(), // local dependent "dd/MM/yy", "dd/MM/yy hh:mm", "dd/MM/yyyy", @@ -147,7 +147,8 @@ "yyyyMMdd", "yyyy-MM-dd", "yyyy-MM-dd hh:mm", - "yyyy-MM-dd'T'hh:mm:ss'Z'" + "yyyy-MM-dd'T'hh:mm:ss'Z'", + "yyMMdd", }; /** no break space, used to parse BigDecimal */ @@ -693,40 +694,45 @@ result = ((Calendar)value).getTime(); } else { // try to convert to Date - try { - String v = String.valueOf(value); - if (StringUtils.startsWithIgnoreCase(v, DATE_NOW)) { - result = new Date(); - v = StringUtils.substringAfter(v, DATE_NOW); - } else if (StringUtils.startsWithIgnoreCase(v, DATE_TODAY)) { - result = new Date(); - result = DateUtil.setMinTimeOfDay(result); - v = StringUtils.substringAfter(v, DATE_TODAY); - } else { - for (String pattern : DATE_FORMAT_ALLOWED) { - String tmp = StringUtils.substring(v, 0, pattern.length()); - try { - result = DateUtils.parseDate(tmp, pattern); - // parse success - v = StringUtils.substring(v, pattern.length()); - break; - } catch (Exception eee) { - if (log.isDebugEnabled()) { - log.debug(String.format("Can't parse date '%s'", tmp), eee); - } + String v = String.valueOf(value); + if (StringUtils.startsWithIgnoreCase(v, DATE_NOW)) { + result = new Date(); + v = StringUtils.substringAfter(v, DATE_NOW); + } else if (StringUtils.startsWithIgnoreCase(v, DATE_TODAY)) { + result = new Date(); + result = DateUtil.setMinTimeOfDay(result); + v = StringUtils.substringAfter(v, DATE_TODAY); + } else { + for (String pattern : DATE_FORMAT_ALLOWED) { + if (StringUtils.length(v) < StringUtils.length(pattern)) { + // if pattern longer than v then parse is impossble + continue; + } + String tmp = StringUtils.substring(v, 0, pattern.length()); + try { + result = DateUtils.parseDate(tmp, pattern); + // parse success + String ajust = StringUtils.substring(v, pattern.length()); + + // try to interpret and of date (ex: +3Years) + if (StringUtils.length(ajust) > 0) { + DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault()); + parser.setNow(result); + result = parser.parseMath(ajust); } + break; + } catch (ParseException eee) { + if (log.isDebugEnabled()) { + log.debug(String.format( + "Can't convert value '%s' of type '%s' to Date because math date is wrong", + value, getClass(value)), eee); + } + } catch (Exception eee) { + if (log.isDebugEnabled()) { + log.debug(String.format("Can't parse date '%s'", tmp), eee); + } } } - // try to interpret and of date (ex: +3Years) - if (StringUtils.length(v) > 0) { - DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault()); - parser.setNow(result); - result = parser.parseMath(v); - } - } catch (ParseException eee) { - throw new WikittyException(String.format( - "Can't convert value '%s' of type '%s' to Date because math date is wrong", - value, getClass(value)), eee); } if (result == null) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-26 09:10:14 UTC (rev 1564) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-04-03 20:44:50 UTC (rev 1565) @@ -96,7 +96,8 @@ { SimpleDateFormat format = new SimpleDateFormat("dd/MM/yy hh:mm"); Date d = format.parse("26/03/13 20:51"); - Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013 20:51")); + Date result = WikittyUtil.toDate("26/03/2013 20:51"); + Assert.assertEquals(d, result); } { SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); @@ -133,21 +134,25 @@ Date d = format.parse("130326"); Assert.assertEquals(d, WikittyUtil.toDate("130326")); } - { - SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd"); - Date d = format.parse("13-03-26"); - Assert.assertEquals(d, WikittyUtil.toDate("13-03-26")); - } - { - SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd hh:mm"); - Date d = format.parse("13-03-26 20:51"); - Assert.assertEquals(d, WikittyUtil.toDate("13-03-26 20:51")); - } - { - SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd'T' hh:mm:ss'Z'"); - Date d = format.parse("13-03-26'T' 20:51:00'Z'"); - Assert.assertEquals(d, WikittyUtil.toDate("13-03-26'T' 20:51:00'Z'")); - } + + // les syntaxes suivantes sont impossible car on ne peut pas faire + // la difference entre dd-MM-yy et yy-MM-dd. On prend le parti de + // supporter le 1er et pas le 2eme +// { +// SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd"); +// Date d = format.parse("13-03-26"); +// Assert.assertEquals(d, WikittyUtil.toDate("13-03-26")); +// } +// { +// SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd hh:mm"); +// Date d = format.parse("13-03-26 20:51"); +// Assert.assertEquals(d, WikittyUtil.toDate("13-03-26 20:51")); +// } +// { +// SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd'T' hh:mm:ss'Z'"); +// Date d = format.parse("13-03-26'T' 20:51:00'Z'"); +// Assert.assertEquals(d, WikittyUtil.toDate("13-03-26'T' 20:51:00'Z'")); +// } } @Test Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2013-03-26 09:10:14 UTC (rev 1564) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2013-04-03 20:44:50 UTC (rev 1565) @@ -7,11 +7,13 @@ # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - New BSD License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -20,10 +22,10 @@ # Please fill the missing licenses for dependencies : # # -#Wed Feb 01 07:00:14 CET 2012 +#Sat Mar 23 01:47:37 CET 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.apache.zookeeper--zookeeper--3.4.5= xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1

1 0

r1564 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by jcouteau＠users.nuiton.org March 26, 2013

March 26, 2013

Author: jcouteau Date: 2013-03-26 10:10:14 +0100 (Tue, 26 Mar 2013) New Revision: 1564 Url: http://nuiton.org/projects/wikitty/repository/revisions/1564 Log: #2620 : Add failing test on date parser Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-22 23:54:08 UTC (rev 1563) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-26 09:10:14 UTC (rev 1564) @@ -43,6 +43,7 @@ import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -51,7 +52,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.time.DateUtils; /** * Test on WikittyUtil class. @@ -86,6 +86,68 @@ Assert.assertEquals(d3y, WikittyUtil.toDate("20101231+3YEARS")); Assert.assertEquals(j1, WikittyUtil.toDate("20101231/YEAR")); } + + //Test all date patterns + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yy"); + Date d = format.parse("26/03/13"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/13")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yy hh:mm"); + Date d = format.parse("26/03/13 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + Date d = format.parse("26/03/2013"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy hh:mm"); + Date d = format.parse("26/03/2013 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yy"); + Date d = format.parse("26-03-13"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-13")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yy hh:mm"); + Date d = format.parse("26-03-13 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); + Date d = format.parse("26-03-2013"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-2013")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy hh:mm"); + Date d = format.parse("26-03-2013 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yyMMdd"); + Date d = format.parse("130326"); + Assert.assertEquals(d, WikittyUtil.toDate("130326")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd"); + Date d = format.parse("13-03-26"); + Assert.assertEquals(d, WikittyUtil.toDate("13-03-26")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd hh:mm"); + Date d = format.parse("13-03-26 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("13-03-26 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd'T' hh:mm:ss'Z'"); + Date d = format.parse("13-03-26'T' 20:51:00'Z'"); + Assert.assertEquals(d, WikittyUtil.toDate("13-03-26'T' 20:51:00'Z'")); + } } @Test

1 0

r1563 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org March 22, 2013

March 22, 2013

Author: bpoussin Date: 2013-03-23 00:54:08 +0100 (Sat, 23 Mar 2013) New Revision: 1563 Url: http://nuiton.org/projects/wikitty/repository/revisions/1563 Log: try to keep 1.6 compatibility Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-22 23:42:06 UTC (rev 1562) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-22 23:54:08 UTC (rev 1563) @@ -719,7 +719,7 @@ } // try to interpret and of date (ex: +3Years) if (StringUtils.length(v) > 0) { - DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault(Locale.Category.FORMAT)); + DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault()); parser.setNow(result); result = parser.parseMath(v); }

1 0

r1562 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org March 22, 2013

March 22, 2013

Author: bpoussin Date: 2013-03-23 00:42:06 +0100 (Sat, 23 Mar 2013) New Revision: 1562 Url: http://nuiton.org/projects/wikitty/repository/revisions/1562 Log: Evolution #2620: Support relative date for String date representation Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java 2013-03-22 23:42:06 UTC (rev 1562) @@ -0,0 +1,423 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.nuiton.wikitty; + +import java.util.Date; +import java.util.Calendar; +import java.util.TimeZone; +import java.util.Locale; +import java.util.Map; +import java.util.HashMap; +import java.text.ParseException; +import java.util.regex.Pattern; +import org.apache.commons.lang3.StringUtils; + +/** + * This class is copy of DateMathParser from SolR librairy, and modified to + * support ':' to set hour and '=' to set date. + * + * + * A Simple Utility class for parsing "math" like strings relating to Dates. + * + * + * The basic syntax support addition, subtraction and rounding at various + * levels of granularity (or "units"). Commands can be chained together + * and are parsed from left to right. '+' and '-' denote addition and + * subtraction, while '/' denotes "round". Round requires only a unit, while + * addition/subtraction require an integer value and a unit. + * Command strings must not include white space, but the "No-Op" command + * (empty string) is allowed.... + * + * + * <pre> + * /HOUR + * ... Round to the start of the current hour + * /DAY + * ... Round to the start of the current day + * +2YEARS + * ... Exactly two years in the future from now + * =????1130 + * ... keep year but set date to 30 november + * :12??30 + * ... keep minute but set hour to 12 and seconde to 30 + * -1DAY + * ... Exactly 1 day prior to now + * /DAY+6MONTHS+3DAYS + * ... 6 months and 3 days in the future from the start of + * the current day + * +6MONTHS+3DAYS/DAY + * ... 6 months and 3 days in the future from now, rounded + * down to nearest day + * </pre> + * + * + * (Multiple aliases exist for the various units of time (ie: + * <code>MINUTE</code> and <code>MINUTES</code>; <code>MILLI</code>, + * <code>MILLIS</code>, <code>MILLISECOND</code>, and + * <code>MILLISECONDS</code>.) The complete list can be found by + * inspecting the keySet of {@link #CALENDAR_UNITS}) + * + * + * + * All commands are relative to a "now" which is fixed in an instance of + * DateMathParser such that + * <code>p.parseMath("+0MILLISECOND").equals(p.parseMath("+0MILLISECOND"))</code> + * no matter how many wall clock milliseconds elapse between the two + * distinct calls to parse (Assuming no other thread calls + * "<code>setNow</code>" in the interim). The default value of 'now' is + * the time at the moment the <code>DateMathParser</code> instance is + * constructed, unless overridden by the {@link CommonParams#NOW NOW} + * request param. + * + * + * + * All commands are also affected to the rules of a specified {@link TimeZone} + * (including the start/end of DST if any) which determine when each arbitrary + * day starts. This not only impacts rounding/adding of DAYs, but also + * cascades to rounding of HOUR, MIN, MONTH, YEAR as well. The default + * <code>TimeZone</code> used is <code>UTC</code> unless overridden by the + * {@link CommonParams#TZ TZ} + * request param. + * + * + * @see SolrRequestInfo#getClientTimeZone + * @see SolrRequestInfo#getNOW + */ +public class DateMathParser { + + public static TimeZone UTC = TimeZone.getTimeZone("UTC"); + + /** Default TimeZone for DateMath rounding (UTC) */ + public static final TimeZone DEFAULT_MATH_TZ = UTC; + /** Default Locale for DateMath rounding (Locale.ROOT) */ + public static final Locale DEFAULT_MATH_LOCALE = Locale.ROOT; + + /** + * A mapping from (uppercased) String labels idenyifying time units, + * to the corresponding Calendar constant used to set/add/roll that unit + * of measurement. + * + * + * A single logical unit of time might be represented by multiple labels + * for convenience (ie: <code>DATE==DAY</code>, + * <code>MILLI==MILLISECOND</code>) + * + * + * @see Calendar + */ + public static final Map<String,Integer> CALENDAR_UNITS = makeUnitsMap(); + + /** @see #CALENDAR_UNITS */ + private static Map<String,Integer> makeUnitsMap() { + + // NOTE: consciously choosing not to support WEEK at this time, + // because of complexity in rounding down to the nearest week + // arround a month/year boundry. + // (Not to mention: it's not clear what people would *expect*) + // + // If we consider adding some time of "week" support, then + // we probably need to change "Locale loc" to default to something + // from a param via SolrRequestInfo as well. + + Map<String,Integer> units = new HashMap<String,Integer>(13); + units.put("YEAR", Calendar.YEAR); + units.put("YEARS", Calendar.YEAR); + units.put("MONTH", Calendar.MONTH); + units.put("MONTHS", Calendar.MONTH); + units.put("DAY", Calendar.DATE); + units.put("DAYS", Calendar.DATE); + units.put("DATE", Calendar.DATE); + units.put("HOUR", Calendar.HOUR_OF_DAY); + units.put("HOURS", Calendar.HOUR_OF_DAY); + units.put("MINUTE", Calendar.MINUTE); + units.put("MINUTES", Calendar.MINUTE); + units.put("SECOND", Calendar.SECOND); + units.put("SECONDS", Calendar.SECOND); + units.put("MILLI", Calendar.MILLISECOND); + units.put("MILLIS", Calendar.MILLISECOND); + units.put("MILLISECOND", Calendar.MILLISECOND); + units.put("MILLISECONDS",Calendar.MILLISECOND); + + return units; + } + + /** + * Set date with pattern like 2013??01 + * <li>ex: now=201311 conserve le jour et l'heure mais change le mois et l'annee a novembre 2013 + * <li>ex: now=????1131 conserve l'annee mais change le mois et le jour 31 novembre + * <li>ex: now=???????? ne change rien + * + * @param c + * @param pattern + */ + public static void setDate(Calendar c, String pattern) { + String year = StringUtils.substring(pattern, 0, 4); + String month = StringUtils.substring(pattern, 4, 6); + String day = StringUtils.substring(pattern, 6, 8); + + if (StringUtils.length(year) == 4 && StringUtils.isNumeric(year)) { + c.set(Calendar.YEAR, Integer.parseInt(year)); + } + if (StringUtils.length(month) == 2 && StringUtils.isNumeric(month)) { + c.set(Calendar.MONTH, Integer.parseInt(month)-1); // -1 because month is 0 based + } + if (StringUtils.length(day) == 2 && StringUtils.isNumeric(day)) { + c.set(Calendar.DAY_OF_MONTH, Integer.parseInt(day)); + } + } + + /** + * Set hour with pattern hhmmss + * <li>now:1200 conserve le jour mais change l'heure a 12:00 + * <li>now:?????? ne change rien + * + * @param c + * @param pattern + */ + public static void setHour(Calendar c, String pattern) { + String hour = StringUtils.substring(pattern, 0, 2); + String min = StringUtils.substring(pattern, 2, 4); + String sec = StringUtils.substring(pattern, 4, 6); + + if (StringUtils.length(hour) == 2 && StringUtils.isNumeric(hour)) { + c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour)); + } + if (StringUtils.length(min) == 2 && StringUtils.isNumeric(min)) { + c.set(Calendar.MINUTE, Integer.parseInt(min)); + } + if (StringUtils.length(sec) == 2 && StringUtils.isNumeric(sec)) { + c.set(Calendar.SECOND, Integer.parseInt(sec)); + } + } + + /** + * Modifies the specified Calendar by "adding" the specified value of units + * + * @exception IllegalArgumentException if unit isn't recognized. + * @see #CALENDAR_UNITS + */ + public static void add(Calendar c, int val, String unit) { + Integer uu = CALENDAR_UNITS.get(unit); + if (null == uu) { + throw new IllegalArgumentException("Adding Unit not recognized: " + + unit); + } + c.add(uu.intValue(), val); + } + + /** + * Modifies the specified Calendar by "rounding" down to the specified unit + * + * @exception IllegalArgumentException if unit isn't recognized. + * @see #CALENDAR_UNITS + */ + public static void round(Calendar c, String unit) { + Integer uu = CALENDAR_UNITS.get(unit); + if (null == uu) { + throw new IllegalArgumentException("Rounding Unit not recognized: " + + unit); + } + int u = uu.intValue(); + + switch (u) { + + case Calendar.YEAR: + c.clear(Calendar.MONTH); + /* fall through */ + case Calendar.MONTH: + c.clear(Calendar.DAY_OF_MONTH); + c.clear(Calendar.DAY_OF_WEEK); + c.clear(Calendar.DAY_OF_WEEK_IN_MONTH); + c.clear(Calendar.DAY_OF_YEAR); + c.clear(Calendar.WEEK_OF_MONTH); + c.clear(Calendar.WEEK_OF_YEAR); + /* fall through */ + case Calendar.DATE: + c.clear(Calendar.HOUR_OF_DAY); + c.clear(Calendar.HOUR); + c.clear(Calendar.AM_PM); + /* fall through */ + case Calendar.HOUR_OF_DAY: + c.clear(Calendar.MINUTE); + /* fall through */ + case Calendar.MINUTE: + c.clear(Calendar.SECOND); + /* fall through */ + case Calendar.SECOND: + c.clear(Calendar.MILLISECOND); + break; + default: + throw new IllegalStateException + ("No logic for rounding value ("+u+") " + unit); + } + + } + + + private TimeZone zone; + private Locale loc; + private Date now; + + /** + * Default constructor that assumes UTC should be used for rounding unless + * otherwise specified in the SolrRequestInfo + * + * @see SolrRequestInfo#getClientTimeZone + * @see #DEFAULT_MATH_LOCALE + */ + public DateMathParser() { + this(null, DEFAULT_MATH_LOCALE); + + } + + /** + * @param tz The TimeZone used for rounding (to determine when hours/days begin). If null, then this method defaults to the value dicated by the SolrRequestInfo if it + * exists -- otherwise it uses UTC. + * @param l The Locale used for rounding (to determine when weeks begin). If null, then this method defaults to en_US. + * @see #DEFAULT_MATH_TZ + * @see #DEFAULT_MATH_LOCALE + * @see Calendar#getInstance(TimeZone,Locale) + * @see SolrRequestInfo#getClientTimeZone + */ + public DateMathParser(TimeZone tz, Locale l) { + loc = (null != l) ? l : DEFAULT_MATH_LOCALE; + zone = (null != tz) ? tz : DEFAULT_MATH_TZ; + } + + /** + * Defines this instance's concept of "now". + * @see #getNow + */ + public void setNow(Date n) { + now = n; + } + + /** + * Returns a cloned of this instance's concept of "now". + * + * If setNow was never called (or if null was specified) then this method + * first defines 'now' as the value dictated by the SolrRequestInfo if it + * exists -- otherwise it uses a new Date instance at the moment getNow() + * is first called. + * @see #setNow + * @see SolrRequestInfo#getNOW + */ + public Date getNow() { + if (now == null) { + now = new Date(); + } + return (Date)now.clone(); + } + + /** + * Parses a string of commands relative "now" are returns the resulting Date. + * + * @exception ParseException positions in ParseExceptions are token positions, not character positions. + */ + public Date parseMath(String math) throws ParseException { + + Calendar cal = Calendar.getInstance(zone, loc); + cal.setTime(getNow()); + + /* check for No-Op */ + if (0==math.length()) { + return cal.getTime(); + } + + String[] ops = splitter.split(math); + int pos = 1; // on passe le 0 qui est vide vu la regex utilisee + while ( pos < ops.length ) { + + if (1 != ops[pos].length()) { + throw new ParseException + ("Multi character command found: \"" + ops[pos] + "\"", pos); + } + char command = ops[pos++].charAt(0); + + switch (command) { + case '/': + if (ops.length < pos + 1) { + throw new ParseException + ("Need a unit after command: \"" + command + "\"", pos); + } + try { + round(cal, ops[pos++]); + } catch (IllegalArgumentException e) { + throw new ParseException + ("Unit not recognized: \"" + ops[pos-1] + "\"", pos-1); + } + break; + case '=': + if (ops.length < pos + 1) { + throw new ParseException + ("Need a unit after command: \"" + command + "\"", pos); + } + setDate(cal, ops[pos++]); + break; + case ':': + if (ops.length < pos + 1) { + throw new ParseException + ("Need a unit after command: \"" + command + "\"", pos); + } + setHour(cal, ops[pos++]); + break; + case '+': /* fall through */ + case '-': + if (ops.length < pos + 1) { + throw new ParseException + ("Need a value and unit for command: \"" + command + "\"", pos); + } + String[] valueUnit = splitter2.split(ops[pos++]); + + if (valueUnit.length != 2) { + throw new ParseException + ("Need a value and unit for command: \"" + command + "\"", pos-1); + } + + int val = 0; + try { + val = Integer.valueOf(valueUnit[0]); + } catch (NumberFormatException e) { + throw new ParseException + ("Not a Number: \"" + valueUnit[0] + "\"", pos-1); + } + if ('-' == command) { + val = 0 - val; + } + try { + String unit = valueUnit[1]; + add(cal, val, unit); + } catch (IllegalArgumentException e) { + throw new ParseException + ("Unit not recognized: \"" + valueUnit[1] + "\"", pos-1); + } + break; + default: + throw new ParseException + ("Unrecognized command: \"" + command + "\"", pos-1); + } + } + + return cal.getTime(); + } + + private static Pattern splitter = Pattern.compile("(?<=[+=:/-])|(?=[+=:/-])"); + private static Pattern splitter2 = Pattern.compile("(?<=\\d)(?=\\D)"); +// private static Pattern splitter = Pattern.compile("\\b|(?<=\\d|\\?)(?=\\D)"); + +} Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1561 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org March 22, 2013

March 22, 2013

Author: bpoussin Date: 2013-03-23 00:38:46 +0100 (Sat, 23 Mar 2013) New Revision: 1561 Url: http://nuiton.org/projects/wikitty/repository/revisions/1561 Log: fixes #2620: Support relative date for String date representation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-22 11:50:28 UTC (rev 1560) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-22 23:38:46 UTC (rev 1561) @@ -695,18 +695,38 @@ // try to convert to Date try { String v = String.valueOf(value); - if (DATE_NOW.equalsIgnoreCase(v)) { + if (StringUtils.startsWithIgnoreCase(v, DATE_NOW)) { result = new Date(); - } else if (DATE_TODAY.equalsIgnoreCase(v)) { + v = StringUtils.substringAfter(v, DATE_NOW); + } else if (StringUtils.startsWithIgnoreCase(v, DATE_TODAY)) { result = new Date(); result = DateUtil.setMinTimeOfDay(result); + v = StringUtils.substringAfter(v, DATE_TODAY); } else { - result = parseDate(v); + for (String pattern : DATE_FORMAT_ALLOWED) { + String tmp = StringUtils.substring(v, 0, pattern.length()); + try { + result = DateUtils.parseDate(tmp, pattern); + // parse success + v = StringUtils.substring(v, pattern.length()); + break; + } catch (Exception eee) { + if (log.isDebugEnabled()) { + log.debug(String.format("Can't parse date '%s'", tmp), eee); + } + } + } } + // try to interpret and of date (ex: +3Years) + if (StringUtils.length(v) > 0) { + DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault(Locale.Category.FORMAT)); + parser.setNow(result); + result = parser.parseMath(v); + } } catch (ParseException eee) { - if (log.isDebugEnabled()) { - log.debug(String.format("Can't parse date '%s'", value), eee); - } + throw new WikittyException(String.format( + "Can't convert value '%s' of type '%s' to Date because math date is wrong", + value, getClass(value)), eee); } if (result == null) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-22 11:50:28 UTC (rev 1560) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-22 23:38:46 UTC (rev 1561) @@ -51,6 +51,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.apache.commons.lang3.time.DateUtils; /** * Test on WikittyUtil class. @@ -68,15 +69,25 @@ @Test public void testToDate() throws Exception { - Date d = new Date(); - System.out.println("Date: " + d); - String ds = WikittyUtil.toString(d); - System.out.println("Date format: " + ds); - Date d2 = WikittyUtil.toDate(ds); - System.out.println("Date parsed: " + d2); - Assert.assertEquals(d, d2); + { + Date d = new Date(); + String ds = WikittyUtil.toString(d); + Date d2 = WikittyUtil.toDate(ds); + Assert.assertEquals(d, d2); + } + { + Date d = WikittyUtil.toDate("20101231"); + Date d3y = WikittyUtil.toDate("20131231"); + Date j1 = WikittyUtil.toDate("20100101"); + Date smd = WikittyUtil.toDate("20100502"); + + + Assert.assertEquals(smd, WikittyUtil.toDate("20101231=????0502")); + Assert.assertEquals(d3y, WikittyUtil.toDate("20101231+3YEARS")); + Assert.assertEquals(j1, WikittyUtil.toDate("20101231/YEAR")); + } } - + @Test public void testFormat() { WikittyGroupImpl group = new WikittyGroupImpl();

1 0

r1560 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org March 22, 2013

March 22, 2013

Author: bpoussin Date: 2013-03-22 12:50:28 +0100 (Fri, 22 Mar 2013) New Revision: 1560 Url: http://nuiton.org/projects/wikitty/repository/revisions/1560 Log: add support for now and today for date conversion Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-15 23:40:28 UTC (rev 1559) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-03-22 11:50:28 UTC (rev 1560) @@ -88,6 +88,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DateUtil; import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.generator.WikittyTransformerUtil; @@ -111,6 +112,9 @@ public static final String DEFAULT_MAJOR_VERSION_PREFIX = DEFAULT_MAJOR_VERSION + "."; public static final String DEFAULT_VERSION = DEFAULT_MAJOR_VERSION_PREFIX + DEFAULT_MINOR_VERSION; + public static final String DATE_NOW = "now"; + public static final String DATE_TODAY = "today"; + public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ'Z'"; // #1386 sletellier 20110309 : solr date is return like 2011-03-09T08:06:27.593Z @@ -669,6 +673,17 @@ return result; } + /** + * Converti un objet en une date. + * Date et Calendar sont directement supporte, tous les autres types sont + * transformer en String et parser pour construire la Date. + * + * <li>Si la chaine est 'now', la date courante est utilisee avec l'heure courant + * <li>Si la chaine est 'today', la date courante est utilisee avec l'heure a 0 + * + * @param value + * @return + */ static public Date toDate(Object value) { Date result = null; if (value != null) { @@ -679,10 +694,18 @@ } else { // try to convert to Date try { - result = parseDate(value.toString()); + String v = String.valueOf(value); + if (DATE_NOW.equalsIgnoreCase(v)) { + result = new Date(); + } else if (DATE_TODAY.equalsIgnoreCase(v)) { + result = new Date(); + result = DateUtil.setMinTimeOfDay(result); + } else { + result = parseDate(v); + } } catch (ParseException eee) { if (log.isDebugEnabled()) { - log.debug("Can't parse date, i try with next parser", eee); + log.debug(String.format("Can't parse date '%s'", value), eee); } }

1 0

r1559 - trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org March 15, 2013

March 15, 2013

Author: bpoussin Date: 2013-03-16 00:40:28 +0100 (Sat, 16 Mar 2013) New Revision: 1559 Url: http://nuiton.org/projects/wikitty/repository/revisions/1559 Log: suppression des annotations @Test (car il ne s'agit que de test, et pas de test unitaire) Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java 2013-03-07 18:50:30 UTC (rev 1558) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java 2013-03-15 23:40:28 UTC (rev 1559) @@ -63,7 +63,6 @@ return result; } - @Test public void testSubQuery() throws Exception { //FinancialTransaction.VAT_d:19.6 AND _query_: //{!join from=#id to=FinancialTransaction.payer_w v=_query_:{!join from=Employee.company_w to=#id v=_query_:{!join from=#id to=Employee.person_w v=Person.firstName_s:Catherine AND Person.lastName_s:Heintz}}} @@ -92,7 +91,6 @@ } - @Test public void testSelectQuery() throws Exception { String query = "FinancialTransaction.VAT_d:19.6 AND FinancialTransaction.payer_w:\"d32c4e83-1918-4575-ba18-293af75f5ee3\""; SolrQuery querySolr = new SolrQuery(query); @@ -103,7 +101,6 @@ System.out.println("result:" + result); } - @Test public void testGroupQuery() throws Exception { String query = "FinancialTransaction.VAT_d:19.6"; SolrQuery querySolr = new SolrQuery(query);

1 0

r1558 - trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org March 7, 2013

March 7, 2013

Author: bpoussin Date: 2013-03-07 19:50:30 +0100 (Thu, 07 Mar 2013) New Revision: 1558 Url: http://nuiton.org/projects/wikitty/repository/revisions/1558 Log: ajout d'un pseudo test pour ne pas perdre les differentes pistes d'am?\195?\169lioration des requetes solr via les nouvelles fonctionnalit?\195?\169 (group, func, ...) Added: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java Added: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java (rev 0) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java 2013-03-07 18:50:30 UTC (rev 1558) @@ -0,0 +1,122 @@ +package org.nuiton.wikitty.storage.solr; + + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.junit.Test; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.wikitty.WikittyConfigOption; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.services.WikittyServiceStorage; +import org.nuiton.wikitty.storage.WikittySearchEngine; + +/** + * Classe permettant de tester des requetes purement SolR et voir le resultat + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SolrQueryTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(SolrQueryTest.class); + + SolrServer server = null; + + public SolrServer getServer() throws ArgumentsParserException { + if (server == null) { + ApplicationConfig config = new ApplicationConfig(); + config.loadDefaultOptions(WikittyConfigOption.values()); + config.setOption("wikitty.data.directory", "/var/local/chorem/localhost"); + config.setOption("wikitty.searchengine.solr.directory.data", + "${wikitty.data.directory}/data/solr"); + + // Parse args + config.parse(); + + server = SolrUtil.getSolrServer(config); + } + return server; + } + + + + public QueryResponse doQuery(String query) throws Exception { + SolrServer server = getServer(); + SolrQuery querySolr = new SolrQuery(query); + QueryResponse result = SolrUtil.executeQuery(server, querySolr); + return result; + } + + public QueryResponse doQuery(SolrQuery querySolr) throws Exception { + SolrServer server = getServer(); + QueryResponse result = SolrUtil.executeQuery(server, querySolr); + return result; + } + + @Test + public void testSubQuery() throws Exception { +//FinancialTransaction.VAT_d:19.6 AND _query_: +//{!join from=#id to=FinancialTransaction.payer_w v=_query_:{!join from=Employee.company_w to=#id v=_query_:{!join from=#id to=Employee.person_w v=Person.firstName_s:Catherine AND Person.lastName_s:Heintz}}} +// String query = "FinancialTransaction.VAT_d:19.6 AND " +// + "_query_:{!join from=#id to=FinancialTransaction.payer_w " +// + "v=_query_:{!join from=Employee.company_w to=#id " +// + "v=_query_:{!join from=#id to=Employee.person_w " +// + "v=\"Person.firstName_s:Catherine AND Person.lastName_s:Heintz\"}}}" +// + ""; + +// String query = "FinancialTransaction.VAT_d:19.6 AND " + +// "_query_:{!join from=Employee.company_w to=FinancialTransaction.payer_w " + +// "v=_query_:{!join from=#id to=Employee.person_w " + +// "v=\"Person.firstName_s:Catherine AND Person.lastName_s:Heintz\"}}"; + + String query = "FinancialTransaction.VAT_d:19.6 AND " + + "_query_:\"{!join from=#id to=FinancialTransaction.payer_w}Company.name_s_c:Néréide\""; + + SolrQuery querySolr = new SolrQuery(query); + querySolr.setParam("fl", "score,#id,ref:FinancialTransaction.reference_s,amount:FinancialTransaction.amount_d,tva:FinancialTransaction:VAT_d,payer:FinancialTransaction.payer_w"); +// querySolr.setParam("debugQuery", "true"); + + System.out.println("Query:" + querySolr); + QueryResponse result = doQuery(querySolr); + System.out.println("result:" + result); + + } + + @Test + public void testSelectQuery() throws Exception { + String query = "FinancialTransaction.VAT_d:19.6 AND FinancialTransaction.payer_w:\"d32c4e83-1918-4575-ba18-293af75f5ee3\""; + SolrQuery querySolr = new SolrQuery(query); + querySolr.setParam("fl", "FinancialTransaction.amount_d,FinancialTransaction.VAT_d,ttc:product(FinancialTransaction.amount_d_sortable,linear(FinancialTransaction.VAT_d_sortable,0.01,1))"); + + System.out.println("Query:" + querySolr); + QueryResponse result = doQuery(querySolr); + System.out.println("result:" + result); + } + + @Test + public void testGroupQuery() throws Exception { + String query = "FinancialTransaction.VAT_d:19.6"; + SolrQuery querySolr = new SolrQuery(query); + querySolr.setParam("group", true); + querySolr.setParam("group.field", "FinancialTransaction.payer_w_sortable"); + + System.out.println("Query:" + querySolr); + QueryResponse result = doQuery(querySolr); + System.out.println("result:" + result); + System.out.println("explain:" + result.getExplainMap()); +// result.getResults(); +// result.getGroupResponse().getValues().get(0).getValues().get(0).getResult(); + + } + +} Property changes on: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1557 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org March 7, 2013

March 7, 2013

Author: bpoussin Date: 2013-03-07 19:49:25 +0100 (Thu, 07 Mar 2013) New Revision: 1557 Url: http://nuiton.org/projects/wikitty/repository/revisions/1557 Log: nettoyage refactore pour permettre de recuperer facilement l'instance du SolR Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2013-02-28 20:52:12 UTC (rev 1556) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2013-03-07 18:49:25 UTC (rev 1557) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.storage.solr; +import java.io.File; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -36,11 +37,15 @@ import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.core.CoreContainer; +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyTreeNode; @@ -60,6 +65,62 @@ final static private Log log = LogFactory.getLog(SolrUtil.class); final static private TimeLog timeLog = new TimeLog(SolrUtil.class); + public static SolrServer getSolrServer(ApplicationConfig config) { + + boolean removeSystemSolrDirFactoryKey = false; + String solrDirFactoryKey = null; + boolean removeSystemSolrDataDirKey = false; + String solrDataDirKey = null; + + // init system env solr.data.dir + if (config != null) { + // choix du storage (file or Ram) + solrDirFactoryKey = + WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); + String solrDirFactory = config.getOption(solrDirFactoryKey); + if (solrDirFactory != null) { + removeSystemSolrDirFactoryKey = null == System.getProperty(solrDirFactoryKey); + System.setProperty(solrDirFactoryKey, solrDirFactory); + } + + // on utilise le directory que si on est pas en Ram + if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { + solrDataDirKey = + WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); + String solrDataDir = config.getOption(solrDataDirKey); + // make sure that dir exists + if (solrDataDir != null) { + File file = new File(solrDataDir); + if (!file.exists() && !file.mkdirs()) { + throw new WikittyException(String.format( + "Can't create directory '%s'", solrDataDir)); + } + log.info(String.format("Use SolR directory '%s'", solrDataDir)); + removeSystemSolrDataDirKey = null == System.getProperty(solrDataDirKey); + System.setProperty(solrDataDirKey, solrDataDir); + } + } + } + + SolrServer result; + try { + CoreContainer.Initializer initializer = new CoreContainer.Initializer(); + CoreContainer solrCore = initializer.initialize(); + result = new EmbeddedSolrServer(solrCore, ""); + } catch (Exception eee) { + throw new WikittyException("SolR initialization error", eee); + } + + if (removeSystemSolrDirFactoryKey) { + System.clearProperty(solrDirFactoryKey); + } + if (removeSystemSolrDataDirKey) { + System.clearProperty(solrDataDirKey); + } + + return result; + } + /** * Recherche tous les TreeNode auquel appartient en Attachment l'objet passe * en parametre @@ -206,8 +267,14 @@ } QueryResponse result = solrServer.query(query); - long numGet = result.getResults().size(); - long numfound = result.getResults().getNumFound(); + long numGet = -1; + long numfound = -1; + try { + numGet = result.getResults().size(); + numfound = result.getResults().getNumFound(); + } catch (Exception eee) { + log.error("Can't show normal log because exception occur during param evaluation", eee); + } timeLog.log(start, "executeQuery", String.format( "nb result %s/%s query was '%s'", numGet, numfound, query)); if (log.isDebugEnabled()) { Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2013-02-28 20:52:12 UTC (rev 1556) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2013-03-07 18:49:25 UTC (rev 1557) @@ -107,9 +107,6 @@ /** JTA resource */ protected SolrResource solrResource; - /** CoreContainer used to init the server and close it when finished **/ - protected CoreContainer solrCore; - /** * Init wikitty search engine on solr embedded server. * @@ -119,62 +116,11 @@ public WikittySearchEngineSolr( ApplicationConfig config, WikittyExtensionStorage extensionStorage) { - boolean removeSystemSolrDirFactoryKey = false; - String solrDirFactoryKey = null; - boolean removeSystemSolrDataDirKey = false; - String solrDataDirKey = null; - - // init system env solr.data.dir - if (config != null) { - this.config = config; - // choix du storage (file or Ram) - solrDirFactoryKey = - WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); - String solrDirFactory = config.getOption(solrDirFactoryKey); - if (solrDirFactory != null) { - removeSystemSolrDirFactoryKey = null == System.getProperty(solrDirFactoryKey); - System.setProperty(solrDirFactoryKey, solrDirFactory); - } - - // on utilise le directory que si on est pas en Ram - if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { - solrDataDirKey = - WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); - String solrDataDir = config.getOption(solrDataDirKey); - // make sure that dir exists - if (solrDataDir != null) { - File file = new File(solrDataDir); - if (!file.exists() && !file.mkdirs()) { - throw new WikittyException(String.format( - "Can't create directory '%s'", solrDataDir)); - } - log.info(String.format("Use SolR directory '%s'", solrDataDir)); - removeSystemSolrDataDirKey = null == System.getProperty(solrDataDirKey); - System.setProperty(solrDataDirKey, solrDataDir); - } - } - } - - try { - CoreContainer.Initializer initializer = new CoreContainer.Initializer(); - solrCore = initializer.initialize(); - solrServer = new EmbeddedSolrServer(solrCore, ""); - - fieldModifier = new FieldModifier(extensionStorage); - elementModifier = new ElementModifier(extensionStorage); - solrResource = new SolrResource(solrServer); - - } catch (Exception eee) { - throw new WikittyException("SolR initialization error", eee); - } - - if (removeSystemSolrDirFactoryKey) { - System.clearProperty(solrDirFactoryKey); - } - if (removeSystemSolrDataDirKey) { - System.clearProperty(solrDataDirKey); - } - + this.config = config; + solrServer = SolrUtil.getSolrServer(config); + fieldModifier = new FieldModifier(extensionStorage); + elementModifier = new ElementModifier(extensionStorage); + solrResource = new SolrResource(solrServer); } public ApplicationConfig getConfig() { @@ -190,7 +136,7 @@ try { // FIXME poussin 20100618 pourquoi n'est pas fait dans la transaction ? solrResource.init(); - solrServer.deleteByQuery("*:*"); + getSolrServer().deleteByQuery("*:*"); } catch (Exception eee) { throw new WikittyException("Error during clearing SolR data", eee); } @@ -239,11 +185,11 @@ // recuperation des documents Solr deja indexes, pour minimiser la reindexation Map<String, SolrDocument> dirtyObjectDoc = - SolrUtil.findAllById(solrServer, dirtyObject); + SolrUtil.findAllById(getSolrServer(), dirtyObject); Map<String, SolrDocument> dirtyParentDoc = - SolrUtil.findAllByParents(solrServer, dirtyParent); + SolrUtil.findAllByParents(getSolrServer(), dirtyParent); Map<String, SolrDocument> parents = - SolrUtil.findAllById(solrServer, dirtyParentParentId); + SolrUtil.findAllById(getSolrServer(), dirtyParentParentId); // On genere en meme temps la liste des attachments qui doivent // etre reindexe @@ -405,7 +351,7 @@ // list de tous les objets a supprimer Map<String, SolrDocument> removed = - SolrUtil.findAllById(solrServer, ids); + SolrUtil.findAllById(getSolrServer(), ids); // list des TreeNode supprimer Map<String, SolrDocument> treeNodeRemoved = new HashMap<String, SolrDocument>(); @@ -444,7 +390,7 @@ // recuperation des noeuds dont il faut modifier les attachments Map<String, SolrDocument> treeNodeAttachmentRemoved = - SolrUtil.findAllById(solrServer, treeNodeAttachmentRemovedId); + SolrUtil.findAllById(getSolrServer(), treeNodeAttachmentRemovedId); for (Map.Entry<String, SolrDocument> e : treeNodeAttachmentRemoved.entrySet()) { String id = e.getKey(); @@ -481,7 +427,7 @@ // list des TreeNode dont un des pere a ete supprime treeNodeParentRemoved = - SolrUtil.findAllByParents(solrServer, ids); + SolrUtil.findAllByParents(getSolrServer(), ids); // on commence par supprimer des noeuds a reindexer les noeuds supprimes treeNodeParentRemoved.keySet().removeAll(treeNodeRemoved.keySet()); @@ -617,7 +563,7 @@ if (attachmentInTree.size() > 0) { Map<String, SolrDocument> attachments = - SolrUtil.findAllById(solrServer, attachmentInTree.getAll()); + SolrUtil.findAllById(getSolrServer(), attachmentInTree.getAll()); for (String treeNodeId : attachmentInTree.getRemoved().keySet()) { for (String attId : attachmentInTree.getRemoved().get(treeNodeId)) { @@ -779,7 +725,7 @@ } } - QueryResponse resp = SolrUtil.executeQuery(solrServer, querySolr); + QueryResponse resp = SolrUtil.executeQuery(getSolrServer(), querySolr); SolrDocumentList solrResults = resp.getResults(); Map<String, List<FacetTopic>> facets = new HashMap<String, List<FacetTopic>>(); @@ -879,7 +825,7 @@ try { WikittyQueryResultTreeNode<String> result = null; - SolrDocument doc = SolrUtil.findById(solrServer, wikittyId); + SolrDocument doc = SolrUtil.findById(getSolrServer(), wikittyId); if (doc != null) { // on verifie que l'argument est bien un TreeNode if (doc.containsKey(TREENODE_DEPTH)) { @@ -906,7 +852,7 @@ String queryString = v.getSolrQuery(); SolrQuery querySolr = new SolrQuery(SOLR_QUERY_PARSER + queryString); - QueryResponse resp = SolrUtil.executeQuery(solrServer, querySolr); + QueryResponse resp = SolrUtil.executeQuery(getSolrServer(), querySolr); SolrDocumentList solrResults = resp.getResults(); Map<String, Integer> counts = new HashMap<String, Integer>(); @@ -1087,7 +1033,7 @@ * Method to destroy properly the search engine. Mainly used in tests */ protected void destroy() { - solrCore.shutdown(); + getSolrServer().shutdown(); } @Override @@ -1095,7 +1041,7 @@ try { // Create query with restriction Restriction2Solr restriction2Solr = new Restriction2Solr(transaction, fieldModifier); - String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); + String queryString = restriction2Solr.toSolr(criteria.getRestriction(), getSolrServer()); SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); // Add paged @@ -1171,14 +1117,14 @@ if (facetCriteria != null) { for (Criteria facet : facetCriteria) { String queryFacet = - restriction2Solr.toSolr(facet.getRestriction(), solrServer); + restriction2Solr.toSolr(facet.getRestriction(), getSolrServer()); facetQueryToName.put(queryFacet, facet.getName()); query.addFacetQuery(queryFacet); } } } - QueryResponse resp = SolrUtil.executeQuery(solrServer, query); + QueryResponse resp = SolrUtil.executeQuery(getSolrServer(), query); SolrDocumentList solrResults = resp.getResults(); Map<String, List<org.nuiton.wikitty.search.FacetTopic>> facets = new HashMap<String, List<org.nuiton.wikitty.search.FacetTopic>>(); @@ -1280,7 +1226,7 @@ try { TreeNodeResult<String> result = null; - SolrDocument doc = SolrUtil.findById(solrServer, wikittyId); + SolrDocument doc = SolrUtil.findById(getSolrServer(), wikittyId); if (doc != null) { // on verifie que l'argument est bien un TreeNode if (doc.containsKey(TREENODE_DEPTH)) { @@ -1299,9 +1245,9 @@ Restriction2Solr restriction2Solr = new Restriction2Solr(transaction, fieldModifier); String queryString = restriction2Solr.toSolr( - treeCriteria.getRestriction(), solrServer); + treeCriteria.getRestriction(), getSolrServer()); SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); - QueryResponse resp = SolrUtil.executeQuery(solrServer, query); + QueryResponse resp = SolrUtil.executeQuery(getSolrServer(), query); SolrDocumentList solrResults = resp.getResults(); Map<String, Integer> counts = new HashMap<String, Integer>(); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2013-02-28 20:52:12 UTC (rev 1556) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2013-03-07 18:49:25 UTC (rev 1557) @@ -39,8 +39,11 @@ */ public interface WikittySolrConstant { - /** Precise the query parser to use, is allow leading wildcard */ - static final public String SOLR_QUERY_PARSER = "{!lucene}"; // "{!wikitty}"; + /** + * Precise the query parser to use. Now this is configured in solrconfig.xml + * in the '/select' handler as {!lucene q.op=AND df=#fulltext}. + */ + static final public String SOLR_QUERY_PARSER = ""; /** * Prefix utiliser pour les champs ajouter lors de l'indexation. Ce prefix @@ -90,18 +93,6 @@ static final public String SUFFIX_SORTABLE = SOLR_WIKITTY_SUFFIX + "sortable"; -// FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field -// static final public String SUFFIX_BINARY_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "bim"; -// static final public String SUFFIX_BOOLEAN_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "bm"; -// static final public String SUFFIX_NUMERIC_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "dm"; -// static final public String SUFFIX_DATE_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "dtm"; -// static final public String SUFFIX_STRING_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "sm"; -// static final public String SUFFIX_WIKITTY_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "wm"; - static final public String SUFFIX_STRING_LOWERCASE = SOLR_WIKITTY_SUFFIX + "c"; static final public String SUFFIX_STRING_FULLTEXT = SOLR_WIKITTY_SUFFIX + "t"; - -// FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field -// public static final String SUFFIX_STRING_FULLTEXT_LOWERCASE = SOLR_WIKITTY_SUFFIX + "cm"; -// public static final String SUFFIX_STRING_FULLTEXT_MULTIVALUED = SOLR_WIKITTY_SUFFIX + "tm"; }

1 0