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

r1572 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function
by bpoussin＠users.nuiton.org July 12, 2013

July 12, 2013

Author: bpoussin Date: 2013-07-12 18:20:58 +0200 (Fri, 12 Jul 2013) New Revision: 1572 Url: http://nuiton.org/projects/wikitty/repository/revisions/1572 Log: fixes #2754: add new select function to get year of date Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionYear.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionYear.java (from rev 1568, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFieldValue.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionYear.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionYear.java 2013-07-12 16:20:58 UTC (rev 1572) @@ -0,0 +1,126 @@ +package org.nuiton.wikitty.query.function; + +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DateUtil; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.query.ListObjectOrMap; +import org.nuiton.wikitty.query.WikittyQuery; + +/** + * Permet de recuperer l'annee d'un champs DATE, les Maps retournees contiennent + * seulement un champs + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class FunctionYear extends WikittyQueryFunction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(FunctionYear.class); + + public FunctionYear(String name) { + super("year", name, null); + } + + public FunctionYear(String name, WikittyQueryFunction arg) { + super("year", name, Collections.singletonList(arg)); + } + +public FunctionYear(String methodName, String name, List<WikittyQueryFunction> args) { + super(methodName, name, args); + if (args.size() != 1) { + throw new IllegalArgumentException("Year accept only one argument"); + } + } + + @Override + public int getNumArg() { + return 1; + } + + @Override + public List<Map<String, Object>> call( + WikittyQuery query, List<Map<String, Object>> data) { + + WikittyQueryFunction f = getArgs().get(0); + data = f.call(query, data); + + ListObjectOrMap result = new ListObjectOrMap(); + + for (Map<String, Object> m : data) { + for (Map.Entry<String, Object> s : m.entrySet()) { + String k = StringUtils.defaultIfBlank(getName(), s.getKey()); + Object v = s.getValue(); + if (v instanceof Collection) { + result.add(k, getYear((Collection)v)); + } else { + result.add(k, getYear(v)); + } + } + } + + return result; + } + + protected Collection getYear(Collection c) { + Collection result = new ArrayList(c.size()); + for (Object o : c) { + result.add(getYear(o)); + } + return result; + } + + protected Object getYear(Object o) { + Object result = o; + Date d = null; + try { + d = WikittyUtil.toDate(o); + } catch (Exception eee) { + log.debug(String.format("can't convert '%s' object to date, keep object and don't extract year", o), eee); + } + if (d != null) { + result = DateUtil.getDefaultCalendar(d).get(Calendar.YEAR); + } + return result; + } +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java 2013-07-12 16:18:50 UTC (rev 1571) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java 2013-07-12 16:20:58 UTC (rev 1572) @@ -109,6 +109,8 @@ result = new WikittyQueryFunctionWrapper(WikittyUtil.class.getName() + "#toString", name, args); } else if ("toDate".equalsIgnoreCase(methodName)) { result = new WikittyQueryFunctionWrapper(WikittyUtil.class.getName() + "#toDate", name, args); + } else if ("year".equalsIgnoreCase(methodName)) { + result = new FunctionYear(methodName, name, args); } else { if (StringUtils.contains(methodName, ObjectUtil.CLASS_METHOD_SEPARATOR)) { // c'est une methode quelconque.

1 0

r1571 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query
by bpoussin＠users.nuiton.org July 12, 2013

July 12, 2013

Author: bpoussin Date: 2013-07-12 18:18:50 +0200 (Fri, 12 Jul 2013) New Revision: 1571 Url: http://nuiton.org/projects/wikitty/repository/revisions/1571 Log: Add new methods to take #offset #limit #depth information after parse query string Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMakerAbstract.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMakerAbstract.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMakerAbstract.java 2013-07-12 16:17:16 UTC (rev 1570) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMakerAbstract.java 2013-07-12 16:18:50 UTC (rev 1571) @@ -593,12 +593,19 @@ * {@link #and()}, {@link #or()}, {@link #not()}, {@link #containsOne()} * @param query la requete a ajouter (peut-etre vide ou nul, dans ce cas, la * condition utiliser est "true") + * @param includeExtra copy offset, limit, depth found in query if true * @return {@code this} with the {@code c} restriction added. */ - public M parse(String query) { + public M parse(String query, boolean includeExtra) { if (StringUtils.isNotBlank(query)) { WikittyQuery filter = WikittyQueryParser.parse(query); addCondition(filter.getCondition(), true); + if (includeExtra) { + WikittyQuery q = getQuery(); + q.setOffset(filter.getOffset()); + q.setLimit(filter.getLimit()); + q.setWikittyFieldSearchDepth(filter.getWikittyFieldSearchDepth()); + } } else { addCondition(new True()); } @@ -606,6 +613,19 @@ } /** + * Parse et ajoute un bout de requete. Cette requete est prise comme une + * condition terminal si l'on veut continuer a construire la requete, il + * faut avoir ajouter avant une + * {@link #and()}, {@link #or()}, {@link #not()}, {@link #containsOne()} + * @param query la requete a ajouter (peut-etre vide ou nul, dans ce cas, la + * condition utiliser est "true") + * @return {@code this} with the {@code c} restriction added. + */ + public M parse(String query) { + return parse(query, false); + } + + /** * Ajoute une contrainte qui cree les conditions en prenant comme exemple * l'objet passer en parametre. Seuls les champs non null sont utilises ainsi * que la liste des extensions de l'objet

1 0

r1570 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org July 12, 2013

July 12, 2013

Author: bpoussin Date: 2013-07-12 18:17:16 +0200 (Fri, 12 Jul 2013) New Revision: 1570 Url: http://nuiton.org/projects/wikitty/repository/revisions/1570 Log: fixes #2753: When wikitty open multiple solr server on same data file, solr index is corrupted Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.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-05-26 07:01:48 UTC (rev 1569) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2013-07-12 16:17:16 UTC (rev 1570) @@ -65,12 +65,20 @@ final static private Log log = LogFactory.getLog(SolrUtil.class); final static private TimeLog timeLog = new TimeLog(SolrUtil.class); + /** + * Cache permettant de ne pas instancier 2 solr serveur qui travaillerait + * avec les memes fichiers sur le disque. + */ + static Map<String, SolrServer> solrServerCache = new HashMap<String, SolrServer>(); + public static SolrServer getSolrServer(ApplicationConfig config) { boolean removeSystemSolrDirFactoryKey = false; String solrDirFactoryKey = null; boolean removeSystemSolrDataDirKey = false; String solrDataDirKey = null; + + String solrDataDir = null; // init system env solr.data.dir if (config != null) { @@ -87,7 +95,7 @@ if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { solrDataDirKey = WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); - String solrDataDir = config.getOption(solrDataDirKey); + solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists if (solrDataDir != null) { File file = new File(solrDataDir); @@ -102,13 +110,20 @@ } } - 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); + SolrServer result = solrServerCache.get(solrDataDir); + if (result == null) { + try { + CoreContainer.Initializer initializer = new CoreContainer.Initializer(); + CoreContainer solrCore = initializer.initialize(); + result = new EmbeddedSolrServer(solrCore, ""); + if (solrDataDir != null) { + solrServerCache.put(solrDataDir, result); + } + } catch (Exception eee) { + throw new WikittyException("SolR initialization error", eee); + } + } else { + log.debug("re-use already instanciate SolrServer for " + solrDataDir); } if (removeSystemSolrDirFactoryKey) {

1 0

r1569 - trunk
by tchemit＠users.nuiton.org May 26, 2013

May 26, 2013

Author: tchemit Date: 2013-05-26 09:01:48 +0200 (Sun, 26 May 2013) New Revision: 1569 Url: http://nuiton.org/projects/wikitty/repository/revisions/1569 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-15 14:13:33 UTC (rev 1568) +++ trunk/pom.xml 2013-05-26 07:01:48 UTC (rev 1569) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.9</version> + <version>3.4.11</version> </parent>

1 0

Jenkins build became unstable: wikitty #606
by admin+hudson＠codelutin.com May 15, 2013

May 15, 2013

See <http://ci.nuiton.org/jenkins/job/wikitty/606/>

1 1

Jenkins build became unstable: wikitty » Wikitty :: wikitty-jdbc #606
by admin+hudson＠codelutin.com May 15, 2013

May 15, 2013

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

1 1

r1568 - in trunk: wikitty-jdbc/src/license wikitty-solr/src/license
by bpoussin＠users.nuiton.org April 15, 2013

April 15, 2013

Author: bpoussin Date: 2013-04-15 16:13:33 +0200 (Mon, 15 Apr 2013) New Revision: 1568 Url: http://nuiton.org/projects/wikitty/repository/revisions/1568 Log: add zookeeper licence Modified: trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2013-04-15 13:10:47 UTC (rev 1567) +++ trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2013-04-15 14:13:33 UTC (rev 1568) @@ -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. @@ -21,10 +23,10 @@ # Please fill the missing licenses for dependencies : # # -#Wed Feb 01 07:09:33 CET 2012 +#Mon Apr 15 16:19:41 CEST 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=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2013-04-15 13:10:47 UTC (rev 1567) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2013-04-15 14:13:33 UTC (rev 1568) @@ -22,10 +22,10 @@ # Please fill the missing licenses for dependencies : # # -#Sat Mar 23 01:47:37 CET 2013 +#Mon Apr 15 16:18:37 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. 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= +org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1

1 0

r1567 - trunk
by bpoussin＠users.nuiton.org April 15, 2013

April 15, 2013

Author: bpoussin Date: 2013-04-15 15:10:47 +0200 (Mon, 15 Apr 2013) New Revision: 1567 Url: http://nuiton.org/projects/wikitty/repository/revisions/1567 Log: switch to mavenpom4redmine 3.4.9 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-15 10:05:24 UTC (rev 1566) +++ trunk/pom.xml 2013-04-15 13:10:47 UTC (rev 1567) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>3.4.9</version> </parent>

1 0

r1566 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org April 15, 2013

April 15, 2013

Author: bpoussin Date: 2013-04-15 12:05:24 +0200 (Mon, 15 Apr 2013) New Revision: 1566 Url: http://nuiton.org/projects/wikitty/repository/revisions/1566 Log: fix date parsing when pattern contains ' to escape char 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-04-03 20:44:50 UTC (rev 1565) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2013-04-15 10:05:24 UTC (rev 1566) @@ -112,8 +112,8 @@ 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_NOW = "NOW"; + public static final String DATE_TODAY = "TODAY"; public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ'Z'"; @@ -679,9 +679,18 @@ * 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 + * <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 * + * L'implantation de cette methode n'est pas satisfaisante, il faudrait + * trouver un meilleur algo. Le but est de parser la date suivant different + * pattern, puis derrière cette date il peut y avoir des demandes de modification + * (math date) par exemple +3MONTHS. Pour qu'une date soit valide, il faut + * que le parsing de la date fonctionne et que le parsing de la partie math + * fonctionne. Mais le découpage des deux parties n'est pas simple a trouver + * vu que la date peut-etre dans de tres nombreux format et que la partie + * math peut-etre elle aussi complexe :( + * * @param value * @return */ @@ -704,7 +713,8 @@ v = StringUtils.substringAfter(v, DATE_TODAY); } else { for (String pattern : DATE_FORMAT_ALLOWED) { - if (StringUtils.length(v) < StringUtils.length(pattern)) { + // remove ' from pattern because 'T' is 3 char in patten and 1 in value + if (StringUtils.length(v) < StringUtils.length(StringUtils.remove(pattern, "'"))) { // if pattern longer than v then parse is impossble continue; }

1 0

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

April 3, 2013

See <http://ci.nuiton.org/jenkins/job/wikitty/585/changes>

1 1