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

r783 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org April 11, 2011

April 11, 2011

Author: mfortun Date: 2011-04-11 18:02:52 +0200 (Mon, 11 Apr 2011) New Revision: 783 Url: http://nuiton.org/repositories/revision/wikitty/783 Log: * checkout works basically * store method almost terminated need to be fixed directories need to be create before file. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-11 15:54:11 UTC (rev 782) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-11 16:02:52 UTC (rev 783) @@ -3,7 +3,10 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; +import java.lang.reflect.Array; +import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Properties; @@ -20,7 +23,9 @@ import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.services.WikittyServiceCajoClient; /** @@ -44,6 +49,10 @@ * static string for allias, wrong named attribut TODO mfortun-2011-04-06 * need to set better name */ + + /* + * FIXME mfortun-2011-04-11 need to migrate static value to another class ? + */ static public String WITTY_SERVICE_KEY = "wikitty.service.server.url"; static public String NO_RECURSION_KEY = "norecursion"; static public String DIRECTORY_KEY = "directory"; @@ -263,11 +272,22 @@ + dir.getAbsolutePath() + "Label a checkout " + label + "HessianProtocol=" + hessianProtocole); + if (hessianProtocole) { + applicationConfig.setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.services.WikittyServiceHessianClient"); + } else { + applicationConfig.setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.services.WikittyServiceCajoClient"); + } + WikittyProxy remoteWikittyService = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); WikittyPublicationFileSystem localWikittyService = new WikittyPublicationFileSystem( - dir); + dir, noRecur, label); + + + // Construct the criteria Criteria labelCriteria; Search mainRequest = Search.query(); @@ -290,10 +310,22 @@ .criteria(); } + + // request to the proxy - List<Wikitty> wikittiesToWrite = remoteWikittyService - .findAllByCriteria(labelCriteria).getAll(); - + PagedResult<Wikitty> pageResult= remoteWikittyService.findAllByCriteria(labelCriteria); + + List<Wikitty> wikittiesToWrite = pageResult.getAll(); + + for ( Wikitty w : wikittiesToWrite){ + System.out.println(w); + + } + + + // write the proper properties file! + writeHomePropertyFile(dir); + // write the wikities localWikittyService.store("", wikittiesToWrite, true); @@ -302,28 +334,8 @@ * the appropriate wikittyservice ! */ - // write the proper properties file! - Properties props = new Properties(); - props.put(WITTY_SERVICE_KEY, wikittyService); - if (hessianProtocole) { - props.put("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceHessianClient"); - } else { - props.put("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - // create the properties directory - File wpDirectory = new File(dir.getCanonicalPath() + File.separator - + PROPERTY_DIRECTORY + File.separator); - if (!wpDirectory.exists()) { - wpDirectory.createNewFile(); - } - - File propertiesFiles = new File(wpDirectory.getCanonicalPath() - + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); - - props.store(new FileWriter(propertiesFiles), ""); + + /* * on va commencer par vérifier les arguments ''wp checkout * [--norecursion] [url du WikittyService] [Label à extraire] [directory @@ -710,4 +722,41 @@ } + + static protected void writeHomePropertyFile(File homeDir) throws Exception{ + + + if (homeDir.exists()) { + File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); + String wikittyService = applicationConfig + .getOption(WITTY_SERVICE_KEY); + boolean hessianProtocole = applicationConfig + .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); + + + //TODO mfortun-2011-04-11 find a better way to manage component property + String propertyCompo = applicationConfig + .getOption("wikitty.WikittyService.components"); + // write the proper properties file! + Properties props = new Properties(); + props.put(WITTY_SERVICE_KEY, wikittyService); + + props.put("wikitty.WikittyService.components", propertyCompo); + + // create the properties directory + File wpDirectory = new File(homeDir.getCanonicalPath() + + File.separator + PROPERTY_DIRECTORY + File.separator); + if (!wpDirectory.exists() ) { + wpDirectory.mkdir(); + } + + + File propertiesFiles = new File(wpDirectory.getCanonicalPath() + + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); + + + + props.store(new FileWriter(propertiesFiles), ""); + } + } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java 2011-04-11 15:54:11 UTC (rev 782) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java 2011-04-11 16:02:52 UTC (rev 783) @@ -6,13 +6,18 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileReader; +import java.io.FileWriter; import java.io.InputStreamReader; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Properties; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; +import org.nuiton.util.MD5InputStream; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.entities.Wikitty; @@ -21,8 +26,10 @@ import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.entities.WikittyLabelImpl; +import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubDataImpl; +import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.search.Criteria; @@ -40,6 +47,8 @@ static public String WIKITTYLABEL_SEPARATOR = "."; protected File homeFile; + protected boolean recursion; + protected String label; /** * Constructor with the working directory @@ -47,8 +56,10 @@ * @param home * the home directory */ - public WikittyPublicationFileSystem(File home) { + public WikittyPublicationFileSystem(File home, boolean recur, String label) { this.setHomeFile(home); + this.setRecursion(recur); + this.setLabel(label); } public File getHomeFile() { @@ -59,6 +70,22 @@ this.homeFile = homeFile; } + public boolean isRecursion() { + return recursion; + } + + public void setRecursion(boolean recursion) { + this.recursion = recursion; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + @Override public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { @@ -154,10 +181,139 @@ public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - // StringUtil.encodeMD5(toEncode) + + // FIXME mfortun-2011-04-11 need to create the directory file first + try { - // TODO mfortun-2011-04-05 - throw new UnsupportedOperationException("not yet implemented"); + for (Wikitty w : wikitties) { + + Set<String> set = WikittyLabelHelper.getLabels(w); + String ourDir = ""; + + // search for our label + for (String name : set) { + if (!recursion && name.equalsIgnoreCase(label)) { + ourDir = name; + } else if (recursion && name.startsWith(label)) { + ourDir = name; + } + } + + // create the path with the label + String path = homeFile.getCanonicalFile() + File.separator + + ourDir.replaceAll(".", File.separator); + // create the directory + File directory = new File(path); + if (!directory.exists() || !directory.isDirectory()) { + directory.mkdir(); + } + // create the propertie directory if necessary + File propertieDirectory = new File(path + File.separator + + WikittyPublication.PROPERTY_DIRECTORY); + if (!propertieDirectory.exists() + || !propertieDirectory.isDirectory()) { + propertieDirectory.mkdir(); + } + // load/create meta propertie file + File propertieFile = new File( + propertieDirectory.getCanonicalPath() + + File.separator + + WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + if (!propertieFile.exists()) { + propertieFile.createNewFile(); + } + // load/create id propertie file + File idPropertieFile = new File( + propertieDirectory.getCanonicalPath() + File.separator + + WikittyPublication.WIKITTY_ID_PROPERTIES_FILE); + if (!idPropertieFile.exists()) { + idPropertieFile.createNewFile(); + } + + String name = ""; + String extension = ""; + + File wikittyFile = null; + if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + name = WikittyPubDataHelper.getName(w); + String mime = WikittyPubDataHelper.getMimeType(w); + byte[] content = WikittyPubDataHelper.getContent(w); + + extension = extensionFormimeType(mime); + + wikittyFile = new File(path + File.separator + name + "." + + extension); + + wikittyFile.createNewFile(); + + FileUtil.byteToFile(content, wikittyFile); + + } else if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + name = WikittyPubTextHelper.getName(w); + String mime = WikittyPubTextHelper.getMimeType(w); + String content = WikittyPubTextHelper.getContent(w); + + extension = extensionFormimeType(mime); + + wikittyFile = new File(path + File.separator + name + "." + + extension); + + wikittyFile.createNewFile(); + + FileUtil.writeString(wikittyFile, content); + } + + if (wikittyFile != null) { + // prepare for checksum + BufferedInputStream input = new BufferedInputStream( + new FileInputStream(wikittyFile)); + + byte[] byt = MD5InputStream.hash(input); + + String localMd5 = StringUtil.asHex(byt); + + // load meta properties + Properties metaProperties = new Properties(); + metaProperties.load(new FileReader(propertieFile)); + // update + metaProperties.setProperty(name + "." + extension + + ".version", w.getVersion()); + metaProperties.setProperty(name + "." + extension + ".id", + w.getVersion()); + metaProperties.setProperty(name + "." + extension + + ".checksum", localMd5); + // save + metaProperties.store(new FileWriter(propertieFile), ""); + // load id properties + Properties idProperties = new Properties(); + idProperties.load(new FileReader(idPropertieFile)); + // update + idProperties.setProperty(w.getId(), name + "." + extension); + // save + idProperties.store(new FileWriter(idPropertieFile), ""); + } + } + + /* + * pour chaque wikitty en fonction du type on va aller écrire le + * fichier avec la bonne extention en fonction du mime. + * + * Et niveau propriété : double entré d'id, checksum, version aussi. + * + * + * faire en deux passes, pour mettre les labels et labels courant + * aussi les ranger et tout. + */ + + // StringUtil.encodeMD5(toEncode) + + } catch (Exception e) { + + } + + WikittyEvent result = new WikittyEvent(this); + + return result; // return null; } @@ -246,7 +402,8 @@ } @Override - public List<String> findByCriteria(String securityToken, List<Criteria> criteria) { + public List<String> findByCriteria(String securityToken, + List<Criteria> criteria) { // TODO mfortun-2011-04-05 throw new UnsupportedOperationException("not yet implemented"); // return null; @@ -317,8 +474,7 @@ Wikitty result = new WikittyImpl(); result.addExtension(WikittyLabelImpl.extensionWikittyLabel); - - //creation of the label + // creation of the label /* * TODO mfortun-2011-04-08 find a better way to do this ? */ @@ -338,7 +494,6 @@ WikittyLabelHelper.addLabels(result, label); - // complete with the correct extension with content if (isMimeWikittyPubText(mimeType)) { result.addExtension(WikittyPubTextImpl.extensionWikittyPubText); @@ -366,8 +521,8 @@ */ static public String mimeTypeForExtension(String ext) { /* - * TODO mfortun-2011-04-08 really implements this method - * + * TODO mfortun-2011-04-08 really implements this method create a double + * hashMap for this kind of key/value collection */ if (ext.equalsIgnoreCase("ws")) { return "application/javascript"; @@ -378,6 +533,24 @@ } /** + * Return the extension for a mime type opposite to mimeTypeForExtension + * + * @param ext + * @return + */ + static public String extensionFormimeType(String mime) { + /* + * TODO mfortun-2011-04-11 really implements this method + */ + if (mime.equalsIgnoreCase("ws")) { + return "application/javascript"; + } else { + return "image/png"; + } + + } + + /** * return if the mime type is associate to a wikittypubtext * * @param mime @@ -386,7 +559,6 @@ static public boolean isMimeWikittyPubText(String mime) { /* * TODO mfortun-2011-04-08 really implements this method - * */ if (mime.equalsIgnoreCase("application/javascript")) { return true;

1 0

r782 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test wikitty-publication wikitty-solr-impl
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 17:54:11 +0200 (Mon, 11 Apr 2011) New Revision: 782 Url: http://nuiton.org/repositories/revision/wikitty/782 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> <modules> @@ -373,10 +373,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.5</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.5 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.0.5</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-api/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-dto/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-generators/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-hessian-client/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-hessian-server/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-perf-test/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-publication/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-04-11 15:54:09 UTC (rev 781) +++ trunk/wikitty-solr-impl/pom.xml 2011-04-11 15:54:11 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5</version> + <version>3.1-SNAPSHOT</version> </parent>

1 0

r781 - in tags: . wikitty-3.0.5
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 17:54:09 +0200 (Mon, 11 Apr 2011) New Revision: 781 Url: http://nuiton.org/repositories/revision/wikitty/781 Log: [maven-release-plugin] copy for tag wikitty-3.0.5 Added: tags/wikitty-3.0.5/ Property changes on: tags/wikitty-3.0.5 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r780 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test wikitty-publication wikitty-solr-impl
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 17:54:06 +0200 (Mon, 11 Apr 2011) New Revision: 780 Url: http://nuiton.org/repositories/revision/wikitty/780 Log: [maven-release-plugin] prepare release wikitty-3.0.5 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> <modules> @@ -373,10 +373,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.5</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.5 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.0.5</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-api/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-dto/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-generators/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-hessian-client/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-hessian-server/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-perf-test/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-publication/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-04-11 15:48:19 UTC (rev 779) +++ trunk/wikitty-solr-impl/pom.xml 2011-04-11 15:54:06 UTC (rev 780) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.5-SNAPSHOT</version> + <version>3.0.5</version> </parent>

1 0

r779 - in trunk: src/site/resources/user src/site/rst/user wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/java/org/nuiton/wikitty/search/operators wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/site/resources/images wikitty-api/src/site/rst wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-publication/src/main/java/org/nuiton/wikitty/publication wikitty-solr-impl/src/main/java/org/nuiton/wi
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 17:48:19 +0200 (Mon, 11 Apr 2011) New Revision: 779 Url: http://nuiton.org/repositories/revision/wikitty/779 Log: Fix svn keywords Modified: trunk/src/site/resources/user/wikittyDependency.png trunk/src/site/resources/user/wikittyTree.png trunk/src/site/rst/user/faq.rst trunk/src/site/rst/user/search.rst trunk/src/site/rst/user/security.rst trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/TreeNodeResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/False.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Like.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/True.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Unlike.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceHook.java trunk/wikitty-api/src/site/resources/images/wikitty-diagClass.png trunk/wikitty-api/src/site/rst/dataModel.rst trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java Property changes on: trunk/src/site/resources/user/wikittyDependency.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/wikittyTree.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/user/faq.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/user/search.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/user/security.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/TreeNodeResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/False.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Like.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/True.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Unlike.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceHook.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/site/resources/images/wikitty-diagClass.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/site/rst/dataModel.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r778 - in trunk: . wikitty-hessian-server wikitty-perf-test wikitty-solr-impl
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 17:46:34 +0200 (Mon, 11 Apr 2011) New Revision: 778 Url: http://nuiton.org/repositories/revision/wikitty/778 Log: Fix dependencies Modified: trunk/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 14:11:35 UTC (rev 777) +++ trunk/pom.xml 2011-04-11 15:46:34 UTC (rev 778) @@ -93,6 +93,13 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-04-11 14:11:35 UTC (rev 777) +++ trunk/wikitty-hessian-server/pom.xml 2011-04-11 15:46:34 UTC (rev 778) @@ -48,6 +48,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-04-11 14:11:35 UTC (rev 777) +++ trunk/wikitty-perf-test/pom.xml 2011-04-11 15:46:34 UTC (rev 778) @@ -46,11 +46,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-04-11 14:11:35 UTC (rev 777) +++ trunk/wikitty-solr-impl/pom.xml 2011-04-11 15:46:34 UTC (rev 778) @@ -74,6 +74,11 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId>

1 0

r777 - trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 16:11:35 +0200 (Mon, 11 Apr 2011) New Revision: 777 Url: http://nuiton.org/repositories/revision/wikitty/777 Log: Fix tests Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-11 13:40:25 UTC (rev 776) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-11 14:11:35 UTC (rev 777) @@ -31,14 +31,17 @@ import com.arjuna.ats.internal.jdbc.drivers.modifiers.list; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.util.CollectionUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; @@ -601,8 +604,8 @@ .like("Test.name_s", "cHaIsE", Like.SearchAs.ToLowerCase) .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult < String > result = ws.findAllByCriteria(null, criteria)[0]; - List < String > list = result.getAll(); + PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); + List<String> list = result.getAll(); assertEquals(1, list.size()); Wikitty w = ws.restore(null, list.get(0)); @@ -614,7 +617,7 @@ .unlike("Test.name_s", "cHaIsE", Like.SearchAs.ToLowerCase) .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - result = ws.findAllByCriteria(null, criteria)[0]; + result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); list = result.getAll(); assertEquals(12, list.size()); }

1 0

r776 - trunk/src/site/rst/user
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 15:40:25 +0200 (Mon, 11 Apr 2011) New Revision: 776 Url: http://nuiton.org/repositories/revision/wikitty/776 Log: Add faq and search doc Added: trunk/src/site/rst/user/faq.rst trunk/src/site/rst/user/search.rst Added: trunk/src/site/rst/user/faq.rst =================================================================== --- trunk/src/site/rst/user/faq.rst (rev 0) +++ trunk/src/site/rst/user/faq.rst 2011-04-11 13:40:25 UTC (rev 776) @@ -0,0 +1,41 @@ +========================= +FAQ - Foire aux questions +========================= + +Comment récupérer uniquement les objets que l'utilisateur peut lire ? +===================================================================== + +Dans Wikitty, si vous gérez la sécurité et qu'un utilisateur n'a pas le droit de +lire un objet que vous demandez, null sera retourné. Dans le cas de listes +d'objets, cela peut vite devenir génant de devoir vérifier que l'objet retourné +n'est pas nul. Une manière de contourner ceci est de limiter les résultats de +recherche aux objets que l'utilisateur à le droit de lire. + +Exemple +~~~~~~~ + +Dans cet exemple, le droit de lecture est accordé au privateGroup. On vérifie +donc que l'utilisateur authentifié fait soit partie du privateGroup soit on +restreint les résultats aux objets dont le reader n'est pas le privateGroup:: + + +// Récupère le privateGroup (méthode métier) +WikittyGroup privateGroup = getPrivateGroup(); + +// Récupère l'utilisateur authentifié +WikittyUser user = getLoggedInUser(); + +// Récupère les membres du privateGroup +Set<String> members = privateGroup.getMembers(); + +// Vérifie si l'utilisateur fait partie du privateGroup +if (members != null && user != null && + members.contains(user.getWikittyId())) { + // L'utilisateur fait partie du privateGroup, on ne change rien à la + // requête. +} else { + // L'utilisateur ne fait pas partie du privateGroup, on restreint + // donc les résultats de notre query. + query.neq(WikittyAuthorisation.FQ_FIELD_WIKITTYAUTHORISATION_READER, + privateGroup.getWikittyId()); +} \ No newline at end of file Added: trunk/src/site/rst/user/search.rst =================================================================== --- trunk/src/site/rst/user/search.rst (rev 0) +++ trunk/src/site/rst/user/search.rst 2011-04-11 13:40:25 UTC (rev 776) @@ -0,0 +1,136 @@ +====================== +Recherche avec Wikitty +====================== + +Wikitty permet de rechercher parmis les entités enregistrées tout en fournissant +les fonctionalités de pagination. Pour cela vous pouvez construire +programmatiquement vos recherches en utilisant un système de Criteria. + +Structure d'une requête +----------------------- + +Pour créer une recherche, vous commencez par initier un arbre de contrainte:: + +Search myQuery = Search.query(); + +La racine est un noeud ET. Vous pouvez ensuite rajouter des contraintes ou des +sous-noeuds. + +Par exemple, la requette A ET (B OU C) se représente en arbre :: + +ET +|- A +`- OU + |- B + `- C + +Et de manière programmatique, nous aurons (les contraintes A, B et C sont +représentées par des méthodes similaires. Elle devraient-être remplacées par les +vraies méthodes de contrainte):: + +//Ajout de la contrainte A +myQuery.A(); + +//Ajout du node OU, on le récupère pour lui ajouter des fils +Search orNode = myQuery.or(); + +//Ajout des fils du OU +orNode.B().C(); + +Les contraintes disponibles +--------------------------- + +De nombreuses contraintes sont disponibles pour créer vos recherches : + +* Egalité : eq - Vérifie si un champ est égal a une valeur. + +* Non égalité : neq - Vérifie si un champ n'est pas égal a une valeur. + +* Contient : contains - Vérifie si un champ multivalué contient une valeur. + +* Dans : in - Vérifie si un champ est une valeur + +* Egalité d'extension : exteq - Vérifie si un Wikitty possède une extension + +* Non égalité d'extension : extneq - Vérifie qu'un Wikitty ne porte pas une +extension. + +* Égalité d'extension : ideq - Vérifie qu'un Wikitty porte l'identifiant + +* Non égalité d'identifiant : idneq - Vérifie qu'un Wikitty ne porte pas +l'identifiant. + +* Similitude : like - Vérifie qu'une chaîne de caractère est présente dans un +champ (ex : "pit" est présent dans "chapiteau"). + +* Non similitude : unlike - Vérifie qu'une chaîne de caractère n'est pas +présente dans un champ. + +* Supérieur strictement : gt - Vérifie qu'un champ est strictement supérieur à +une valeur. + +* Supérieur ou égal : ge - Vérifie si un champ est supérieur ou égal à une +valeur. + +* Inférieur strictement : lt - Vérifie si un champ est strictement inférieur à +une valeur. + +* Inférieur ou égal : le - Vérifie si un champ est inférieur ou égal à une +valeur. + +* Entre : bw - Vérifie si un champ est compris entre deux valeurs. + +* Commence par : sw - Vérifie si un champ de type chaîne commence par une valeur. + +* Ne commence pas par : nsw - Vérifie si un champ de type chaîne ne commence pas +par une valeur. + +* Termine par : ew - Vérifie si un champ de type chaîne termine par une valeur. + +* Ne termine pas par : notew - Vérifie si un champs de type chaîne ne termine +pas par une valeur. + +* Mot-clé : keyword - Vérifie si la valeur est présente dans n'importe quel +champ du Wikitty. + +* Nul : isNull - Vérifie si la valeur d'un champ est nulle. + +* Non nul : isNotNull - Vérifie si la valeur d'un champ n'est pas nulle. + +Les noeuds à sous-requête +------------------------- + +Les noeuds à sous requêtes permettent de faire des requêtes complexes. + +Non : not - Résultat inverse de la sous-requête. + +Ou : or - Ou entre les différentes sous-requêtes. + +Et : and - Et entre les différentes sous-requêtes. + +Requête associée : associated - Permet d'effectuer des jointures. + +Les critères +------------ + +Les critères de recherches permettent d'ajouter un ordre ou des facettes,. On +obtient le critère de recherche à partir de la requête en faisant :: + +mySearch.criteria(); + +La recherche +------------ + +On effectue une recherche sur un proxy, en utilisant un criteria. Si on ne +spécifie pas le type d'objet retourné, on obtiendra un Wikitty. Sinon, on +obtiendra le type d'objet demandé. Cela permet de s'abstraire complètement de +Wikitty et ne manipuler que des objets métiers. + +Les résultats +------------- + +Lorsqu'on effectue une recherche, on obtient un PagedResult. En effet, les +résultats étant paginés, on obtient tout ou partie des résultats. +Un PagedResult contient le nombre total de résultats, les résultats de la page +ainsi que le premier index, le nombre de résultats et les facettes si elles ont +été utilisées pour la recherche. \ No newline at end of file

1 0

r775 - in trunk: . wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/java/org/nuiton/wikitty/search/operators wikitty-api/src/main/resources/org/nuiton wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 11, 2011

April 11, 2011

Author: jcouteau Date: 2011-04-11 15:39:40 +0200 (Mon, 11 Apr 2011) New Revision: 775 Url: http://nuiton.org/repositories/revision/wikitty/775 Log: Put back Like and Unlike search Update GWT files Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Like.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Unlike.java Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/RestrictionName.java trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/pom.xml 2011-04-11 13:39:40 UTC (rev 775) @@ -508,7 +508,7 @@  <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> 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 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2011-04-11 13:39:40 UTC (rev 775) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.search; import org.nuiton.wikitty.search.operators.False; +import org.nuiton.wikitty.search.operators.Like; import org.nuiton.wikitty.search.operators.RestrictionName; import org.nuiton.wikitty.search.operators.Restriction; import org.nuiton.wikitty.search.operators.StartsWith; @@ -50,6 +51,7 @@ import java.util.TimeZone; import org.nuiton.wikitty.search.operators.In; import org.nuiton.wikitty.search.operators.True; +import org.nuiton.wikitty.search.operators.Unlike; /** * @author "Nicolas Chapurlat" <nicolas.chapurlat(a)logica.com> @@ -260,6 +262,31 @@ return isNotNull; } + public static Restriction like(Element element, String value, Like.SearchAs searchAs) { + Like like = new Like(); + like.setName(RestrictionName.LIKE); + like.setElement(element); + like.setValue(value); + like.setSearchAs(searchAs); + + return like; + + } + + + + public static Restriction unlike(Element element, String value, Like.SearchAs searchAs) { + Unlike unlike = new Unlike(); + unlike.setName(RestrictionName.UNLIKE); + unlike.setElement(element); + unlike.setValue(value); + unlike.setSearchAs(searchAs); + + return unlike; + + } + + static ThreadLocal<SimpleDateFormat> myFormats = new ThreadLocal<SimpleDateFormat>() { @Override protected SimpleDateFormat initialValue() { 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 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-04-11 13:39:40 UTC (rev 775) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.search; +import org.nuiton.wikitty.search.operators.Like; import org.nuiton.wikitty.search.operators.Restriction; import org.nuiton.wikitty.search.operators.SubSearch; import org.nuiton.wikitty.search.operators.Element; @@ -37,11 +38,11 @@ /** * Helper to create a criteria with a restriction - * + * <p/> * Element : * <extensionName>.<fieldName>[.<fieldType>] : search on an extension and field with specific type (optional) * Criteria.ALL_EXTENSIONS.<fieldName>.<fieldType> : search on all extension and field name with specific type - * + * <p/> * <fieldType> specify search on field as NUMERIC, STRING, WIKITTY, BOOLEAN, DATE. Use Element.ElementType to specify type. */ public class Search { @@ -456,6 +457,44 @@ } /** + * Like. + * + * @param element + * @param value + * @param searchAs + * @return {@code this} + */ + public Search like(String element, String value, Like.SearchAs searchAs) { + restrictions.add(RestrictionHelper.like(elt(element), value, searchAs)); + return this; + } + + public Search like(String element, String value) { + restrictions.add(RestrictionHelper.like( + elt(element), value, Like.SearchAs.AsText)); + return this; + } + + /** + * Unlike. + * + * @param element + * @param value + * @param searchAs + * @return {@code this} + */ + public Search unlike(String element, String value, Like.SearchAs searchAs) { + restrictions.add(RestrictionHelper.unlike(elt(element), value, searchAs)); + return this; + } + + public Search unlike(String element, String value) { + restrictions.add(RestrictionHelper.unlike( + elt(element), value, Like.SearchAs.AsText)); + return this; + } + + /** * Not (sub query). * * @return sub query Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Like.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Like.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Like.java 2011-04-11 13:39:40 UTC (rev 775) @@ -0,0 +1,38 @@ +package org.nuiton.wikitty.search.operators; + +import java.io.Serializable; + +/** + * Like is use on String field type, to precise some particularity on search. + * + * @author ruchaud + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + + +public class Like extends BinaryOperator implements Serializable { + // serialVersionUID is used for serialization. + + private static final long serialVersionUID = 1L; + + + public enum SearchAs {AsText, ToLowerCase}; + + protected SearchAs searchAs; + + + public Like() { + + } + + public SearchAs getSearchAs() { + return searchAs; + } + + public void setSearchAs(SearchAs searchAs) { + this.searchAs = searchAs; + } +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/RestrictionName.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/RestrictionName.java 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/RestrictionName.java 2011-04-11 13:39:40 UTC (rev 775) @@ -33,6 +33,8 @@ public enum RestrictionName { EQUALS, NOT_EQUALS, + LIKE, + UNLIKE, LESS, LESS_OR_EQUAL, GREATER, Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Unlike.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Unlike.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Unlike.java 2011-04-11 13:39:40 UTC (rev 775) @@ -0,0 +1,32 @@ +package org.nuiton.wikitty.search.operators; + +import java.io.Serializable; + +/** + * UnLike is use on String field type, to precise some particularity on search + * (case insensitive for example). + * + * @author martel + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + + +public class Unlike extends BinaryOperator implements Serializable { + + // serialVersionUID is used for serialization. + private static final long serialVersionUID = 1L; + protected Like.SearchAs searchAs; + + public Unlike() { + } + public Like.SearchAs getSearchAs() { + return searchAs; + } + + public void setSearchAs(Like.SearchAs searchAs) { + this.searchAs = searchAs; + } +} Modified: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml =================================================================== --- trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2011-04-11 13:39:40 UTC (rev 775) @@ -29,6 +29,7 @@ <source path="wikitty"> <exclude name="WikittyConfig.java"/> + <exclude name="WikittyServerStart.java"/> <exclude name="*Abstract.java"/> <exclude name="*Impl.java"/> <exclude name="*Helper.java"/> Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-04-11 13:39:40 UTC (rev 775) @@ -35,6 +35,8 @@ import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.search.operators.Like; +import org.nuiton.wikitty.search.operators.Unlike; import org.nuiton.wikitty.services.WikittyTransaction; import org.nuiton.wikitty.search.operators.And; import org.nuiton.wikitty.search.operators.AssociatedRestriction; @@ -99,67 +101,74 @@ throws WikittyException { // ParameterValidator.checkNullParameter(restriction, "restriction"); switch (restriction.getName()) { - case TRUE: - return true2solr(); - case FALSE: - return false2solr(); - case NOT: - Not not = (Not) restriction; - return not2solr(not, solr); - case AND: - And and = (And) restriction; - return and2solr(and, solr); - case OR: - Or or = (Or) restriction; - return or2solr(or, solr); - case EQUALS: - Equals eq = (Equals) restriction; - return eq2solr(eq); - case NOT_EQUALS: - NotEquals neq = (NotEquals) restriction; - return neq2solr(neq); - case LESS: - Less less = (Less) restriction; - return less2solr(less); - case LESS_OR_EQUAL: - LessOrEqual lessEq = (LessOrEqual) restriction; - return lessEq2solr(lessEq); - case GREATER: - Greater great = (Greater) restriction; - return great2solr(great); - case GREATER_OR_EQUAL: - GreaterOrEqual greatEq = (GreaterOrEqual) restriction; - return greatEq2solr(greatEq); - case BETWEEN: - Between between = (Between) restriction; - return between2solr(between); - case CONTAINS: - Contains contains = (Contains) restriction; - return contains2solr(contains); - case IN: - In in = (In) restriction; - return in2solr(in); - case STARTS_WITH: - StartsWith start = (StartsWith) restriction; - return start2solr(start); - case ENDS_WITH: - EndsWith end = (EndsWith) restriction; - return end2solr(end); - case ASSOCIATED: - AssociatedRestriction associated = (AssociatedRestriction) restriction; - return associated2solr(associated, solr); - 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()); + case TRUE: + return true2solr(); + case FALSE: + return false2solr(); + case NOT: + Not not = (Not) restriction; + return not2solr(not, solr); + case AND: + And and = (And) restriction; + return and2solr(and, solr); + case OR: + Or or = (Or) restriction; + return or2solr(or, solr); + case EQUALS: + Equals eq = (Equals) restriction; + return eq2solr(eq); + case NOT_EQUALS: + NotEquals neq = (NotEquals) restriction; + return neq2solr(neq); + case LESS: + Less less = (Less) restriction; + return less2solr(less); + case LESS_OR_EQUAL: + LessOrEqual lessEq = (LessOrEqual) restriction; + return lessEq2solr(lessEq); + case GREATER: + Greater great = (Greater) restriction; + return great2solr(great); + case GREATER_OR_EQUAL: + GreaterOrEqual greatEq = (GreaterOrEqual) restriction; + return greatEq2solr(greatEq); + case BETWEEN: + Between between = (Between) restriction; + return between2solr(between); + case CONTAINS: + Contains contains = (Contains) restriction; + return contains2solr(contains); + case IN: + In in = (In) restriction; + return in2solr(in); + case STARTS_WITH: + StartsWith start = (StartsWith) restriction; + return start2solr(start); + case ENDS_WITH: + EndsWith end = (EndsWith) restriction; + return end2solr(end); + case LIKE: + Like like = (Like) restriction; + return like2solr(like); + case UNLIKE: + Unlike + unlike = (Unlike) restriction; + return unlike2solr(unlike); + case ASSOCIATED: + AssociatedRestriction associated = (AssociatedRestriction) restriction; + return associated2solr(associated, solr); + 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()); } } @@ -400,6 +409,51 @@ return result; } + private String like2solr(Like like) throws WikittyException { + Like.SearchAs searchAs = like.getSearchAs(); + String element2solr = element2solr(like.getElement()); + if (element2solr.endsWith(WikittySolrConstant.SUFFIX_STRING)) { // is string + switch (searchAs) { + case AsText: + element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; + break; + case ToLowerCase: + element2solr += WikittySolrConstant.SUFFIX_STRING_LOWERCASE; + break; + } + } + // Warning if you need add searchAs, AsText and ToLowerCase need search + // at lowercase + String value2solr = value2solr(like.getValue()); + if (!element2solr.endsWith(WikittySolrConstant.SUFFIX_DATE)) { // is not date + value2solr = value2solr.toLowerCase(); + } + return element2solr + ":" + value2solr; + } + + private String unlike2solr(Unlike unlike) throws WikittyException { + Like.SearchAs searchAs = unlike.getSearchAs(); + String element2solr = element2solr(unlike.getElement()); + if (element2solr.endsWith(WikittySolrConstant.SUFFIX_STRING)) { // is string + switch (searchAs) { + case AsText: + element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; + break; + case ToLowerCase: + element2solr += WikittySolrConstant.SUFFIX_STRING_LOWERCASE; + break; + } + } + // Warning if you need add searchAs, AsText and ToLowerCase need search + // at lowercase + String value2solr = value2solr(unlike.getValue()); + if (!element2solr.endsWith(WikittySolrConstant.SUFFIX_DATE)) { // is not date + value2solr = value2solr.toLowerCase(); + } + return "-" + element2solr + ":" + value2solr; + } + + private static String escapeValue(String value) { final String LUCENE_REPLACE_PATTERN = "\\+" + "|-" + "|&&" + "|\\|" + "|!" + "|\$|\$" + "|\\[|\\]" + "|\\{|\\}" + "|\"" + "|:"; Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-11 09:49:21 UTC (rev 774) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-11 13:39:40 UTC (rev 775) @@ -28,6 +28,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import com.arjuna.ats.internal.jdbc.drivers.modifiers.list; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -52,6 +53,7 @@ import org.nuiton.wikitty.search.operators.Element; import org.nuiton.wikitty.search.RestrictionHelper; import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Like; public class SolrSearchTest extends AbstractTestSolr { @@ -436,7 +438,7 @@ // on ignore ce test car le like toLowercase devrait disparaitre et pour l'instant il ne marche pas :( // @Ignore - /*@Test + @Test public void testLikeSearch() throws Exception { Criteria criteria = Search.query().like("Category.name", "hArDwArE").criteria(); PagedResult<String> pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); @@ -460,11 +462,11 @@ criteria = Search.query().like("Test.description", "helped").criteria(); pagedResult = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); assertEquals(1, pagedResult.getNumFound()); - }*/ + } // on ignore ce test car le like toLowercase devrait disparaitre et pour l'instant il ne marche pas :( // @Ignore -/* @Test + @Test public void testLikeStrict() throws Exception { Criteria criteria = Search.query() @@ -487,7 +489,7 @@ result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); list = result.getAll(); assertEquals(5, list.size()); - }*/ + } /** test that doing a search with a date criteria is possible */ @Test @@ -586,10 +588,34 @@ // avec accent specifiquement sur le champs name // mais sans accent pour la recherche // et et majuscule - /*Criteria criteria = Search.query().like( + Criteria criteria = Search.query().like( WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "CECA").criteria(); PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); - Assert.assertEquals(1, result.size());*/ + Assert.assertEquals(1, result.size()); } } + + @Test + public void testSearchNonSensitive() throws Exception { + Criteria criteria = Search.query() + .like("Test.name_s", "cHaIsE", Like.SearchAs.ToLowerCase) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult < String > result = ws.findAllByCriteria(null, criteria)[0]; + List < String > list = result.getAll(); + assertEquals(1, list.size()); + + Wikitty w = ws.restore(null, list.get(0)); + assertEquals("chaise", w.getFieldAsString("Test", "name")); + assertEquals(113311, w.getFieldAsInt("Test", "amount")); + assertEquals(AbstractTestConformance.parse("26/09/2009"), w.getFieldAsDate("Test", "buildDate")); + + criteria = Search.query() + .unlike("Test.name_s", "cHaIsE", Like.SearchAs.ToLowerCase) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + result = ws.findAllByCriteria(null, criteria)[0]; + list = result.getAll(); + assertEquals(12, list.size()); + } }

1 0

r774 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org April 11, 2011

April 11, 2011

Author: echatellier Date: 2011-04-11 11:49:21 +0200 (Mon, 11 Apr 2011) New Revision: 774 Url: http://nuiton.org/repositories/revision/wikitty/774 Log: Fix javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-04-11 08:46:53 UTC (rev 773) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-04-11 09:49:21 UTC (rev 774) @@ -31,6 +31,11 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; +import org.nuiton.wikitty.services.WikittyServiceCached; +import org.nuiton.wikitty.services.WikittyServiceNotifier; +import org.nuiton.wikitty.services.WikittyServiceSecurity; +import org.nuiton.wikitty.services.WikittyServiceStorage; + import java.util.Collection; import java.util.List; import org.nuiton.wikitty.search.TreeNodeResult; @@ -247,7 +252,7 @@ * extension name must be just the name (extName) * * @param securityToken security token - * @param ids extension's ids to remove + * @param extNames extension's names to remove */ public WikittyEvent deleteExtension( String securityToken, Collection<String> extNames);

1 0