Author: mfortun Date: 2011-07-06 16:38:05 +0200 (Wed, 06 Jul 2011) New Revision: 1064 Url: http://nuiton.org/repositories/revision/wikitty/1064 Log: * correct bug inside publication sync Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-06 14:15:34 UTC (rev 1063) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-06 14:38:05 UTC (rev 1064) @@ -1,13 +1,12 @@ package org.nuiton.wikitty.publication.externalize; import java.io.File; - import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; -import org.nuiton.util.FileUtil; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; import org.nuiton.wikitty.search.Search; /** @@ -29,13 +28,15 @@ ApplicationConfig appconfig = new ApplicationConfig(); + + appconfig.parse(args); appconfig .setOption( WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS .getKey(), - "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); + WikittyPublicationFileSystem.class.getName()); File currentFile = new File("."); currentFile = new File(currentFile.getAbsolutePath()).getParentFile(); @@ -59,9 +60,8 @@ WikittyServiceFactory.buildWikittyService(appconfig)); + - - System.out.println(proxy.findAllByCriteria(Search.query().keyword("*").criteria()).size()); @@ -90,5 +90,21 @@ * Une fois tout les wikitty traité on va packager le dossier tempJar en jar * et on va supprimer le dossier tempJar */ + + + + /* + * Format des propriétés: + * + * id.property + * 18114-1811-181-18=/bob/truc/nuiton/Script + * + * metadata + * 18114-1811-181-18.version=1.0 + * 18114-1811-181-18.exention=js + */ + + + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-07-06 14:15:34 UTC (rev 1063) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-07-06 14:38:05 UTC (rev 1064) @@ -450,7 +450,7 @@ result.setOption( WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS .getKey(), - "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); + WikittyPublicationFileSystem.class.getName()); } else if (uri.getScheme().equals("cajo")) { result.setOption( WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-07-06 14:15:34 UTC (rev 1063) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-07-06 14:38:05 UTC (rev 1064) @@ -237,17 +237,22 @@ // the service use to update or commit String uriService = app .getOption(WikittyPublication.WIKITTY_SERVICE_INTERLOCUTEUR); + if (uriService !=null) { log.debug("Writing home property service on:" + propertyWikittyService.getOrigin() + " uri" + uriService); propertyWikittyService.setProperty( WikittyPublication.WIKITTY_SERVICE_INTERLOCUTEUR, uriService); - + } + propertyWikittyService.store(); + recursion = true; + if (app.getOptions().containsKey(WikittyPublication.IS_RECURSION_OPTION)) { + this.recursion = app .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION); - + } // TODO mfotun-2011-04-28 add a support for filtered file with a // property file this.directoryNameBlackList = new ArrayList<String>(); @@ -576,6 +581,7 @@ * restore file as wikitty */ public List<Wikitty> restore(String securityToken, List<String> id) { + List<Wikitty> result = new ArrayList<Wikitty>(); log.info("restore wikitty, number: " + id.size()); try { @@ -591,9 +597,9 @@ // register wikitty in the result for (String wikid : id) { Object value = locations.get(wikid); + if (value != null) { - FileSystemWIkittyId localisation = (FileSystemWIkittyId) value; result.add(this.restore(wikid, localisation)); @@ -604,6 +610,7 @@ e.printStackTrace(); // TODO mfortun-2011-01-12 really handle exception } + return result; } @@ -684,6 +691,8 @@ * @return if the wikitty check the restriction */ public boolean checkRestriction(Restriction restriction, Wikitty w) { + log.debug("Check restriction for : "+ w + " restriction: " + restriction); + if (restriction instanceof BinaryOperator) { BinaryOperator binOp = (BinaryOperator) restriction; @@ -942,6 +951,12 @@ Keyword keyword = (Keyword) restriction; String value = keyword.getValue(); + + //TODO mfortun-2011-07-06 hack to ensure that * is intepreted as + // the real meaning aka any + if (value.equals("*")){ + return true; + } for (String fieldName : w.getAllFieldNames()) { String testedValue = String.valueOf(w.getFqField(fieldName)); @@ -1050,6 +1065,7 @@ @Override public List<PagedResult<String>> findAllByCriteria(String securityToken, List<Criteria> criteria) { + Map<String, Wikitty> wikitties = new HashMap<String, Wikitty>(); try { // construct properly with the working directory and the label @@ -1080,7 +1096,7 @@ // TODO mfortun-2011-04-20 really handle exception e.printStackTrace(); } - + List<PagedResult<String>> result = new ArrayList<PagedResult<String>>(); // for each criteria @@ -1097,8 +1113,6 @@ Wikitty w = entry.getValue(); // if macth - log.debug("Check restriction for wikitty: " + w - + " Restriction:" + restriction); if (checkRestriction(restriction, w)) { @@ -1116,6 +1130,7 @@ } result.add(new PagedResult<String>(firstIndex, ids.size(), restriction.toString(), null, ids)); + } return result; }