December 2009 - Sandbox-commits - mailman.cloud.codelutin.com

r342 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr
by kmorin＠users.nuiton.org 24 Dec '09

24 Dec '09

Author: kmorin Date: 2009-12-24 14:33:17 +0100 (Thu, 24 Dec 2009) New Revision: 342 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyStorage.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: - add index synchronisation method (to fix) - add restore node method Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-24 13:33:17 UTC (rev 342) @@ -26,20 +26,8 @@ import java.io.StringWriter; import java.io.Writer; import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; -import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -341,21 +329,41 @@ return tree; } + public Map.Entry<TreeNode, Integer> restoreNode(String wikittyId) { + Wikitty w = restore(wikittyId); + if(w == null) { + return null; + } + + if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + throw new WikittyException(String.format( + "Wikitty '%s' do not handle extension %s", + wikittyId, TreeNode.EXT_TREENODE )); + } + + TreeNode node = new TreeNodeImpl(w); + Integer count = getSearchEngine().findNodeCount(w); + + HashMap.SimpleEntry<TreeNode, Integer> result = + new AbstractMap.SimpleEntry<TreeNode, Integer>(node, count); + return result; + } + public Map<TreeNode, Integer> restoreChildren(String wikittyId) { Wikitty w = restore(wikittyId); if(w == null) { return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { - throw new WikittyException(String.format( + if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", wikittyId, TreeNode.EXT_TREENODE )); - } + } Map<TreeNode, Integer> result = new LinkedHashMap<TreeNode, Integer>(); - Map<String, Integer> search = getSearchEngine().findAllChildren(w); + Map<String, Integer> search = getSearchEngine().findAllChildrenCount(w); Set<Entry<String, Integer>> children = search.entrySet(); for (Entry<String, Integer> child : children) { Integer count = child.getValue(); @@ -374,6 +382,49 @@ throw new UnsupportedOperationException("Not supported yet."); } + public UpdateResponse syncEngin() { + final int numberForCommit = 1000; + final WikittySearchEngine searchEngine = getSearchEngine(); + final UpdateResponse result = new UpdateResponse(); + final List<Wikitty> wikitties = new ArrayList<Wikitty>(numberForCommit); + + searchEngine.clear(); + getWikittyStorage().scanWikitties(new WikittyStorage.Scanner() { + + WikittyTransaction transaction = new WikittyTransaction(); + int count = 0; + + @Override + public void scan(Wikitty wikitty) { + Date deleteDate = wikitty.getDeleteDate(); + if(deleteDate == null) { + count ++; + wikitties.add(wikitty); + + if(count == numberForCommit) { + // Reindex + List<WikittySearchEngine.Command> commands = searchEngine.prepare(transaction, wikitties); + UpdateResponse response = searchEngine.commit(transaction, commands); + result.add(response); + + // Reinit + count = 0; + wikitties.clear(); + transaction = new WikittyTransaction(); + } + } + } + }); + + // Last wikitties + WikittyTransaction transaction = new WikittyTransaction(); + List<WikittySearchEngine.Command> commands = searchEngine.prepare(transaction, wikitties); + UpdateResponse response = searchEngine.commit(transaction, commands); + result.add(response); + + return result; + } + /** * Class used for import process, this class retain numberForCommit object * before to send it to storage. Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2009-12-24 13:33:17 UTC (rev 342) @@ -17,15 +17,9 @@ package org.sharengo.wikitty; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; + import org.sharengo.wikitty.search.Element; import org.sharengo.wikitty.search.Search; @@ -271,8 +265,33 @@ Tree result = wikittyService.restoreTree(wikittyId); return result; } + public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(Class<E> clazz, String wikittyId) { + Entry<E, Integer> result = restoreNode(clazz, wikittyId, false); + return result; + } + public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(Class<E> clazz, String wikittyId, boolean checkExtension) { + Map.Entry<TreeNode, Integer> node = wikittyService.restoreNode(wikittyId); + if(node == null) { + return null; + } + + E bean = restore(clazz, wikittyId, checkExtension); + if(bean == null) { + return null; + } + + Map.Entry<E, Integer> result = + new HashMap.SimpleEntry<E, Integer>(bean, node.getValue()); + return result; + } + public <E extends BusinessEntity> Map<E, Integer> restoreChildren(Class<E> clazz, String wikittyId) { + Map<E, Integer> result = restoreChildren(clazz, wikittyId, false); + return result; + } + + public <E extends BusinessEntity> Map<E, Integer> restoreChildren(Class<E> clazz, String wikittyId, boolean checkExtension) { Map<TreeNode, Integer> result = wikittyService.restoreChildren(wikittyId); if(result == null) { return null; Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java 2009-12-24 13:33:17 UTC (rev 342) @@ -75,12 +75,19 @@ public PagedResult<String> findAllByCriteria(Criteria criteria); + /** + * Find count of child for a node + * @param w + * @return + */ + public Integer findNodeCount(Wikitty w); + /** * Find all children ids with count for a node wikitty. * @param w * @return */ - public Map<String, Integer> findAllChildren(Wikitty w); + public Map<String, Integer> findAllChildrenCount(Wikitty w); /** * Command update Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java 2009-12-24 13:33:17 UTC (rev 342) @@ -17,7 +17,6 @@ package org.sharengo.wikitty; -import javax.swing.tree.TreeNode; import java.util.Collection; import java.util.List; import java.util.Map; @@ -185,13 +184,21 @@ Tree restoreTree(String wikittyId); /** + * Retrieve wikitty node with count. Wikitty reference by wikittyId MUST + * include the 'Node' extension + * @param wikittyId + * @return + */ + Map.Entry<TreeNode, Integer> restoreNode(String wikittyId); + + /** * Retrieve all wikitties children with count (no recursively) of an other one * Wikitty reference by wikittyId MUST include the 'Node' extension * * @param wikittyId * @return */ - Map<org.sharengo.wikitty.TreeNode, Integer> restoreChildren(String wikittyId); + Map<TreeNode, Integer> restoreChildren(String wikittyId); /* @@ -203,6 +210,17 @@ */ Wikitty restoreVersion(String wikittyId, String version); + /* + * admin + */ + + /** + * Synchronise search engine with wikitty strorage engine, i.e. clear and + * reindex all wikitties. + * @return + */ + UpdateResponse syncEngin(); + /* * Import / Export */ Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2009-12-24 13:33:17 UTC (rev 342) @@ -143,6 +143,16 @@ return result; } + /** + * Scan all wikitties with specific scanner, even if the wikitty is deleted + * + * @param scanner scanner + */ + @Override + public void scanWikitties(Scanner scanner) { + throw new UnsupportedOperationException("Not supported yet."); + } + class CommandInMemory implements Command { /** if true command is for storage, if false for deletion */ boolean toStore; Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyStorage.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyStorage.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyStorage.java 2009-12-24 13:33:17 UTC (rev 342) @@ -93,4 +93,17 @@ */ static public interface Command {} + /** + * Scan all wikitties with specific scanner, even if the wikitty is deleted + * @param scanner scanner + */ + void scanWikitties(Scanner scanner); + + /** + * Call each time wikitty is scan + */ + public static interface Scanner { + void scan(Wikitty wikitty); + } + } Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2009-12-24 13:33:17 UTC (rev 342) @@ -45,6 +45,7 @@ * JDBC driver property name */ static protected String driver = "jdbc.con.driver"; + /** * wikitty_admin table creation query property name */ @@ -54,6 +55,10 @@ */ static protected String wikittyDataCreationQ = "jdbc.queries.creation.wikitty.data"; /** + * basic selection without where clause query property name + */ + static protected String selectionQ = "jdbc.queries.select"; + /** * basic selection with where clause query property name */ static protected String whereSelectionQ = "jdbc.queries.select.where"; @@ -679,4 +684,32 @@ return result; } + + @Override + public void scanWikitties(Scanner scanner) { + Connection con = null; + try { + con = getConnection(); + Statement statement = con.createStatement(); + //select the data with the id "id" in the admin table + ResultSet adminResultSet = statement.executeQuery( + String.format(conf.getProperty(selectionQ), "*", + adminTable)); + adminResultSet.beforeFirst(); + while(adminResultSet.next()) { + String id = adminResultSet.getString(COL_ID); + String version = adminResultSet.getString(COL_VERSION); + String extensionList = adminResultSet.getString(COL_EXTENSION); + //select the data with the id "id" in the data table + ResultSet dataResultSet = statement.executeQuery( + String.format(conf.getProperty(whereSelectionQ), "*", + dataTable, COL_ID, "'" + id + "'")); + Wikitty result = constructWikitty(id, version, extensionList, + dataResultSet); + scanner.scan(result); + } + } catch (Exception eee) { + throw new WikittyException("Can't restore wikitties", eee); + } + } } Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2009-12-23 15:32:17 UTC (rev 341) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2009-12-24 13:33:17 UTC (rev 342) @@ -492,8 +492,26 @@ } } - public Map<String, Integer> findAllChildren(Wikitty w) { + public Integer findNodeCount(Wikitty w) { String wikittyId = w.getId(); + + String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + if(parent == null) { + parent = TREENODE_ROOT; + } else { + parent = TREENODE_PREFIX + parent; + } + + Criteria criteria = Search.query().eq(parent, wikittyId).criteria() + .setFirstIndex(0).setEndIndex(0); + PagedResult<String> search = findAllByCriteria(criteria); + + int numFound = search.getNumFound(); + return numFound; + } + + public Map<String, Integer> findAllChildrenCount(Wikitty w) { + String wikittyId = w.getId(); String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); if(parent == null) {

1 0

r341 - wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty
by kmorin＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: kmorin Date: 2009-12-23 16:32:17 +0100 (Wed, 23 Dec 2009) New Revision: 341 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java Log: - correction in the export (transform < and & into &lts; and &) Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-11 15:46:53 UTC (rev 340) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-23 15:32:17 UTC (rev 341) @@ -613,10 +613,11 @@ extensionList += "," + id; if (!extDone.contains(id)) { extDone.add(id); - result.write(" <extension name='" + ext.getName() + "' version='" + ext.getVersion() + "' requires='" + ext.getRequires() + "'>\n"); + result.write(" <extension name='" + ext.getName() + "' version='" + ext.getVersion() + "'" + + (ext.getRequires() != null ? " requires='" + ext.getRequires() + "'" : "") + ">\n"); for (String fieldName : ext.getFieldNames()) { String def = ext.getFieldType(fieldName).toDefinition(fieldName); - result.write(" <field>" + def + "</field>\n"); + result.write(" <field>" + def.replace("&", "&").replace("<", "<") + "</field>\n"); } result.write(" </extension>\n"); } @@ -629,11 +630,11 @@ for (String fieldName : w.fieldNames()) { FieldType type = w.getFieldType(fieldName); if (type.isCollection()) { - for (Object o : (List) w.getFqField(fieldName)) { - result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, o) + "</" + fieldName + ">\n"); + for (Object o : (Set) w.getFqField(fieldName)) { + result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, o).replace("&", "&").replace("<", "<") + "</" + fieldName + ">\n"); } } else { - result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, w.getFqField(fieldName)) + "</" + fieldName + ">\n"); + result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, w.getFqField(fieldName)).replace("&", "&").replace("<", "<") + "</" + fieldName + ">\n"); } } result.write(" </object>\n");

1 0

r340 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc wikengo_core-wikitty-solr-impl/src/main/resources
by kmorin＠users.nuiton.org 11 Dec '09

11 Dec '09

Author: kmorin Date: 2009-12-11 16:46:53 +0100 (Fri, 11 Dec 2009) New Revision: 340 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml Log: - changed the id type into string instead of text (otherwise it finds several times the same objects) - improved the field names with spaces Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java 2009-12-10 17:14:14 UTC (rev 339) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java 2009-12-11 15:46:53 UTC (rev 340) @@ -69,7 +69,7 @@ if (name == null) { throw new IllegalArgumentException("Name must not be null"); } - this.name = name; + this.name = name.replace(" ", FieldType.WORD_SEPARATOR); } public WikittyExtension(String name, String version, @@ -80,11 +80,15 @@ if (version == null) { throw new IllegalArgumentException("Version must not be null"); } - this.name = name; + this.name = name.replace(" ", FieldType.WORD_SEPARATOR); this.version = version; this.requires = requires; if (fields != null) { - this.fields = fields; + this.fields.clear(); + LinkedHashMap<String, FieldType> corretcFields = new LinkedHashMap<String, FieldType>(); + for (Map.Entry<String, FieldType> fieldEntry : fields.entrySet()) { + this.fields.put(fieldEntry.getKey().replace(" ", FieldType.WORD_SEPARATOR), fieldEntry.getValue()); + } } } @@ -101,7 +105,7 @@ static public String computeName(String id) { int i = id.lastIndexOf("["); - String result = id.substring(0, i).replace(FieldType.WORD_SEPARATOR, " "); + String result = id.substring(0, i); return result; } @@ -118,7 +122,7 @@ } public String getName() { - return name.replace(FieldType.WORD_SEPARATOR, " "); + return name; } public String getVersion() { @@ -138,16 +142,19 @@ } public FieldType getFieldType(String fieldName) { - return fields.get(fieldName); + return fields.get(fieldName.replace(" ", FieldType.WORD_SEPARATOR)); } public List<String> getFieldNames() { - List<String> result = new ArrayList<String>(fields.keySet()); + List<String> result = new ArrayList<String>(); + for(String fieldName : fields.keySet()) { + result.add(fieldName); + } return result; } public void addField(String fieldName, FieldType type) { - fields.put(fieldName, type); + fields.put(fieldName.replace(" ", FieldType.WORD_SEPARATOR), type); } public void addTagValue(String tag, String value) { Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2009-12-10 17:14:14 UTC (rev 339) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2009-12-11 15:46:53 UTC (rev 340) @@ -171,7 +171,7 @@ for (int i = 0 ; i < ext.getFieldNames().size() ; i++) { FieldType type = ext.getFieldType(ext.getFieldNames().get(i)); batch.append(String.format(conf.getProperty(dataInsertQ), - ext.getId(), ext.getFieldNames().get(i).replace(" ", FieldType.WORD_SEPARATOR), + ext.getId(), ext.getFieldNames().get(i), type.toDefinition(ext.getFieldNames().get(i)), i)); } } else { Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2009-12-10 17:14:14 UTC (rev 339) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2009-12-11 15:46:53 UTC (rev 340) @@ -279,8 +279,8 @@ <fields> - <field name="id" type="text_fr" indexed="true" stored="true" required="true" /> - <field name="extensions" type="text_fr" indexed="true" stored="false" multiValued="true"/> + <field name="id" type="string" indexed="true" stored="true" required="true" /> + <field name="extensions" type="string" indexed="true" stored="false" multiValued="true"/>

1 0

r339 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc wikengo_core-wikitty-jdbc-impl/src/test/resources
by kmorin＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: kmorin Date: 2009-12-10 18:14:14 +0100 (Thu, 10 Dec 2009) New Revision: 339 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyUtil.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/jdbc.properties Log: - add tag value to the wikittyExtension Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-08 07:46:00 UTC (rev 338) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-10 17:14:14 UTC (rev 339) @@ -509,6 +509,7 @@ String extName = xpp.getAttributeValue(null, "name"); String version = xpp.getAttributeValue(null, "version"); String requires = xpp.getAttributeValue(null, "requires"); + String tagValue = xpp.getAttributeValue(null, "tagValue"); ext = new WikittyExtension(extName, version, requires, new LinkedHashMap<String, FieldType>()); } else if ("object".equals(name)) { String id = xpp.getAttributeValue(null, "id"); Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java 2009-12-08 07:46:00 UTC (rev 338) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java 2009-12-10 17:14:14 UTC (rev 339) @@ -19,10 +19,7 @@ import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,6 +47,10 @@ * name of other extension needed to put this extension to object */ protected String requires; + /** + * tag value for this extension + */ + Map<String, String> tagValues = new HashMap<String, String>(); /** * use to know version objet, when you change field number, type or other @@ -70,7 +71,7 @@ } this.name = name; } - + public WikittyExtension(String name, String version, String requires, LinkedHashMap<String, FieldType> fields) { if (name == null) { @@ -127,7 +128,15 @@ public String getRequires() { return requires; } - + + public Map<String,String> getTagValues() { + return tagValues; + } + + public String getTagValue(String tag) { + return tagValues.get(tag); + } + public FieldType getFieldType(String fieldName) { return fields.get(fieldName); } @@ -141,6 +150,10 @@ fields.put(fieldName, type); } + public void addTagValue(String tag, String value) { + tagValues.put(tag, value); + } + @Override public int hashCode() { return getId().hashCode(); Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyUtil.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyUtil.java 2009-12-08 07:46:00 UTC (rev 338) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyUtil.java 2009-12-10 17:14:14 UTC (rev 339) @@ -93,9 +93,15 @@ * <li> group 8: all tag/value (toto=titi tutu=tata;lala) no space allowed in tag or value */ static protected Pattern fieldPattern = Pattern.compile( - "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?(?:\\s+(unique))?(?:\\s+(not null))?((?:\\s+\\w+=(\\w|;)+)*)"); + "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?(?:\\s+(unique))?(?:\\s+(not null))?((?:\\s+\\w+=(\\S)+)*)"); /** + * Extension tagValue pattern parser + * group: all tag/value (toto=titi tutu=tata;lala) no space allowed in tag or value + */ + static protected Pattern extTagValuePattern = Pattern.compile("((?:\\w+=(\\S)+(\\s+|$))*)"); + + /** * parse FieldType definition and return field name. All field information * are stored in fieldType object passed in argument * @param def string field definition @@ -150,6 +156,49 @@ } /** + * parse tag value definition and add each one to the extension. All tag values + * are stored in WikittyExtension object passed in argument + * @param def string field definition + * @param extension the WikittyExtension to add the tag values + * @return field name parsed in definition + */ + static public void parseExtensionTagValue(String def, WikittyExtension extension) { + log.debug(def); + if(def != null) { + Matcher match = extTagValuePattern.matcher(def); + if (match.matches()) { + log.debug("matches !"); + String tagValues = match.group(1); + if (tagValues != null) { + String[] tagValuesTab = tagValues.trim().split("\\s"); + for (String tagValue : tagValuesTab) { + String[] tagValueTab = tagValue.trim().split("="); + if (tagValueTab.length != 2) { + log.warn(String.format( + "Illegal tag/value declaration '%s' in '%s'", + tagValue, def)); + } else { + String tag = tagValueTab[0]; + String value = tagValueTab[1]; + extension.addTagValue(tag, value.replace(FieldType.WORD_SEPARATOR, " ")); + } + } + } + } else { + throw new WikittyException(String.format("Bad FieldType definition '%s'", def)); + } + } + } + + static public String convertTagValuesToString(WikittyExtension extension) { + StringBuffer result = new StringBuffer(); + for(Map.Entry entry : extension.getTagValues().entrySet()) { + result.append(entry.getKey()).append("=").append(entry.getValue()).append(" "); + } + return result.toString().trim(); + } + + /** * Create map from string representation * * ex: "String name", "Wikitty children[0-*]" Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2009-12-08 07:46:00 UTC (rev 338) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2009-12-10 17:14:14 UTC (rev 339) @@ -163,9 +163,11 @@ //if the data is not already recorded if (!versionResultSet.first()) { + String tagValues = WikittyUtil.convertTagValuesToString(ext); batch.append(String.format(conf.getProperty(adminInsertQ), ext.getId(), ext.getName(), ext.getVersion(), - ext.getRequires() != null ? "'" + ext.getRequires() + "'" : "null")); + ext.getRequires() != null ? "'" + ext.getRequires() + "'" : "null", + !tagValues.isEmpty() ? "'" + tagValues + "'" : "null")); for (int i = 0 ; i < ext.getFieldNames().size() ; i++) { FieldType type = ext.getFieldType(ext.getFieldNames().get(i)); batch.append(String.format(conf.getProperty(dataInsertQ), @@ -353,6 +355,7 @@ String extName = adminResultSet.getString(COL_NAME); String extVersion = adminResultSet.getString(COL_VERSION); String extRequires = adminResultSet.getString(COL_REQUIRES); + String extTagValue = adminResultSet.getString(COL_TAG_VALUES); LinkedHashMap<String, FieldType> fieldTypes = new LinkedHashMap<String, FieldType>(); //get the data with the id "id" in the data table ResultSet dataResultSet = statement.executeQuery( @@ -367,6 +370,7 @@ } result = new WikittyExtension(extName, extVersion, extRequires, fieldTypes); + WikittyUtil.parseExtensionTagValue(extTagValue, result); extensionCache.put(id, result); } Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2009-12-08 07:46:00 UTC (rev 338) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2009-12-10 17:14:14 UTC (rev 339) @@ -51,6 +51,10 @@ */ static final public String COL_REQUIRES = "requires"; /** + * requires column in the extension_admin table + */ + static final public String COL_TAG_VALUES = "tagValues"; + /** * version column in the admin tables */ static final public String COL_VERSION = "version"; Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/jdbc.properties =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/jdbc.properties 2009-12-08 07:46:00 UTC (rev 338) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/jdbc.properties 2009-12-10 17:14:14 UTC (rev 339) @@ -8,7 +8,9 @@ jdbc.queries.creation.extension.admin=CREATE TABLE IF NOT EXISTS extension_admin (\ id text NOT NULL,\ name text NOT NULL,\ -version varchar(8) NOT NULL);\ +version varchar(8) NOT NULL,\ +requires text,\ +tagValues text);\ ALTER TABLE extension_admin ADD PRIMARY KEY (id); #table extension_data creation query @@ -65,7 +67,7 @@ (id, fieldName, %s) VALUES ('%s', '%s.%s', %s); #extension insertion in the admin table query jdbc.queries.insert.extension.admin=INSERT INTO extension_admin\ -(id, name, version) VALUES ('%s', '%s', '%s'); +(id, name, version, requires, tagValues) VALUES ('%s', '%s', '%s', %s, %s); #extension insertion in the data table query jdbc.queries.insert.extension.data=INSERT INTO extension_data\ (id, fieldName, fieldType) VALUES ('%s', '%s', '%s'); \ No newline at end of file

1 0

r338 - wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc
by kmorin＠users.nuiton.org 08 Dec '09

08 Dec '09

Author: kmorin Date: 2009-12-08 08:46:00 +0100 (Tue, 08 Dec 2009) New Revision: 338 Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java Log: - correction in the date fields : now save date and time (not only date) Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2009-11-26 17:16:44 UTC (rev 337) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2009-12-08 07:46:00 UTC (rev 338) @@ -22,11 +22,9 @@ import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.*; +import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -236,7 +234,7 @@ COL_DATE_VALUE, wikitty.getId(), ext.getName(), fieldName + "[" + i + "/" + list.size() + "]", - "'" + new java.sql.Date(value.getTime()) + "'")); + "'" + new Timestamp(value.getTime()) + "'")); } break; case NUMERIC: @@ -314,7 +312,7 @@ batch.append(String.format( conf.getProperty(dataInsertQ), COL_DATE_VALUE, wikitty.getId(), ext.getName(), fieldName, - "'" + new java.sql.Date(dateValue.getTime()) + "'")); + "'" + new Timestamp(dateValue.getTime()) + "'")); } else { System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); if (type.isNotNull()) { @@ -609,7 +607,7 @@ value = resultSet.getBoolean(COL_BOOLEAN_VALUE); break; case DATE: - value = resultSet.getDate(COL_DATE_VALUE); + value = new Date(resultSet.getTimestamp(COL_DATE_VALUE).getTime()); break; case NUMERIC: value = resultSet.getBigDecimal(COL_NUMBER_VALUE);

1 0