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

r1572 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function
by bpoussin＠users.nuiton.org 12 Jul '13

12 Jul '13

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 12 Jul '13

12 Jul '13

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 12 Jul '13

12 Jul '13

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