Author: mfortun Date: 2011-04-13 09:41:02 +0200 (Wed, 13 Apr 2011) New Revision: 796 Url: http://nuiton.org/repositories/revision/wikitty/796 Log: * remove sub label property, no use finally. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.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-12 16:19:00 UTC (rev 795) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-13 07:41:02 UTC (rev 796) @@ -51,7 +51,6 @@ import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.services.WikittyServiceCajoClient; - /** * Main class of the sync part of wikitty publication, this class is the entry * point for sync operation : import, checkout, commit, delete, relocate and @@ -73,7 +72,7 @@ * 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 ? */ @@ -105,7 +104,6 @@ static public String META_SUFFIX_KEY_ID = "id"; static public String META_CURRENT_LABEL = "current.label"; - static public String META_SUB_LABEL = "sub.label"; /** * @param args @@ -304,15 +302,12 @@ applicationConfig.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceCajoClient"); } - + WikittyProxy remoteWikittyService = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); WikittyPublicationFileSystem localWikittyService = new WikittyPublicationFileSystem( dir, !noRecur, label); - - - // Construct the criteria Criteria labelCriteria; Search mainRequest = Search.query(); @@ -335,18 +330,15 @@ .criteria(); } - - // request to the proxy - PagedResult<Wikitty> pageResult= remoteWikittyService.findAllByCriteria(labelCriteria); - + PagedResult<Wikitty> pageResult = remoteWikittyService + .findAllByCriteria(labelCriteria); + List<Wikitty> wikittiesToWrite = pageResult.getAll(); - - - + // write the proper properties file! writeHomePropertyFile(dir); - + // write the wikities localWikittyService.store("", wikittiesToWrite, true); @@ -355,8 +347,6 @@ * the appropriate wikittyservice ! */ - - /* * on va commencer par vérifier les arguments ''wp checkout * [--norecursion] [url du WikittyService] [Label à extraire] [directory @@ -701,21 +691,6 @@ result.putAll(deleteFile(child)); } } - // remove label from current label list - /* - * TODO mfortun-2011-04-07 it's ugly change this, if we keep the - * property linked - */ - String[] currents = StringUtil.split( - metaProperties.getProperty(META_SUB_LABEL), ","); - ArrayList<String> subLabel = new ArrayList<String>(); - for (String sub : currents) { - if (!sub.endsWith(toDelete.getName())) { - subLabel.add(sub); - } - } - String subLabelResult = StringUtil.join(subLabel, ",", true); - metaProperties.put(META_SUB_LABEL, subLabelResult); } else { @@ -743,19 +718,17 @@ } - - static protected void writeHomePropertyFile(File homeDir) throws Exception{ - - + 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 + + // 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! @@ -767,43 +740,40 @@ // create the properties directory File wpDirectory = new File(homeDir.getCanonicalPath() + File.separator + PROPERTY_DIRECTORY + File.separator); - if (!wpDirectory.exists() ) { + if (!wpDirectory.exists()) { wpDirectory.mkdir(); } - File propertiesFiles = new File(wpDirectory.getCanonicalPath() + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); - - props.store(new FileWriter(propertiesFiles), ""); } } - - + /** - * Method that create a list of the properties directory + * Method that create a list of the properties directory * * @param starts * harvested directory * @param recursivly * @return list of harvested file */ - static public List<File> harvestPropertyDirectory (File starts, boolean recursivly){ - - List<File> result = new ArrayList<File>(); - - for (File child : starts.listFiles()) { - - if (child.isDirectory() && child.getName().equals(PROPERTY_DIRECTORY)) { - result.add(child); - } else if (child.isDirectory() && recursivly){ - result.addAll(harvestPropertyDirectory(child, recursivly)); - } + static public List<File> harvestPropertyDirectory(File starts, + boolean recursivly) { + + List<File> result = new ArrayList<File>(); + + for (File child : starts.listFiles()) { + + if (child.isDirectory() + && child.getName().equals(PROPERTY_DIRECTORY)) { + result.add(child); + } else if (child.isDirectory() && recursivly) { + result.addAll(harvestPropertyDirectory(child, recursivly)); } - return result; - - + } + return result; + } }