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

r378 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr
by schorlet＠users.nuiton.org 05 Feb '10

05 Feb '10

Author: schorlet Date: 2010-02-05 22:58:45 +0100 (Fri, 05 Feb 2010) New Revision: 378 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/WikittyServiceInMemory.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: ajout d'une methode delete sur WikittySearchEngine permettant de supprimer un document sans aucune autre forme de traitement 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 2010-02-05 09:36:36 UTC (rev 377) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java 2010-02-05 21:58:45 UTC (rev 378) @@ -73,6 +73,14 @@ public List<Command> delete(WikittyTransaction transaction, List<String> idList) throws WikittyException; + /** + * Delete all object with idList argument. + * + * throw an exception + * @param idList + */ + public void delete(List<String> idList) throws WikittyException; + public PagedResult<String> findAllByCriteria(Criteria criteria); /** 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 2010-02-05 09:36:36 UTC (rev 377) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2010-02-05 21:58:45 UTC (rev 378) @@ -265,6 +265,10 @@ return new ArrayList<Command>(); } + public void delete(List<String> idList) throws WikittyException { + // do nothing + } + public boolean checkRestriction( Restriction restriction, Wikitty w ) { if ( restriction instanceof BinaryOperator ) { BinaryOperator binOp = (BinaryOperator) restriction; @@ -299,13 +303,13 @@ break; case ENDS_WITH: if ( t.getType() != TYPE.STRING ) - throw new WikittyException("Can't search for contents that 'ends with' on attribute type different of String. " + + throw new WikittyException("Can't search for contents that 'ends with' on attribute type different of String. " + "Attribute " + fqfieldName + " is " + t.getType().name() ); checked = ((String) o).endsWith( (String) value ); break; case STARTS_WITH: if ( t.getType() != TYPE.STRING ) - throw new WikittyException("Can't search for contents that 'starts with' on attribute type different of String. " + + throw new WikittyException("Can't search for contents that 'starts with' on attribute type different of String. " + "Attribute " + fqfieldName + " is " + t.getType().name() ); checked = ((String) o).startsWith( (String) value ); break; @@ -435,4 +439,4 @@ } } -} \ No newline at end of file +} 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 2010-02-05 09:36:36 UTC (rev 377) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2010-02-05 21:58:45 UTC (rev 378) @@ -27,8 +27,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.solr.client.solrj.SolrQuery; @@ -41,14 +41,10 @@ import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; -import org.apache.solr.core.CoreDescriptor; -import org.apache.solr.core.SolrConfig; -import org.apache.solr.core.SolrCore; import org.nuiton.util.FileUtil; import org.sharengo.wikitty.Criteria; import org.sharengo.wikitty.FacetTopic; import org.sharengo.wikitty.FieldType; -import org.sharengo.wikitty.FieldType.TYPE; import org.sharengo.wikitty.PagedResult; import org.sharengo.wikitty.TreeNode; import org.sharengo.wikitty.UpdateResponse; @@ -58,6 +54,7 @@ import org.sharengo.wikitty.WikittyExtensionStorage; import org.sharengo.wikitty.WikittySearchEngine; import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.FieldType.TYPE; import org.sharengo.wikitty.search.Element; import org.sharengo.wikitty.search.Search; @@ -347,6 +344,17 @@ return result; } + public void delete(List<String> idList) throws WikittyException { + try { + for (String id : idList) { + solrServer.deleteById(id); + } + solrServer.commit(); + } catch (Exception e) { + throw new WikittyException(e); + } + } + public UpdateResponse commit(WikittyTransaction transaction, List<Command> wikittyIndexationCommandList) { try {

1 0

r377 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr
by kmorin＠users.nuiton.org 05 Feb '10

05 Feb '10

Author: kmorin Date: 2010-02-05 10:36:36 +0100 (Fri, 05 Feb 2010) New Revision: 377 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-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: - correction in the criteria copy in findAllByCriteria method in WikittyProxy : did not recreate the facets in the copy of the criteria 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 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-05 09:36:36 UTC (rev 377) @@ -255,6 +255,7 @@ public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { + System.out.println("facetField : " + criteria.getFacetField()); PagedResult<String> resultId = getSearchEngine().findAllByCriteria(criteria); PagedResult<Wikitty> result = resultId.cast(getWikittyStorage()); return result; 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 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-05 09:36:36 UTC (rev 377) @@ -204,7 +204,6 @@ */ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - // newInstance only return BusinessEntityWikittyImpl BusinessEntityWikitty sample = (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); @@ -217,6 +216,14 @@ Criteria serviceCriteria = search.criteria(criteria.getName()); serviceCriteria.setFirstIndex(criteria.getFirstIndex()); serviceCriteria.setEndIndex(criteria.getEndIndex()); + List<String> fieldFacets = criteria.getFacetField(); + if(fieldFacets != null) { + serviceCriteria.setFacetField(fieldFacets.toArray(new String[fieldFacets.size()])); + } + List<Criteria> criteriaFacets = criteria.getFacetCriteria(); + if(criteriaFacets != null) { + serviceCriteria.setFacetCriteria(criteriaFacets.toArray(new Criteria[criteriaFacets.size()])); + } PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(serviceCriteria); // we can cast with autoconvert true because we have add restriction 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 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2010-02-05 09:36:36 UTC (rev 377) @@ -384,7 +384,6 @@ public PagedResult<String> findAllByCriteria(Criteria criteria) { try { - // Create query with restriction String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString);

1 0

r376 - in wikengo_core-wikitty: . wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc wikengo_core-wikitty-solr-impl/src/main/resources
by schorlet＠users.nuiton.org 04 Feb '10

04 Feb '10

Author: schorlet Date: 2010-02-04 12:09:30 +0100 (Thu, 04 Feb 2010) New Revision: 376 Modified: wikengo_core-wikitty/changelog.txt 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/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml Log: change dynamicField named "*_s" from type "text_fr" to type "string" add new class constructor: WikittyExtensionStorageJDBC(Properties properties) WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) in order to pass custom jdbc connection properties Modified: wikengo_core-wikitty/changelog.txt =================================================================== --- wikengo_core-wikitty/changelog.txt 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/changelog.txt 2010-02-04 11:09:30 UTC (rev 376) @@ -1,3 +1,12 @@ +1.0.0-alpha-6 +============= + +change dynamicField named "*_s" from type "text_fr" to type "string" +add new class constructor: + WikittyExtensionStorageJDBC(Properties properties) + WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) + in order to pass custom jdbc connection properties + 1.0.0-alpha-5 ============= 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 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-02-04 11:09:30 UTC (rev 376) @@ -17,17 +17,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.*; -import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDRANK; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDTYPE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_ID; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_NAME; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_REQUIRES; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_TAG_VALUES; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.closeConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.getConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.loadProperties; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.sharengo.wikitty.FieldType; +import org.sharengo.wikitty.UpdateResponse; +import org.sharengo.wikitty.WikittyException; +import org.sharengo.wikitty.WikittyExtension; +import org.sharengo.wikitty.WikittyExtensionStorage; +import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.WikittyUtil; + /** * @author morin * @version $Revision$ @@ -86,7 +108,7 @@ /** * Properties file */ - protected Properties conf = loadProperties(); + protected Properties conf; class CommandJDBC implements Command { protected String queries; @@ -108,7 +130,12 @@ protected Map<String, String> lastVersion = null; public WikittyExtensionStorageJDBC() { + this(loadProperties()); + } + + public WikittyExtensionStorageJDBC(Properties properties) { //check if driver ca be loaded + conf = properties; try { Class.forName(conf.getProperty(driver)); } catch (ClassNotFoundException eee) { @@ -122,7 +149,7 @@ Connection con = null; //connect try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); try { statement.execute(conf.getProperty(extAdminCreationQ)); @@ -148,7 +175,7 @@ throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<Command> result = new ArrayList<Command>(extensions.size()); for (WikittyExtension ext : extensions) { @@ -194,7 +221,7 @@ List<Command> extensionStorageCommandList) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); for (Command command : extensionStorageCommandList) { CommandJDBC commandJDBC = (CommandJDBC) command; @@ -218,7 +245,7 @@ public boolean exists(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with teh id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -238,7 +265,7 @@ public List<String> getAllExtensionIds() { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<String> result = new ArrayList<String>(); Statement statement = con.createStatement(); //get all extensions names and versions @@ -263,7 +290,7 @@ public List<WikittyExtension> getAllExtensions(boolean lastVersion) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<WikittyExtension> result = new ArrayList<WikittyExtension>(); Statement statement = con.createStatement(); @@ -312,7 +339,7 @@ lastVersion = new HashMap<String, String>(); Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //get all extensions names and versions ResultSet resultSet = statement.executeQuery( @@ -346,7 +373,7 @@ if (result == null) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //get the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( 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 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2010-02-04 11:09:30 UTC (rev 376) @@ -18,16 +18,15 @@ package org.sharengo.wikitty.jdbc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.IOException; import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * @author morin * @version $Revision$ @@ -113,10 +112,6 @@ static protected String password = "jdbc.con.password"; /** - * Properties file - */ - protected static Properties conf = loadProperties(); - /** * location of default config (in class-path) */ public static final String CONFIG_FILE = "jdbc.properties"; @@ -147,7 +142,7 @@ * @return a new Connection (db transaction) * @throws SQLException if the connection fails */ - public static Connection getConnection() throws SQLException { + public static Connection getConnection(Properties conf) throws SQLException { Connection con = DriverManager.getConnection(conf.getProperty(host), conf.getProperty(userName), conf.getProperty(password)); con.setAutoCommit(false); 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 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-04 11:09:30 UTC (rev 376) @@ -16,18 +16,50 @@ *##%*/ package org.sharengo.wikitty.jdbc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.*; -import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_BOOLEAN_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_DATE_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_DELETION_DATE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_EXTENSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDNAME; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_ID; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_NUMBER_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_TEXT_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.closeConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.getConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.loadProperties; import java.math.BigDecimal; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +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.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.sharengo.wikitty.FieldType; +import org.sharengo.wikitty.UpdateResponse; +import org.sharengo.wikitty.Wikitty; +import org.sharengo.wikitty.WikittyException; +import org.sharengo.wikitty.WikittyExtension; +import org.sharengo.wikitty.WikittyExtensionStorage; +import org.sharengo.wikitty.WikittyStorage; +import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.WikittyUtil; + /** * @author morin * @version $Revision$ @@ -99,7 +131,7 @@ /** * Properties file */ - protected Properties conf = loadProperties(); + protected Properties conf; /** * used to parse list field from hbase data. ex: extension.fieldname[11/15] @@ -134,6 +166,11 @@ protected WikittyExtensionStorage extensionStorage; public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage) { + this(extensionStorage, loadProperties()); + } + + public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) { + this.conf = properties; this.extensionStorage = extensionStorage; //check if driver ca be loaded try { @@ -149,7 +186,7 @@ Connection con = null; //connect try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); try { statement.execute(conf.getProperty(wikittyAdminCreationQ)); @@ -175,7 +212,7 @@ boolean disableAutoVersionIncrement) throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<Command> result = new ArrayList<Command>(wikitties.size()); for (Wikitty wikitty : wikitties) { Statement statement = con.createStatement(); @@ -428,7 +465,7 @@ List<Command> wikittyStorageCommandList) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); UpdateResponse result = new UpdateResponse(); for (Command command : wikittyStorageCommandList) { @@ -462,7 +499,7 @@ public boolean exists(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -482,7 +519,7 @@ public boolean isDeleted(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -510,7 +547,7 @@ String id, String... fqFieldName) throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( @@ -686,10 +723,10 @@ } @Override - public void scanWikitties(Scanner scanner) { + public void scanWikitties(Scanner scanner) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( 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 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2010-02-04 11:09:30 UTC (rev 376) @@ -295,7 +295,7 @@ <copyField source="*_dt" dest="text"/> <dynamicField name="*_i" type="sint" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_s" type="text_fr" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_l" type="slong" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_t" type="text_fr" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="true"/>

1 0

r375 - misctestproject/trunk/src/main/java/org/nuiton/test
by fdesbois＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: fdesbois Date: 2010-02-03 17:57:15 +0100 (Wed, 03 Feb 2010) New Revision: 375 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: return problem Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:50:23 UTC (rev 374) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:57:15 UTC (rev 375) @@ -50,9 +50,9 @@ FactorGroup<Number, Number> factorGroup = new FactorGroup<Number, Number>(); factorGroup.addFactor(factor1); // plus d'erreur - factorGroup.addFactor(factor2); // pas d'erreur mais ca devrait + //factorGroup.addFactor(factor2); // pas d'erreur mais ca devrait - FactorGroup<Number, Number> factors = factorGroup.getFactors(); // ca implique ca :( + List<Factor<? extends Number, ? extends Number>> factors = factorGroup.getFactors(); // ca implique ca :( }

1 0

r374 - misctestproject/trunk/src/main/java/org/nuiton/test
by echatellier＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: echatellier Date: 2010-02-03 17:50:23 +0100 (Wed, 03 Feb 2010) New Revision: 374 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: Update Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:45:28 UTC (rev 373) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:50:23 UTC (rev 374) @@ -28,7 +28,7 @@ class FactorGroup<E, F> extends Factor<E, F> { - Collection<Factor<? extends E, ? extends F>> factors; + List<Factor<? extends E, ? extends F>> factors; public void addFactor(Factor<? extends E, ? extends F> f) { if (factors == null) { @@ -36,6 +36,10 @@ } factors.add(f); } + + public List<Factor<? extends E, ? extends F>> getFactors() { + return factors; + } } public class Generics { @@ -47,6 +51,9 @@ FactorGroup<Number, Number> factorGroup = new FactorGroup<Number, Number>(); factorGroup.addFactor(factor1); // plus d'erreur factorGroup.addFactor(factor2); // pas d'erreur mais ca devrait + + FactorGroup<Number, Number> factors = factorGroup.getFactors(); // ca implique ca :( + } public void testList() {

1 0

r373 - misctestproject/trunk/src/main/java/org/nuiton/test
by fdesbois＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: fdesbois Date: 2010-02-03 17:45:28 +0100 (Wed, 03 Feb 2010) New Revision: 373 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: extends problem Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:38:58 UTC (rev 372) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:45:28 UTC (rev 373) @@ -28,11 +28,11 @@ class FactorGroup<E, F> extends Factor<E, F> { - Collection<Factor<?, ?>> factors; + Collection<Factor<? extends E, ? extends F>> factors; - public void addFactor(Factor<?, ?> f) { + public void addFactor(Factor<? extends E, ? extends F> f) { if (factors == null) { - factors = new ArrayList<Factor<?, ?>>(); + factors = new ArrayList<Factor<? extends E, ? extends F>>(); } factors.add(f); } @@ -42,9 +42,9 @@ public static void main(String args[]) { Factor<Integer, Integer> factor1 = new Factor<Integer, Integer>(); - Factor<String, String> factor2 = new Factor<String, String>(); - - FactorGroup<Number,Number> factorGroup = new FactorGroup<Number, Number>(); + Factor<String, String> factor2 = new Factor<String, String>(); + + FactorGroup<Number, Number> factorGroup = new FactorGroup<Number, Number>(); factorGroup.addFactor(factor1); // plus d'erreur factorGroup.addFactor(factor2); // pas d'erreur mais ca devrait }

1 0

r372 - misctestproject/trunk/src/main/java/org/nuiton/test
by echatellier＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: echatellier Date: 2010-02-03 17:38:58 +0100 (Wed, 03 Feb 2010) New Revision: 372 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: Update Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:35:30 UTC (rev 371) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:38:58 UTC (rev 372) @@ -38,28 +38,15 @@ } } -class FactorGroup2 { - - Collection<Factor<Object, Object>> factors; - - public void addFactor(Factor<Object, Object> f) { - factors.add(f); - } -} - public class Generics { public static void main(String args[]) { Factor<Integer, Integer> factor1 = new Factor<Integer, Integer>(); Factor<String, String> factor2 = new Factor<String, String>(); - FactorGroup<Object,Object> factorGroup = new FactorGroup<Object, Object>(); + FactorGroup<Number,Number> factorGroup = new FactorGroup<Number, Number>(); factorGroup.addFactor(factor1); // plus d'erreur - factorGroup.addFactor(factor2); // plus d'erreur - -// FactorGroup2 factorGroup2 = new FactorGroup2(); -// factorGroup2.addFactor(factor1); // erreur -// factorGroup2.addFactor(factor2); // erreur + factorGroup.addFactor(factor2); // pas d'erreur mais ca devrait } public void testList() {

1 0

r371 - misctestproject/trunk/src/main/java/org/nuiton/test
by fdesbois＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: fdesbois Date: 2010-02-03 17:35:30 +0100 (Wed, 03 Feb 2010) New Revision: 371 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: Resolve compilation problem with generics Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:32:21 UTC (rev 370) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:35:30 UTC (rev 371) @@ -54,8 +54,8 @@ Factor<String, String> factor2 = new Factor<String, String>(); FactorGroup<Object,Object> factorGroup = new FactorGroup<Object, Object>(); - factorGroup.addFactor(factor1); // erreur - factorGroup.addFactor(factor2); // erreur + factorGroup.addFactor(factor1); // plus d'erreur + factorGroup.addFactor(factor2); // plus d'erreur // FactorGroup2 factorGroup2 = new FactorGroup2(); // factorGroup2.addFactor(factor1); // erreur

1 0

r370 - misctestproject/trunk/src/main/java/org/nuiton/test
by fdesbois＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: fdesbois Date: 2010-02-03 17:32:21 +0100 (Wed, 03 Feb 2010) New Revision: 370 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: Resolve compilation problem with generics Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:22:58 UTC (rev 369) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:32:21 UTC (rev 370) @@ -26,14 +26,17 @@ } -/*class FactorGroup<E, F> extends Factor<E, F> { +class FactorGroup<E, F> extends Factor<E, F> { - Collection<Factor<E, F>> factors; + Collection<Factor<?, ?>> factors; - public void addFactor(Factor<E, F> f) { + public void addFactor(Factor<?, ?> f) { + if (factors == null) { + factors = new ArrayList<Factor<?, ?>>(); + } factors.add(f); } -}*/ +} class FactorGroup2 { @@ -50,13 +53,13 @@ Factor<Integer, Integer> factor1 = new Factor<Integer, Integer>(); Factor<String, String> factor2 = new Factor<String, String>(); - //FactorGroup<Object,Object> factorGroup = new FactorGroup<Object, Object>(); - //factorGroup.addFactor(factor1); // erreur - //factorGroup.addFactor(factor2); // erreur + FactorGroup<Object,Object> factorGroup = new FactorGroup<Object, Object>(); + factorGroup.addFactor(factor1); // erreur + factorGroup.addFactor(factor2); // erreur - FactorGroup2 factorGroup2 = new FactorGroup2(); - factorGroup2.addFactor(factor1); // erreur - factorGroup2.addFactor(factor2); // erreur +// FactorGroup2 factorGroup2 = new FactorGroup2(); +// factorGroup2.addFactor(factor1); // erreur +// factorGroup2.addFactor(factor2); // erreur } public void testList() {

1 0

r369 - misctestproject/trunk/src/main/java/org/nuiton/test
by echatellier＠users.nuiton.org 03 Feb '10

03 Feb '10

Author: echatellier Date: 2010-02-03 17:22:58 +0100 (Wed, 03 Feb 2010) New Revision: 369 Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java Log: Simplify example Modified: misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java =================================================================== --- misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:12:48 UTC (rev 368) +++ misctestproject/trunk/src/main/java/org/nuiton/test/Generics.java 2010-02-03 16:22:58 UTC (rev 369) @@ -26,13 +26,22 @@ } -class FactorGroup<E, F> extends Factor<E, F> { +/*class FactorGroup<E, F> extends Factor<E, F> { Collection<Factor<E, F>> factors; public void addFactor(Factor<E, F> f) { factors.add(f); } +}*/ + +class FactorGroup2 { + + Collection<Factor<Object, Object>> factors; + + public void addFactor(Factor<Object, Object> f) { + factors.add(f); + } } public class Generics { @@ -41,9 +50,13 @@ Factor<Integer, Integer> factor1 = new Factor<Integer, Integer>(); Factor<String, String> factor2 = new Factor<String, String>(); - FactorGroup<Object,Object> factorGroup = new FactorGroup<Object, Object>(); - factorGroup.addFactor(factor1); // erreur - factorGroup.addFactor(factor2); // erreur + //FactorGroup<Object,Object> factorGroup = new FactorGroup<Object, Object>(); + //factorGroup.addFactor(factor1); // erreur + //factorGroup.addFactor(factor2); // erreur + + FactorGroup2 factorGroup2 = new FactorGroup2(); + factorGroup2.addFactor(factor1); // erreur + factorGroup2.addFactor(factor2); // erreur } public void testList() {

1 0