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

r328 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 21 Sep '10

21 Sep '10

Author: echatellier Date: 2010-09-21 15:12:03 +0200 (Tue, 21 Sep 2010) New Revision: 328 Url: http://nuiton.org/repositories/revision/wikitty/328 Log: Fix tree nodes deletion Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-21 10:21:04 UTC (rev 327) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-21 13:12:03 UTC (rev 328) @@ -843,8 +843,8 @@ PagedResult<String> childTreeNodeIds = findAllByCriteria(securityToken, transaction, criteria); List<String> treeNodeIds = new ArrayList<String>(); + treeNodeIds.add(treeNodeId); for (String childTreeNodeId : childTreeNodeIds.getAll()) { - treeNodeIds.add(childTreeNodeId); List<String> subTreeNodeIds = getRecursiveTreeNodeId(securityToken, transaction, childTreeNodeId); treeNodeIds.addAll(subTreeNodeIds); }

1 0

r327 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa
by echatellier＠users.nuiton.org 21 Sep '10

21 Sep '10

Author: echatellier Date: 2010-09-21 12:21:04 +0200 (Tue, 21 Sep 2010) New Revision: 327 Url: http://nuiton.org/repositories/revision/wikitty/327 Log: Add new WikittyObseleteException when trying to save obselete wikitty Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java 2010-09-21 10:21:04 UTC (rev 327) @@ -0,0 +1,23 @@ +package org.nuiton.wikitty; + +/** + * Wikitty exception. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyObseleteException extends WikittyException { + + private static final long serialVersionUID = 1L; + + public WikittyObseleteException(String message) { + super(message); + } + + public WikittyObseleteException(String message, Throwable cause) { + super(message, cause); + } +} Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java =================================================================== --- trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-09-21 10:17:20 UTC (rev 326) +++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-09-21 10:21:04 UTC (rev 327) @@ -17,11 +17,15 @@ package org.nuiton.wikitty.hbase; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.F_ADMIN; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.F_DATA; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.NULL; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_DELETE_DATE; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_EXTENSION; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_ID; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_VERSION; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.T_WIKITTY; -import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.*; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -30,12 +34,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; import org.nuiton.wikitty.FieldType; @@ -45,6 +52,7 @@ import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyObseleteException; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; @@ -113,7 +121,7 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete - throw new WikittyException(String.format( + throw new WikittyObseleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); } } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-21 10:17:20 UTC (rev 326) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-21 10:21:04 UTC (rev 327) @@ -74,6 +74,7 @@ import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyObseleteException; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; @@ -198,7 +199,7 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete - throw new WikittyException(String.format( + throw new WikittyObseleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); } } Modified: trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java =================================================================== --- trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-09-21 10:17:20 UTC (rev 326) +++ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-09-21 10:21:04 UTC (rev 327) @@ -21,6 +21,12 @@ import java.util.Date; import java.util.Iterator; import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceUnit; +import javax.persistence.Query; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.FieldType; @@ -29,14 +35,10 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyObseleteException; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; -import javax.persistence.Query; import org.springframework.beans.factory.annotation.Autowired; /** @@ -99,7 +101,7 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete - throw new WikittyException(String.format( + throw new WikittyObseleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikittyId, requestedVersion, actualVersion)); } }

1 0

r326 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 21 Sep '10

21 Sep '10

Author: echatellier Date: 2010-09-21 12:17:20 +0200 (Tue, 21 Sep 2010) New Revision: 326 Url: http://nuiton.org/repositories/revision/wikitty/326 Log: Replace Exception by Throwable. Deprecate on constructor. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java 2010-09-20 12:34:30 UTC (rev 325) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java 2010-09-21 10:17:20 UTC (rev 326) @@ -34,12 +34,16 @@ super(message); } - public WikittyException(Exception eee) { - super(eee); + /** + * TODO EC20100921 add message with cause use {@link WikittyException(String, Throwable)} + */ + @Deprecated + public WikittyException(Throwable cause) { + super(cause); } - public WikittyException(String message, Exception eee) { - super(message, eee); + public WikittyException(String message, Throwable cause) { + super(message, cause); } }

1 0

r325 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by echatellier＠users.nuiton.org 20 Sep '10

20 Sep '10

Author: echatellier Date: 2010-09-20 14:34:30 +0200 (Mon, 20 Sep 2010) New Revision: 325 Url: http://nuiton.org/repositories/revision/wikitty/325 Log: Use id contant Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-20 10:45:10 UTC (rev 324) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-20 12:34:30 UTC (rev 325) @@ -878,7 +878,7 @@ * Find solr document by id */ protected SolrDocument findById(String id) { - SolrQuery query = new SolrQuery("id:" + id); + SolrQuery query = new SolrQuery(SOLR_ID + ":" + id); QueryResponse response; try { response = solrServer.query(query);

1 0

r324 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by echatellier＠users.nuiton.org 20 Sep '10

20 Sep '10

Author: echatellier Date: 2010-09-20 12:45:10 +0200 (Mon, 20 Sep 2010) New Revision: 324 Url: http://nuiton.org/repositories/revision/wikitty/324 Log: Fix null pointer exception when trying to reindex wikitty not already in index Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-17 08:33:00 UTC (rev 323) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-20 10:45:10 UTC (rev 324) @@ -271,6 +271,8 @@ * TreeNode.A : B * TreeNode.B : C * TreeNode.C : TreeNode.empty + * + * @throws SolrServerException */ public void reindex() throws SolrServerException { for (String id : getReindexIds()) { @@ -281,26 +283,26 @@ doc = new SolrInputDocument(); // Copy old field value - - // FIXME EC-20100831 le retour de findById peut être - // null. A tester pourquoi, mais si les objets - // attachés aux tree nodes ne sont pas encore dans - // la base, le retour est null et ... NPE - // un simple log.warn devrait suffire - SolrDocument found = findById(id); - Collection<String> fieldNames = found.getFieldNames(); - for (String fieldName : fieldNames) { - Collection<Object> fieldValues = found.getFieldValues(fieldName); - - if(!fieldName.startsWith(TREENODE_PREFIX)) { - for (Object fieldValue : fieldValues) { - doc.addField(fieldName, fieldValue); + if (found != null) { + Collection<String> fieldNames = found.getFieldNames(); + for (String fieldName : fieldNames) { + Collection<Object> fieldValues = found.getFieldValues(fieldName); + + if(!fieldName.startsWith(TREENODE_PREFIX)) { + for (Object fieldValue : fieldValues) { + doc.addField(fieldName, fieldValue); + } } } + + solrResource.addDoc(id, doc); } - - solrResource.addDoc(id, doc); + else { + if (log.isWarnEnabled()) { + log.warn("Can't find wikitty id '" + id + "' in index. Skip this wikitty."); + } + } } // Add tree node fields

1 0

r323 - trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test
by jruchaud＠users.nuiton.org 17 Sep '10

17 Sep '10

Author: jruchaud Date: 2010-09-17 10:33:00 +0200 (Fri, 17 Sep 2010) New Revision: 323 Url: http://nuiton.org/repositories/revision/wikitty/323 Log: Add tests on search with date Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-09-17 08:31:57 UTC (rev 322) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-09-17 08:33:00 UTC (rev 323) @@ -454,4 +454,22 @@ List<String> list = result.getAll(); assertEquals(1, list.size()); } + + @Test + public void testDateSearch() throws Exception { + Criteria criteria = Search.query() + .bw("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009"), Criteria.ALL_VALUES) + .criteria(); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(2, list.size()); + + criteria = Search.query() + .ge("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009")) + .criteria(); + result = ws.findAllByCriteria(null, criteria); + list = result.getAll(); + assertEquals(2, list.size()); + } + }

1 0

r322 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by jruchaud＠users.nuiton.org 17 Sep '10

17 Sep '10

Author: jruchaud Date: 2010-09-17 10:31:57 +0200 (Fri, 17 Sep 2010) New Revision: 322 Url: http://nuiton.org/repositories/revision/wikitty/322 Log: Fix request for test field is null Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-09-16 15:35:55 UTC (rev 321) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-09-17 08:31:57 UTC (rev 322) @@ -391,7 +391,7 @@ } private String isNull2solr(Null isNull) { - return "-" + WikittySearchEnginSolr.SOLR_NOT_NULL_FIELDS + ":" + isNull.getFieldName(); + return "( *:* - " + WikittySearchEnginSolr.SOLR_NOT_NULL_FIELDS + ":" + isNull.getFieldName() + ")"; } private String isNotNull2solr(Null isNotNull) {

1 0

r321 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport
by echatellier＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: echatellier Date: 2010-09-16 17:35:55 +0200 (Thu, 16 Sep 2010) New Revision: 321 Url: http://nuiton.org/repositories/revision/wikitty/321 Log: Add wikitty extension support on csv import/export Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-16 13:26:42 UTC (rev 320) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-16 15:35:55 UTC (rev 321) @@ -62,6 +62,9 @@ /** Wikitty id header name. */ protected final static String FIELD_WIKITTY_ID = "Wikitty.Id"; + /** Wikitty extensions header name. */ + protected final static String FIELD_WIKITTY_EXT = "Wikitty.Ext"; + /** Pattern form link queries. */ protected Pattern queryPattern = Pattern.compile("^((\\w+)\\.(\\w+))=(\"(.+)\"|([^\"]+))$"); @@ -72,6 +75,7 @@ // get index of wikitty.id field int wikittyIdIndex = -1; + int wikittyExtIndex = -1; // read header to get extension names // and build two array for ext and fieldName @@ -81,9 +85,13 @@ String[] fieldsName = new String[header.length]; for (int i = 0; i < header.length ; ++i) { // wikitty id is technical (special management) - if (FIELD_WIKITTY_ID.equals(header[i])) { + if (FIELD_WIKITTY_ID.equalsIgnoreCase(header[i])) { wikittyIdIndex = i; } + // wikitty ext is technical (special management) + else if (FIELD_WIKITTY_EXT.equalsIgnoreCase(header[i])) { + wikittyExtIndex = i; + } else { ext[i] = header[i].substring(0, header[i].indexOf(".")); fieldsName[i] = header[i].substring(header[i].indexOf(".") + 1); @@ -94,22 +102,40 @@ String[] currentLine; while ((currentLine = csvReader.readNext()) != null) { - String wikittyId=""; - if (wikittyIdIndex != -1){ - wikittyId = currentLine[wikittyIdIndex]; + // cas d'une ligne vide en fin de fichier + if (currentLine.length == 1) { + continue; } - Wikitty currentWikitty; - if (StringUtils.isNotEmpty(wikittyId)) { - currentWikitty = new WikittyImpl(wikittyId); + + // build wikitty instance with id (if specified) + Wikitty currentWikitty = null; + if (wikittyIdIndex != -1) { + String wikittyId = currentLine[wikittyIdIndex]; + if (StringUtils.isNotBlank(wikittyId)) { + currentWikitty = new WikittyImpl(wikittyId); + } } - else { + if (currentWikitty == null) { currentWikitty = new WikittyImpl(); } + // add required extension (if specified) + if (wikittyExtIndex != -1) { + String extensionList = currentLine[wikittyExtIndex]; + if (StringUtils.isNotBlank(extensionList)) { + String[] extensions = extensionList.split(","); + for (String extension : extensions) { + String extName = extension.trim(); + addMissingExtension(securityToken, ws, transaction, currentWikitty, extName); + } + } + } + + // manage other fields for (int i = 0; i < header.length ; ++i) { // wikitty id column, already managed - if (i == wikittyIdIndex) { + if (i == wikittyIdIndex || i == wikittyExtIndex) { continue; } @@ -245,6 +271,7 @@ // write all data into writer List<String> extensionHeader = new LinkedList<String>(); extensionHeader.add(FIELD_WIKITTY_ID); + extensionHeader.add(FIELD_WIKITTY_EXT); for (FacetTopic topic : pagedResult.getTopic(Element.ELT_EXTENSION)) { String extName = topic.getTopicName(); @@ -269,6 +296,10 @@ // first, add technical id wikittyField[extensionHeader.indexOf(FIELD_WIKITTY_ID)] = w.getId(); + // second, add technical ext list + Collection<String> extNamesCollection = w.getExtensionNames(); + String extNames = StringUtils.join(extNamesCollection, ','); + wikittyField[extensionHeader.indexOf(FIELD_WIKITTY_EXT)] = extNames; // wikitty export must be composed of all field // corresponding to header extensions names @@ -280,7 +311,7 @@ Object fqField = w.getFqField(fieldName); if (fqField != null) { String separator = ""; - for (Object o : (Collection) fqField) { + for (Object o : (Collection<?>) fqField) { String fqFieldValue = WikittyUtil.toString(type, o); currentField += separator + "(" + fqFieldValue + ")"; separator = ",";

1 0

r320 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr wikitty-solr-impl/src/main/resources wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test
by jruchaud＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: jruchaud Date: 2010-09-16 15:26:42 +0200 (Thu, 16 Sep 2010) New Revision: 320 Url: http://nuiton.org/repositories/revision/wikitty/320 Log: Manage null in search Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/main/resources/schema.xml trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java 2010-09-16 13:26:42 UTC (rev 320) @@ -0,0 +1,45 @@ +/* *##% + * Copyright (c) 2009 ruchaud. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + *##%*/ +package org.nuiton.wikitty.search; + +/** + * Is null or is not null restriction + * + * @author ruchaud + */ +public class Null extends Restriction { + + private static final long serialVersionUID = 1L; + + protected String fieldName; + + public Null() { + } + + public Null(String fieldName) { + this.fieldName = fieldName; + } + + public String getFieldName() { + return fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-09-16 13:26:42 UTC (rev 320) @@ -71,6 +71,7 @@ return true; } + @Override public int hashCode() { // equals use objects that are not constant through time // then, unable to create hashCode from those objects Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2010-09-16 13:26:42 UTC (rev 320) @@ -202,6 +202,20 @@ return keyword; } + public static Null isNull(String fieldName) { + Null isNull = new Null(); + isNull.setName(RestrictionName.IS_NULL); + isNull.setFieldName(fieldName); + return isNull; + } + + public static Null isNotNull(String fieldName) { + Null isNotNull = new Null(); + isNotNull.setName(RestrictionName.IS_NOT_NULL); + isNotNull.setFieldName(fieldName); + return isNotNull; + } + static ThreadLocal<SimpleDateFormat> myFormats = new ThreadLocal<SimpleDateFormat>() { @Override protected SimpleDateFormat initialValue() { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-09-16 13:26:42 UTC (rev 320) @@ -26,5 +26,7 @@ FALSE, ASSOCIATED, IN, - KEYWORD + KEYWORD, + IS_NULL, + IS_NOT_NULL } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-09-16 13:26:42 UTC (rev 320) @@ -327,6 +327,28 @@ } /** + * Is null. + * + * @param fieldName + * @return {@code this} + */ + public Search isNull(String fieldName) { + restrictions.add(RestrictionHelper.isNull(fieldName)); + return this; + } + + /** + * Is not null. + * + * @param fieldName + * @return {@code this} + */ + public Search isNotNull(String fieldName) { + restrictions.add(RestrictionHelper.isNotNull(fieldName)); + return this; + } + + /** * Not (sub query). * * @return sub query Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-09-16 13:26:42 UTC (rev 320) @@ -34,6 +34,7 @@ import org.nuiton.wikitty.search.StartsWith; import org.nuiton.wikitty.search.Unlike; import org.nuiton.wikitty.search.Like.SearchAs; +import org.nuiton.wikitty.search.Null; /** * @author "Nicolas Chapurlat" <nicolas.chapurlat(a)logica.com> @@ -135,6 +136,12 @@ case KEYWORD: Keyword keyword = (Keyword) restriction; return keyword2solr(keyword); + case IS_NULL: + Null isNull = (Null) restriction; + return isNull2solr(isNull); + case IS_NOT_NULL: + Null isNotNull = (Null) restriction; + return isNotNull2solr(isNotNull); default: throw new WikittyException("this kind of restriction is not supported : " + restriction.getName().toString()); @@ -383,6 +390,14 @@ return value2solr(keyword.getValue()); } + private String isNull2solr(Null isNull) { + return "-" + WikittySearchEnginSolr.SOLR_NOT_NULL_FIELDS + ":" + isNull.getFieldName(); + } + + private String isNotNull2solr(Null isNotNull) { + return WikittySearchEnginSolr.SOLR_NOT_NULL_FIELDS + ":" + isNotNull.getFieldName(); + } + private String element2solr(Element element) throws WikittyException { String result = element.getName(); result = fieldModifer.convertToSolr(transaction, result); Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-16 13:26:42 UTC (rev 320) @@ -85,6 +85,9 @@ /** extensions field name in solr */ static final public String SOLR_EXTENSIONS = "extensions"; + /** group all fields is not null */ + static final public String SOLR_NOT_NULL_FIELDS = "not_null_fields"; + /** extension use to store field without extension to search on all extesnion */ static final public String SOLR_ALL_EXTENSIONS = "all"; @@ -593,6 +596,7 @@ } } + @Override public void delete(Collection<String> idList) throws WikittyException { try { for (String id : idList) { @@ -843,6 +847,7 @@ doc.addField(solrAllFieldName + "_c", itemValueLowerCase); } + doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); log.debug("index field " + solrFqFieldName + " with value '" + itemValue + "'"); } } @@ -859,6 +864,7 @@ doc.addField(solrAllFieldName + "_c", objectValueLowerCase); } + doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); log.debug("index field " + solrFqFieldName + " with value '" + objectValue + "'"); } } Modified: trunk/wikitty-solr-impl/src/main/resources/schema.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/schema.xml 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-solr-impl/src/main/resources/schema.xml 2010-09-16 13:26:42 UTC (rev 320) @@ -273,6 +273,7 @@ <field name="id" type="string" indexed="true" stored="true" required="true" /> <field name="extensions" type="string" indexed="true" stored="true" multiValued="true"/> + <field name="not_null_fields" type="string" indexed="true" stored="true" multiValued="true"/>  Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-09-16 12:29:21 UTC (rev 319) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-09-16 13:26:42 UTC (rev 320) @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import java.util.List; import org.apache.commons.logging.Log; @@ -58,6 +57,7 @@ "String name", "Numeric price", "String value", + "String optional", "Wikitty category") ); @@ -70,11 +70,13 @@ "name = Other Paint blue," + "price = 20," + "value = 1," + + "optional = test," + "category = " + hardwareCategoryId, "name = Paint red," + "price = 35," + "value = 1," + + "optional = test," + "category = " + hardwareCategoryId, "name = Paint Staff blue," + @@ -363,6 +365,19 @@ } @Test + public void testNullSearch() { + Criteria criteria = Search.query().isNotNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); + PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); + List<String> result = pagedResult.getAll(); + assertEquals(2, result.size()); + + criteria = Search.query().isNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(3, result.size()); + } + + @Test public void testLikeSearch() throws Exception { Criteria criteria = Search.query().like("Category.name", "hArDwArE", Like.SearchAs.ToLowerCase).criteria(); PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria);

1 0

r319 - in trunk: . wikitty-api wikitty-jpa-impl wikitty-ui-zk
by echatellier＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: echatellier Date: 2010-09-16 14:29:21 +0200 (Thu, 16 Sep 2010) New Revision: 319 Url: http://nuiton.org/repositories/revision/wikitty/319 Log: Revert back to jbossjta 4.9.0 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-16 09:31:05 UTC (rev 318) +++ trunk/pom.xml 2010-09-16 12:29:21 UTC (rev 319) @@ -126,6 +126,7 @@ <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> <version>1.4.1</version> + <scope>compile</scope> </dependency> <dependency> @@ -143,12 +144,6 @@ </dependency> <dependency> - <groupId>jasperreports</groupId> - <artifactId>jasperreports</artifactId> - <version>3.5.3</version> - </dependency> - - <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> <version>1.1.4c</version> @@ -163,14 +158,16 @@  <dependency> - <groupId>org.jboss.jbossts</groupId> + <groupId>jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.11.0.Final</version> + <version>4.9.0.GA</version> + <scope>compile</scope> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> <version>1.1</version> + <scope>compile</scope> </dependency>  @@ -282,33 +279,8 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> + <version>4.1.0.Final</version> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.6.0.GA</version> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.7</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - </dependency> <dependency> <groupId>org.hibernate.javax.persistence</groupId> @@ -319,9 +291,15 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-core</artifactId> - <version>5.3.1</version> + <version>5.4.0</version> </dependency> + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + <version>1.5.0</version> + </dependency> + </dependencies> </dependencyManagement> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-16 09:31:05 UTC (rev 318) +++ trunk/wikitty-api/pom.xml 2010-09-16 12:29:21 UTC (rev 319) @@ -79,7 +79,7 @@  <dependency> - <groupId>org.jboss.jbossts</groupId> + <groupId>jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency> <dependency> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-09-16 09:31:05 UTC (rev 318) +++ trunk/wikitty-jpa-impl/pom.xml 2010-09-16 12:29:21 UTC (rev 319) @@ -108,27 +108,8 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> </dependency> + <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </dependency> - <dependency> <groupId>com.experlog</groupId> <artifactId>xapool</artifactId> </dependency> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-09-16 09:31:05 UTC (rev 318) +++ trunk/wikitty-ui-zk/pom.xml 2010-09-16 12:29:21 UTC (rev 319) @@ -62,10 +62,10 @@ <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>javax.servlet</groupId>

1 0