February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1205 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs java/fr/cemagref/simexplorer/is/ui/swing/ui resources resources/i18n resources/icons/action resources/jaxx
by tchemit＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: tchemit Date: 2008-02-22 21:25:25 +0000 (Fri, 22 Feb 2008) New Revision: 1205 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties Log: multi-config refactor Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -23,10 +23,8 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfig; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import org.codelutin.i18n.I18n; -import org.codelutin.option.ui.ConfigTableModel; -import org.codelutin.option.ui.ConfigUI; import java.awt.event.ActionEvent; import java.io.IOException; @@ -58,7 +56,7 @@ // init context context = new SimExplorerContext(); - // init i18n + // init i18n with default locale I18n.initISO88591(); // init parser @@ -67,9 +65,13 @@ // init config context.initConfig(); - // save config + // init i18n with user locale + context.initI18n(); + + context.setFirstLaunch(!context.getConfig().getSource().exists()); try { - context.save(); + // save config + context.getConfig().save(); } catch (IOException e) { throw new RuntimeException(e); } @@ -81,7 +83,7 @@ // init ui SimExplorerMainUI mainUI = SimExplorerMainUI.getUI(); - SimExplorerConfig conf = getContext().getConfig(); + SimExplorerAbstractConfigMain conf = getContext().getConfig(); if (conf.isShowLocalTab()) { // show local tab @@ -114,7 +116,6 @@ SimExplorerTab.dispose(); SimExplorerActionManager.dispose(); - ConfigUI.reloadUI(); ErrorDialog.disposeUI(); SimExplorerMainUI.getUI().disposeUI(); if (reload) { @@ -131,8 +132,8 @@ context.getParser().doAllActions(); // show edit config if first launch - if (SimExplorer.context.isFirstLaunch()) { - ConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); + if (context.isFirstLaunch()) { + SimExplorerActionManager.fireAction("config",context); } // launch ui only if required @@ -148,6 +149,9 @@ } } + public void initI18n() { + I18n.initISO88591(getContext().getConfig().getUserLocale()); + } protected SimExplorer() { // protected restricted access } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -21,13 +21,12 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfig; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigRemote; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigLocal; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import org.codelutin.option.ParserException; +import org.codelutin.i18n.I18n; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; import java.io.IOException; /** @@ -39,9 +38,6 @@ */ public class SimExplorerContext { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimExplorerContext.class); - /** * le parseur utilisé au démarrage pour récupérer les options passées * par l'utilisateur. @@ -74,16 +70,28 @@ // enregistrement des actions concretes parser.registerActions(SimExplorerCommonActions.class); // enregistrement des configs concretes - parser.registerConfig(SimExplorerConfig.class); + parser.registerConfig(SimExplorerAbstractConfigMain.class); + parser.registerConfig(SimExplorerAbstractConfigLocal.class); + parser.registerConfig(SimExplorerAbstractConfigRemote.class); } return parser; } /** @return la configuration de l'application */ - public SimExplorerConfig getConfig() { - return (SimExplorerConfig) getParser().getMainConfig(); + public SimExplorerAbstractConfigMain getConfig() { + return getParser().getMainConfig(); } + /** @return la configuration de l'application */ + public SimExplorerAbstractConfigRemote getRemoteConfig() { + return getParser().getRemoteConfig(); + } + + /** @return la configuration de l'application */ + public SimExplorerAbstractConfigLocal getLocalConfig() { + return getParser().getLocalConfig(); + } + /** * @return <code>true</code> si l'utilisateur est connecté, * <code>false</code> sinon. @@ -93,36 +101,6 @@ } /** - * Sauvegarde la configuration courante de l'utilisateur. - * - * @throws IOException si problème lors de l'écriture du fichier de configuration - */ - public void save() throws IOException { - if (getConfig().getSource() == null) { - return; - } - BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getConfig().getSource())); - try { - getConfig().save(out); - } finally { - out.flush(); - out.close(); - } - } - - /** - * Sauvegarde la configuration de l'utilisateur sans soulever d'exception - * si un problème est survenu lors de l'opération. - */ - public void saveSafely() { - try { - save(); - } catch (Exception e) { - log.warn("simexplorer.error.unsafe.save.config" + e.getMessage(), e); - } - } - - /** * @return <code>true</code> si on doit quitter l'application (uniquement utilisé * lors du démarrage de l'application lors de l'exécution des options * utilisateurs) @@ -194,6 +172,12 @@ /** Initialisation de la configuration utilisateur */ void initConfig() { - getConfig().initI18n(); + getConfig(); + getLocalConfig(); + getRemoteConfig(); } + + public void initI18n() { + I18n.initISO88591(getConfig().getUserLocale()); + } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -22,18 +22,11 @@ import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionEditConfig; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionEditConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionHelp; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionResetConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionActionUi; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; import org.codelutin.option.Config; -import org.codelutin.option.ui.ConfigTableModel; -import org.codelutin.option.ui.ConfigUI; import java.io.IOException; import java.io.StringWriter; @@ -103,27 +96,14 @@ } public void run() throws Exception { - SimExplorerAbstractConfigMain conf; - conf = getParser().getMainConfig(); - if (isAll()) { - ConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); - } else if (isTec()) { - ConfigUI.showTechnicalUI(conf); - } else { - ConfigUI.showUI(conf); - } - - StringWriter writer = new StringWriter(); - printConfig(writer, conf); - log.info("required editConfig pour category [" + conf.getCategory() + "]" + writer); + log.info("required editConfig action"); + SimExplorerActionManager.fireAction("config",this); } } public static class ResetConfigAction extends SimExplorerAbstractOptionActionResetConfig { public void run() throws Exception { - //IsisFish.firstLaunch = true; - //IsisFish.resetConfig = true; getContext().getConfig().getConfigFileName().delete(); log.info(_("simexplorer.message.reset.user.configuration")); getContext().setFirstLaunch(true); Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -1,136 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Tony Chemit, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.swing.commandline.configs; - -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfig; -import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfigFile; -import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import org.codelutin.i18n.I18n; -import static org.codelutin.i18n.I18n._; -import org.codelutin.i18n.LocaleEnum; -import org.codelutin.option.ConfigPropertyKey; -import org.codelutin.option.OptionParser; - -import java.io.File; -import java.io.IOException; - -/** - * L'implantation concrete de la config principale - * - * @author chemit - */ -public class SimExplorerConfig extends SimExplorerAbstractConfigMain { - - public SimExplorerConfig() { - super(); - String home = System.getProperty("user.home"); - if (home == null) { - // this is a serious fatal error - throw new SimExplorerRuntimeException("simexplorer.error.user.home"); - } - doInit(); - } - - public void init() throws IOException { - log.info("start for category [" + category + "] -------------------------"); - - SimExplorerOptionParser parser = SimExplorer.getContext().getParser(); - initConfigFile(parser); - log.info("config file : " + getSource()); - // chargement des valeurs par défaut - loadFromDefaultValue(); - // après le chargement des valeurs par défaut - // la configuration n'est pas modifiée - clearModified(); - // surcharge à partir du fichier de configuration de l'utilisateur - loadFromSource(); - // surcharge à partir des propriétés système - loadFromSystem(); - // surcharge à partir des propriétés de la jvm - loadFromJvm(); - // surcharge à partir de l'option config de la ligne de commande - loadFromOptions(parser); - clearModified(); - for (String s : this.toString().split("\n")) { - log.debug(s); - } - log.info("end for category [" + category + "] ---------------------------"); - } - - protected void initConfigFile(OptionParser parser) { - File file; - if (parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY)) { - // surcharge config file - SimExplorerOptionConfigFile option = SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY.getOptions().get(0); - - file = option.getConfigFile(); - } else { - String home = System.getProperty("user.home", ""); - File root = new File(home); - file = new File(root, SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY.getDefaultValue().getName()); - if (!file.exists()) { - SimExplorer.getContext().setFirstLaunch(true); - try { - file.createNewFile(); - } catch (IOException e) { - throw new SimExplorerRuntimeException(e); - } - } - } - if (containsKey(SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY)) { - setProperty(SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY, file); - } - setSource(file); - } - - public void initI18n() { - I18n.initISO88591(getUserLocale()); - } - - protected void loadFromOptions(SimExplorerOptionParser parser) { - if (!parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_OPTION_KEY)) { - return; - } - // surcharge config file - for (SimExplorerOptionConfig option : SimExplorerOptionParser.CONFIG_OPTION_KEY.getOptions()) { - if (getCategory().equals(SimExplorerOptionParser.MAIN_CONFIG_KEY.getCategory())) { - ConfigPropertyKey<?> propKey = getPropertyKey(option.getKey()); - if (propKey == null) { - // fatal error , could not found a matching configuration property - throw new SimExplorerRuntimeException(_("simexplorer.error.unfound.config.property", category, option.getKey())); - } - Object oldVal = propKey.getCurrentValue(); - setProperty(propKey, option.getValue()); - Object newVal = propKey.getCurrentValue(); - log.info(_("simexplorer.change.config.property", category, propKey, oldVal, newVal)); - } - } - } - - /*public void setI18n(LanguageEnum language, CountryEnum country) { - setUserLanguage(language); - setUserCountry(country); - }*/ - - public void setI18n(LocaleEnum locale) { - setUserLocale(locale); - } -} \ No newline at end of file Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -0,0 +1,63 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.ui.swing.commandline.configs; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionKey; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; +import org.codelutin.option.ConfigPropertyKey; +import org.codelutin.option.SimpleConfigImpl; + +import java.io.File; +import java.io.IOException; + +/** + * L'implantation de base des configuration de l'application. + * + * @author chemit + */ +public class SimExplorerConfig extends SimpleConfigImpl<SimExplorerOptionParser, SimExplorerOptionKey<?, ?>> { + + public SimExplorerConfig(String category, String description) { + super(category, description); + } + + protected SimExplorerOptionParser getParser() { + return SimExplorer.getContext().getParser(); + } + + protected SimExplorerOptionKey<?, ?> getConfigOptionKey() { + return SimExplorerOptionParser.CONFIG_OPTION_KEY; + } + + protected SimExplorerOptionKey<?, ?> getConfigFileOptionKey() { + return SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY; + } + + protected ConfigPropertyKey<File> getFileNameConfigKey() { + return SimExplorerAbstractConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY; + } + + @Override + protected void loadFromSource() throws IOException { + super.loadFromSource(); + // we do not deal with inter config properties + clearUnsafeData(); + } +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/ListTabRefreshHelper.java 2008-02-22 21:25:25 UTC (rev 1205) @@ -88,7 +88,7 @@ DataEntityModel item = model.getSelectedItem(); ui.getTablePopupMenu().setEnabled(item != null); int index = model.getSelectedIndex(); - if (item == null || index == -1) { + if (item == null || index == -1 || model.isEmpty()) { return; } MetaData data = model.get(index); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -5,10 +5,10 @@ ### ### common options (TODO should be in commandline project) ### -showConfig.option.definition=--show-config {0,1} [all|tec] -editConfig.option.definition=--edit-config {0,1} [all|tec] +showConfig.option.definition=--show-config {0,1} <main|local|remote> [all|tec] +editConfig.option.definition=--edit-config configFile.option.definition=--config-file <configFile:File> -config.option.definition=--config * <key:String> <value:String> +config.option.definition=--config * [main|local|remote] <key:String> <value:String> help.option.definition=--help|-h resetConfig.option.definition=--resetConfig ui.option.definition=--ui <value:Boolean> @@ -18,6 +18,44 @@ ### ############################################################################### +### Local configuration definition ############################################ +############################################################################### + +local.config.definition.db=java.io.File:/var/local/simexplorer/local-db +local.config.modifiers.db=mandatory + +local.config.definition.optimizePeriod=java.lang.Integer:3600 +local.config.modifiers.optimizePeriod=mandatory + +local.config.definition.data=java.io.File:/var/local/simexplorer/local-data +local.config.modifiers.data=mandatory + +############################################################################### +### Remote configuration definition ########################################### +############################################################################### + +remote.config.definition.login=java.lang.String +remote.config.modifiers.login=mandatory + +remote.config.definition.password=java.lang.String +remote.config.modifiers.password= + +remote.config.definition.URI=java.net.URI:jnp://localhost:1099 +remote.config.modifiers.URI=static,mandatory + +remote.config.definition.useProxy=java.lang.Boolean:False +remote.config.modifiers.useProxy= + +remote.config.definition.useAuthenticationProxy=java.lang.Boolean:False +remote.config.modifiers.useAuthenticationProxy= + +remote.config.definition.proxyLogin=java.lang.String +remote.config.modifiers.proxyLogin= + +remote.config.definition.proxyPassword=java.lang.String +remote.config.modifiers.proxyPassword= + +############################################################################### ### Main configuration definition ############################################# ############################################################################### @@ -27,12 +65,6 @@ main.config.definition.configFileName=java.io.File:.simexplorer-si-1 main.config.modifiers.configFileName=final,mandatory,transient -main.config.definition.baseDirectory=java.io.File:simexplorer-si -main.config.modifiers.baseDirectory=final,mandatory - -main.config.definition.backupDirectory=java.io.File:simexplorer-si-backup -main.config.modifiers.backupDirectory=final,mandatory - main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 main.config.modifiers.version=final,static,mandatory @@ -61,30 +93,6 @@ main.config.modifiers.autoConnect= ### -### Remote service configuration -### -main.config.definition.remoteLogin=java.lang.String -main.config.modifiers.remoteLogin=mandatory - -main.config.definition.remotePassword=java.lang.String -main.config.modifiers.remotePassword= - -main.config.definition.remoteURI=java.net.URI:jnp://localhost:1099 -main.config.modifiers.remoteURI=static,mandatory - -### -### Local service configuration -### -main.config.definition.localDb=java.io.File:/var/local/simexplorer/local-db -main.config.modifiers.localDb=mandatory - -main.config.definition.localOptimizePeriod=java.lang.Integer:3600 -main.config.modifiers.localOptimizePeriod=mandatory - -main.config.definition.localData=java.io.File:/var/local/simexplorer/local-data -main.config.modifiers.localData=mandatory - -### ### user properties ### Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -125,7 +125,6 @@ simexplorer.action.unconnect=Unconnect simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server -simexplorer.change.config.property= simexplorer.choose.applicationexploration=Choose a application's exploration (*.zip) simexplorer.choose.dir=Choose this directory simexplorer.choose.import.label=Import type @@ -144,19 +143,15 @@ simexplorer.common.value=value simexplorer.common.version=version simexplorer.config.i18n.menu=Language +simexplorer.config.local.data.description=Local database data directory +simexplorer.config.local.db.description=Local database directory +simexplorer.config.local.description=Local server configuration +simexplorer.config.local.optimizePeriod.description=Optimize period (Lucene) simexplorer.config.main.autoConnect.description=Flag to auto connect to remote server at init time -simexplorer.config.main.backupDirectory.description=Directory to put all SimExplorer backup files -simexplorer.config.main.baseDirectory.description=Directory of the local databse of SimExplorer simexplorer.config.main.configFileName.description=The path of the configuration file simexplorer.config.main.description=Configuration de l'application SimExplorer SI -simexplorer.config.main.localData.description=Local database data directory -simexplorer.config.main.localDb.description=Local database directory -simexplorer.config.main.localOptimizePeriod.description=Optimize period (Lucene) simexplorer.config.main.localSizor.description=number of result to display by page in local list -simexplorer.config.main.remoteLogin.description=User login to remote server -simexplorer.config.main.remotePassword.description=User password to connect remote server simexplorer.config.main.remoteSizor.description=number of result to display by page in remote list -simexplorer.config.main.remoteURI.description=URI of the remote storage service simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab simexplorer.config.main.siteURL.description=Simexplorer-is site URL @@ -166,6 +161,14 @@ simexplorer.config.main.userMail.description=User email adress simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration +simexplorer.config.remote.URI.description=URI of the remote storage service +simexplorer.config.remote.description=Remote server configuration +simexplorer.config.remote.login.description=User login to remote server +simexplorer.config.remote.password.description=User password to connect remote server +simexplorer.config.remote.proxyLogin.description=login to proxy host +simexplorer.config.remote.proxyPassword.description=password to proxy host +simexplorer.config.remote.useAuthenticationProxy.description=use an anthenticated proxy +simexplorer.config.remote.useProxy.description=use a proxy host toreach remote server simexplorer.confirm.delete=Confirm delete of ''{0}'' simexplorer.entities.applicationExploration=Exploration Application simexplorer.entities.library=Library @@ -173,7 +176,6 @@ simexplorer.error.dialog.title=Error detected\! simexplorer.error.login.failed=Remote authentication failed... simexplorer.error.service.failed=Remote server is not reachable... -simexplorer.error.unfound.config.property= simexplorer.help.menu=Help simexplorer.login.retry=Do you want to retry ? simexplorer.login.title=Authentication to remote server Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -125,7 +125,6 @@ simexplorer.action.unconnect=D\u00E9connexion simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant -simexplorer.change.config.property= simexplorer.choose.applicationexploration=Choisir une exploration d'application (*.zip) simexplorer.choose.dir=Choisir ce r\u00E9pertoire simexplorer.choose.import.label=Type d'\u00E9l\u00E9ment \u00E0 importer @@ -144,19 +143,15 @@ simexplorer.common.value=valeur simexplorer.common.version=version simexplorer.config.i18n.menu=Langue +simexplorer.config.local.data.description=R\u00E9pertoire des donn\u00E9es de la base locale +simexplorer.config.local.db.description=R\u00E9pertoire de la base locale +simexplorer.config.local.description=Configuration du serveur local +simexplorer.config.local.optimizePeriod.description=La p\u00E9riode optimale (Lucene) simexplorer.config.main.autoConnect.description=Se connecter automatiquement au d\u00E9marrage -simexplorer.config.main.backupDirectory.description=le r\u00E9pertoire des sauvegardes -simexplorer.config.main.baseDirectory.description=le r\u00E9pertoire de la base locale simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration simexplorer.config.main.description=La configuration de l'application -simexplorer.config.main.localData.description=R\u00E9pertoire des donn\u00E9es de la base locale -simexplorer.config.main.localDb.description=R\u00E9pertoire de la base locale -simexplorer.config.main.localOptimizePeriod.description=La p\u00E9riode optimale (Lucene) simexplorer.config.main.localSizor.description=Nombre de r\u00E9sultats par page dans la liste locale -simexplorer.config.main.remoteLogin.description=Le login de l'utilisateur au service distant -simexplorer.config.main.remotePassword.description=Le mot de passe utilisateur (non visible) au serveur distant simexplorer.config.main.remoteSizor.description=Nombre de r\u00E9sultats par page dans la liste distante -simexplorer.config.main.remoteURI.description=l'url du service distant simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant simexplorer.config.main.siteURL.description=L'URL du site de Simexplorer-is @@ -166,6 +161,14 @@ simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration +simexplorer.config.remote.URI.description=l'uri du service distant +simexplorer.config.remote.description=Configuration du serveur distant +simexplorer.config.remote.login.description=Le login de l'utilisateur au service distant +simexplorer.config.remote.password.description=Le mot de passe utilisateur (non visible) au serveur distant +simexplorer.config.remote.proxyLogin.description=Login proxy +simexplorer.config.remote.proxyPassword.description=Mot de passe proxy +simexplorer.config.remote.useAuthenticationProxy.description=utilise une authentification sur le proxy +simexplorer.config.remote.useProxy.description=utilise un proxy pour atteindre le serveur distant simexplorer.confirm.delete=Confirmer la suppression de ''{0}'' simexplorer.entities.applicationExploration=Exploration d'application simexplorer.entities.library=Librairie @@ -173,7 +176,6 @@ simexplorer.error.dialog.title=Erreur detect\u00E9e simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... simexplorer.error.service.failed=Le serveur central n'est pas joignable -simexplorer.error.unfound.config.property= simexplorer.help.menu=Aide simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? simexplorer.login.title=Connexion au serveur central Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png (from rev 1190, trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -0,0 +1 @@ +link go-previous.png \ No newline at end of file Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-local.png ___________________________________________________________________ Name: svn:special + * Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png (from rev 1190, trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -0,0 +1 @@ +link go-next.png \ No newline at end of file Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-element-to-remote.png ___________________________________________________________________ Name: svn:special + * Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-local.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -1 +0,0 @@ -link go-previous.png \ No newline at end of file Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/export-to-remote.png 2008-02-22 21:25:25 UTC (rev 1205) @@ -1 +0,0 @@ -link go-next.png \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-22 19:43:28 UTC (rev 1204) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-22 21:25:25 UTC (rev 1205) @@ -71,10 +71,12 @@ action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryNextAction action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryPreviousAction -# import- export actions +# export actions action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction -action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementToLocalAction -action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementToRemoteAction +action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction +action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction + +# import actions action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportElementAction # help actions

1 0

r1204 - in trunk/simexplorer-is: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucen
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 19:43:28 +0000 (Fri, 22 Feb 2008) New Revision: 1204 Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java Log: Efficient security filtering of lists Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManager.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.security.credentials; +import java.util.Collection; import java.util.List; import javax.ejb.Local; @@ -73,5 +74,32 @@ * @return the permissions owned by */ public List<Permission> getPermissionsOwnedBy(User user); + + /** + * Gets the businnes ids of elements visible by user. null means all elements. + * + * @param token the token + * + * @return the elements visible by + */ + public Collection<String> getElementsVisibleBy(String token); + /** + * Gets the user filter. + * + * @param token the token + * + * @return the user filter + */ + public String getUserFilter(String token); + + /** + * Checks if is cache invalid for. + * + * @param userFilter the user filter + * + * @return true, if is cache invalid for + */ + public boolean isCacheValidFor(String userFilter); + } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -17,7 +17,11 @@ * ##% */ package fr.cemagref.simexplorer.is.security.credentials; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.ejb.EJB; import javax.ejb.Local; @@ -48,6 +52,12 @@ @EJB private DaoPermission daoPermission; + /** The Constant elementsVisibleByCache. */ + private static final List<String> usersCached = new ArrayList<String>(); + + /** The Constant elementsVisibleSynchronizer. */ + private final static Object usersCachedSynchronizer = new Object(); + /** * Gets the relative level. * @@ -148,6 +158,9 @@ p.setOwner(true); daoPermission.updatePermission(p); } + synchronized (usersCachedSynchronizer) { + usersCached.clear(); + } } /* (non-Javadoc) @@ -165,6 +178,9 @@ @Override public void setPermissions(String uuid, Permission[] permissions) { daoPermission.setPermissions(uuid, permissions); + synchronized (usersCachedSynchronizer) { + usersCached.clear(); + } } /* (non-Javadoc) @@ -176,4 +192,63 @@ return permissionsOwnedBy; } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.security.credentials.CredentialManager#getElementsVisibleBy(fr.cemagref.simexplorer.is.security.entities.User) + */ + @Override + public Collection<String> getElementsVisibleBy(String token) { + String userFilter = getUserFilter(token); + + List<String> businessIdsVisibleBy = null; + + User user = daoActor.getLoggedUser(token); + if (!user.isSuperAdmin()) { + Set<Actor> actors = new HashSet<Actor>(); + getActors(user, actors); + businessIdsVisibleBy = daoPermission.getBusinessIdsVisibleBy(actors); + } + + synchronized (usersCachedSynchronizer) { + usersCached.add(userFilter); + } + + return businessIdsVisibleBy; + } + + /** + * Gets the actors. + * + * @param actor the actor + * @param actors the actors + */ + private void getActors(Actor actor, Collection<Actor> actors) { + actors.add(actor); + List<Group> groups = actor.getGroups(); + for (Group group : groups) { + getActors(group, actors); + } + actors.addAll(groups); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.security.credentials.CredentialManager#getUserFilter(java.lang.String) + */ + @Override + public String getUserFilter(String token) { + User user = daoActor.getLoggedUser(token); + return user.getId().toString(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.security.credentials.CredentialManager#isCacheInvalidFor(java.lang.String) + */ + @Override + public boolean isCacheValidFor(String userFilter) { + boolean result; + synchronized (usersCachedSynchronizer) { + result = usersCached.contains(userFilter); + } + return result; + } + } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermission.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -17,11 +17,15 @@ * ##% */ package fr.cemagref.simexplorer.is.security.dao; +import java.util.Collection; import java.util.List; import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Permission; +/** + * The Interface DaoPermission. + */ public interface DaoPermission { /** @@ -73,5 +77,14 @@ * @param permissions the permissions */ public void setPermissions(String uuid, Permission[] permissions); + + /** + * Gets the business ids visible by. + * + * @param actors the actors + * + * @return ids visible + */ + public List<String> getBusinessIdsVisibleBy(Collection<Actor> actors); } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.security.dao; +import java.util.Collection; import java.util.List; import javax.ejb.Stateless; @@ -98,4 +99,15 @@ public void updatePermission(Permission p) { em.merge(p); } + + @Override + public List<String> getBusinessIdsVisibleBy(Collection<Actor> actors) { + StringBuffer query = new StringBuffer(); + query.append("select p.businessId from Permission p").append( + " where (p.canRead = true or p.canAdmin = true or p.owner = true)").append( + " and p.actor in (:actors)"); + List<String> businessIds = CollectionUtil.toGenericList(em.createQuery(query.toString()).setParameter("actors", + actors).getResultList(), String.class); + return businessIds; + } } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.storage.engine; import java.io.InputStream; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -30,6 +31,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; import fr.cemagref.simexplorer.is.security.credentials.CredentialManager; import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.storage.SortColumn; @@ -45,7 +47,7 @@ /** The credential manager. */ @EJB private CredentialManager credentialManager; - + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl#deleteElement(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version) */ @@ -80,10 +82,10 @@ @Override public MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, SortColumn column, SortOrder sortOrder) throws SimExplorerException { - MetaData[] list; - list = super.findElementsByType(token, type, onlyLatest, start, count, column, sortOrder); - // TODO how to filter without losing pagination? - return list; + String userFilter = getUserFilter(token); + List<MetaData> elements = database.findElementsByType(type, onlyLatest, start, count, column, sortOrder, + userFilter); + return convertList(elements); } /* (non-Javadoc) @@ -91,8 +93,8 @@ */ @Override public int findElementsByTypeCount(String token, String type, boolean onlyLatest) throws SimExplorerException { - // TODO how to filter without losing pagination? - return super.findElementsByTypeCount(token, type, onlyLatest); + String userFilter = getUserFilter(token); + return database.findElementsByTypeCount(type, onlyLatest, userFilter); } /* (non-Javadoc) @@ -101,8 +103,10 @@ @Override public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, SortColumn column, SortOrder sortOrder) throws SimExplorerException { - // TODO how to filter without losing pagination? - return super.findFullText(token, query, onlyLatest, indexStart, count, column, sortOrder); + String userFilter = getUserFilter(token); + List<MetaData> elements = database.findElementsByContentSearch(query, onlyLatest, indexStart, count, column, + sortOrder, userFilter); + return convertList(elements); } /* (non-Javadoc) @@ -110,10 +114,27 @@ */ @Override public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerException { - // TODO how to filter without losing pagination? - return super.findFullTextCount(token, query, onlyLatest); + String userFilter = getUserFilter(token); + return database.findElementsByContentSearchCount(query, onlyLatest, userFilter); } + /** + * Gets the user filter. + * + * @param token the token + * + * @return the user filter + * + * @throws SimExplorerTechnicalException the sim explorer technical exception + */ + private String getUserFilter(String token) throws SimExplorerTechnicalException { + String userFilter = credentialManager.getUserFilter(token); + if (!credentialManager.isCacheValidFor(userFilter)) { + database.updateFilter(userFilter, credentialManager.getElementsVisibleBy(token)); + } + return userFilter; + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl#getMetadata(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version) */ Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -28,366 +28,10 @@ */ public abstract class BaseEntityFactory<E extends BaseEntity> { - private static XStream xstream = new XStream(); + private static XStream xstream = new XStream(); public static XStream getXstream() { return xstream; } - -// /** The document builder. */ -// private static DocumentBuilder documentBuilder = null; -// -// /** The factories. */ -// private static Map<String, BaseEntityFactory<? extends DataEntity>> factories = new HashMap<String, BaseEntityFactory<? extends DataEntity>>(); -// -// /* -// * Static methods - Retrieve factories, get XML document builder -// */ -// -// /** -// * Retrieve instance of the factory. -// * -// * @param <E> Entity type -// * -// * @param entityClass Class wanted -// * -// * @return Factory -// * -// * @throws SimExplorerException the exception -// */ -// @SuppressWarnings("unchecked") -// public static <E extends DataEntity> BaseEntityFactory<E> getFactory(Class entityClass) throws SimExplorerException { -// BaseEntityFactory<E> result = (BaseEntityFactory<E>) factories.get(entityClass.getSimpleName()); -// if (result == null) { -// String elementFactoryClassName = BaseEntityFactory.class.getPackage().getName() + "." -// + entityClass.getSimpleName() + FACTORY_SUFFIX; -// -// Class<? extends BaseEntityFactory<E>> factoryClass; -// try { -// factoryClass = (Class<? extends BaseEntityFactory<E>>) Class.forName(elementFactoryClassName) -// .asSubclass(BaseEntityFactory.class); -// result = factoryClass.newInstance(); -// } catch (Exception e) { -// throw new SimExplorerTechnicalException(e); -// } -// -// factories.put(entityClass.getSimpleName(), result); -// } -// return result; -// } -// -// /** -// * Retrieve a factory with class name. -// * -// * @param entityClassName the entity class name -// * -// * @return the factory -// * -// * @throws SimExplorerException the exception -// */ -// public static BaseEntityFactory<? extends DataEntity> getFactory(String entityClassName) -// throws SimExplorerException { -// Class<? extends DataEntity> entityClass; -// try { -// entityClass = Class.forName(entityClassName).asSubclass(DataEntity.class); -// } catch (ClassNotFoundException e) { -// throw new SimExplorerTechnicalException(e); -// } -// return getFactory(entityClass); -// } -// -// /** -// * Retrieve an instance of document builder. -// * -// * @return XML document builder -// * @throws ParserConfigurationException -// * -// */ -// public static synchronized DocumentBuilder getXMLBuilder() throws ParserConfigurationException { -// if (documentBuilder == null) { -// DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); -// documentBuilder = factory.newDocumentBuilder(); -// return documentBuilder; -// } -// return documentBuilder; -// } -// -// /* -// * Entity methods - Instanciate, load and save to XML/streams -// */ -// -// /** -// * Instanciate an element. -// * -// * @return Element -// */ -// public abstract E createInstance(); -// -// /** -// * Load an element from an XML node. -// * -// * @param xmlElement the xml element -// * -// * @return the E -// * -// * @throws SimExplorerException the exception -// */ -// public E loadElement(Element xmlElement) throws SimExplorerException { -// E element = createInstance(); -// return element; -// } -// -// /** -// * Load an element from a XML stream. -// * -// * @param stream the stream -// * -// * @return the E -// * -// * @throws SimExplorerException the exception -// */ -// public E loadElement(InputStream stream) throws SimExplorerException { -// Element rootElement; -// try { -// Document document = getXMLBuilder().parse(stream); -// rootElement = (Element) document.getFirstChild(); -// } catch (Exception e) { -// throw new SimExplorerTechnicalException(e); -// } -// E element = loadElement(rootElement); -// return element; -// } -// -// /** -// * Save an element to a XML node. -// * -// * @param document XML document -// * @param xmlElement XML node storing the element (not null) -// * @param element Element to save -// * -// * @throws SimExplorerException the exception -// */ -// public abstract void saveElement(Document document, Element xmlElement, E element) throws SimExplorerException; -// -// /** -// * Save an element to a XML stream. -// * -// * @param rootNodeName the root node name -// * @param element the element -// * -// * @return the input stream -// * -// * @throws SimExplorerException the exception -// */ -// public InputStream saveElement(String rootNodeName, E element) throws SimExplorerException { -// Document xmlDocument; -// Element rootNode; -// try { -// xmlDocument = getXMLBuilder().newDocument(); -// // DOM properties -// xmlDocument.setXmlVersion("1.0"); -// xmlDocument.setXmlStandalone(true); -// // DOM tree -// rootNode = xmlDocument.createElement(rootNodeName); -// } catch (Exception e) { -// throw new SimExplorerTechnicalException(e); -// } -// saveElement(xmlDocument, rootNode, element); -// try { -// xmlDocument.appendChild(rootNode); -// DOMSource domSource = new DOMSource(xmlDocument); -// -// PipedOutputStream os = new PipedOutputStream(); -// PipedInputStream is = new PipedInputStream(os); -// -// XMLStreamEncoder xse = new XMLStreamEncoder(domSource, os); -// xse.start(); -// -// return is; -// } catch (Exception e) { -// throw new SimExplorerTechnicalException(e); -// } -// } -// -// /* -// * Collection methods : Help load/save of inner collections -// */ -// -// /** -// * Load a collection inside a node. -// * -// * @param <T> Entity type -// * -// * @param tagSetName Tag of the node of the collection -// * @param tagName Tag of the node containing an item -// * @param clazz Class type -// * @param xmlElement Node containing the collection -// * @param parentData Element holding the collection -// * -// * @return the set< t> -// * -// * @throws SimExplorerException the exception -// */ -// public <T extends DataEntity> List<T> loadCollection(String tagSetName, String tagName, Class<T> clazz, -// Element xmlElement, DataEntity parentData) throws SimExplorerException { -// List<T> entities = new ArrayList<T>(); -// -// // Retrieve XML node containing the collection -// Element xmlCollection = getXMLElementByTagName(xmlElement, tagSetName); -// if (xmlCollection != null) { -// // Retrieve element factory -// BaseEntityFactory<T> elementFactory = getFactory(clazz); -// -// // Retrieve all XML elements -// List<Element> list = getXMLElementsByTagName(xmlCollection, tagName); -// for (Element element : list) { -// // Convert the XML node to entity -// T entity = elementFactory.loadElement(element); -// entity.setParentData(parentData); -// entities.add(entity); -// } -// } -// -// return entities; -// } -// -// /** -// * Save a collection of elements to XML node. -// * -// * @param <T> Entity type -// * -// * @param entities the entities -// * @param tagSetName the tag set name -// * @param tagName the tag name -// * @param clazz the clazz -// * @param document the document -// * @param xmlElement the xml element -// * -// * @throws SimExplorerException the exception -// */ -// public <T extends DataEntity> void saveCollection(List<T> entities, String tagSetName, String tagName, -// Class<T> clazz, Document document, Element xmlElement) throws SimExplorerException { -// if (entities != null && entities.size() > 0) { -// Element xmlCollection = document.createElement(tagSetName); -// BaseEntityFactory<T> elementFactory = getFactory(clazz); -// for (T entity : entities) { -// Element childElement = document.createElement(tagName); -// elementFactory.saveElement(document, childElement, entity); -// xmlCollection.appendChild(childElement); -// } -// xmlElement.appendChild(xmlCollection); -// } -// } -// -// /** -// * Save an element as a XML stream. -// * -// * @param node the node -// * -// * @return the input stream -// * -// * @throws SimExplorerException the exception -// */ -// public static InputStream serializeElement(Node node) throws SimExplorerException { -// try { -// Document xmlDocument = getXMLBuilder().newDocument(); -// // DOM properties -// xmlDocument.setXmlVersion("1.0"); -// xmlDocument.setXmlStandalone(true); -// // DOM tree -// xmlDocument.appendChild(xmlDocument.importNode(node, true)); -// DOMSource domSource = new DOMSource(xmlDocument); -// -// PipedOutputStream os = new PipedOutputStream(); -// PipedInputStream is = new PipedInputStream(os); -// -// XMLStreamEncoder xse = new XMLStreamEncoder(domSource, os); -// xse.start(); -// -// return is; -// } catch (Exception e) { -// throw new SimExplorerTechnicalException(e); -// } -// } -// -// /* -// * XML methods : set, get properties -// */ -// -// /** -// * Set a property in XML. -// * -// * @param document XML document -// * @param xmlElement Node to modify -// * @param tagName Tag of created node -// * @param value Value of node -// */ -// protected void setXMLProperty(Document document, Element xmlElement, String tagName, Object value) { -// if (value != null) { -// Element xmlProperty = document.createElement(tagName); -// Text xmlDescriptionText = document.createTextNode(value.toString()); -// xmlProperty.appendChild(xmlDescriptionText); -// xmlElement.appendChild(xmlProperty); -// } -// } -// -// /** -// * Get a property in XML. -// * -// * @param xmlElement Source node -// * @param tagName Tag name of property -// * -// * @return Property value -// */ -// public String getXMLProperty(Element xmlElement, String tagName) { -// Element element = getXMLElementByTagName(xmlElement, tagName); -// if (element != null) { -// return element.getFirstChild().getNodeValue(); -// } -// return null; -// } -// -// /* -// * XML methods : retrieve nodes -// */ -// -// /** -// * Retrieve XML element just under with specified tag name. -// * -// * @param xmlElement the xml element -// * @param tagName the tag name -// * -// * @return First child element with tagName -// */ -// public Element getXMLElementByTagName(Element xmlElement, String tagName) { -// List<Element> elements = getXMLElementsByTagName(xmlElement, tagName); -// if (elements.size() > 0) { -// return elements.iterator().next(); -// } -// return null; -// } -// -// /** -// * Retrieve all XML elements just under with specified tag name. -// * -// * @param xmlElement the xml element -// * @param tagName the tag name -// * -// * @return Children with tagName -// */ -// public List<Element> getXMLElementsByTagName(Element xmlElement, String tagName) { -// List<Element> elements = new ArrayList<Element>(); -// -// NodeList nodes = xmlElement.getChildNodes(); -// for (int i = 0; i < nodes.getLength(); i++) { -// Node node = nodes.item(i); -// if (node instanceof Element && tagName.equals(((Element) node).getTagName())) { -// elements.add((Element) node); -// } -// } -// return elements; -// } - - } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.storage.database; import java.io.Reader; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +26,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.storage.SortOrder; @@ -165,20 +167,6 @@ * Empty list if no element. * * @param properties Matching properties needed - * - * @return Element list - * - * @throws SimExplorerException the sim explorer storage exception - */ - public List<MetaData> findElementsByProperties(Map<String, String> properties) throws SimExplorerException { - return findElementsByProperties(properties, 0, -1, SortColumn.None, SortOrder.Ascending); - } - - /** - * Retrieve elements with specific properties<br> - * Empty list if no element. - * - * @param properties Matching properties needed * @param start Index of first element returned * @param count Number of elements to return * @param sortOrder the order @@ -189,7 +177,7 @@ * @throws SimExplorerException the sim explorer storage exception */ public abstract List<MetaData> findElementsByProperties(Map<String, String> properties, int start, int count, - SortColumn column, SortOrder sortOrder) throws SimExplorerException; + SortColumn column, SortOrder sortOrder, String userFilter) throws SimExplorerException; /** * Retrieve element count specific properties. @@ -200,7 +188,8 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract int findElementsByPropertiesCount(Map<String, String> properties) throws SimExplorerException; + public abstract int findElementsByPropertiesCount(Map<String, String> properties, String userFilter) + throws SimExplorerException; /** * Prepare properties for query. @@ -235,21 +224,56 @@ */ public List<MetaData> findElementsByType(String type, boolean onlyLatest, int start, int count, SortColumn column, SortOrder sortOrder) throws SimExplorerException { - return findElementsByProperties(getPropertiesByType(type, onlyLatest), start, count, column, sortOrder); + return findElementsByType(type, onlyLatest, start, count, column, sortOrder, null); } /** + * Find elements by type. + * + * @param type the type + * @param onlyLatest the only latest + * @param start the start + * @param count the count + * @param column the column + * @param sortOrder the sort order + * @param elementsVisible the elements visible + * + * @return the list< meta data> + * + * @throws SimExplorerException the sim explorer exception + */ + public List<MetaData> findElementsByType(String type, boolean onlyLatest, int start, int count, SortColumn column, + SortOrder sortOrder, String user) throws SimExplorerException { + return findElementsByProperties(getPropertiesByType(type, onlyLatest), start, count, column, sortOrder, user); + } + + /** * Number of elements of the type. * * @param type Type wanted * @param onlyLatest Only latest elements + * @param userFilter the user filter * * @return Number of elements * * @throws SimExplorerException the sim explorer storage exception */ + public int findElementsByTypeCount(String type, boolean onlyLatest, String userFilter) throws SimExplorerException { + return findElementsByPropertiesCount(getPropertiesByType(type, onlyLatest), userFilter); + } + + /** + * Find elements by type count. + * + * @param type the type + * @param onlyLatest the only latest + * + * @return the int + * + * @throws SimExplorerException the sim explorer exception + */ public int findElementsByTypeCount(String type, boolean onlyLatest) throws SimExplorerException { - return findElementsByPropertiesCount(getPropertiesByType(type, onlyLatest)); + return findElementsByPropertiesCount(getPropertiesByType(type, onlyLatest), null); } /** @@ -268,9 +292,28 @@ * @throws SimExplorerException the sim explorer storage exception */ public abstract List<MetaData> findElementsByContentSearch(String queryText, boolean onlyLatest, int start, - int count, SortColumn column, SortOrder sortOrder) throws SimExplorerException; + int count, SortColumn column, SortOrder sortOrder, String userFilter) throws SimExplorerException; /** + * Find elements by content search. + * + * @param queryText the query text + * @param onlyLatest the only latest + * @param start the start + * @param count the count + * @param column the column + * @param sortOrder the sort order + * + * @return the list< meta data> + * + * @throws SimExplorerException the sim explorer exception + */ + public List<MetaData> findElementsByContentSearch(String queryText, boolean onlyLatest, int start, int count, + SortColumn column, SortOrder sortOrder) throws SimExplorerException { + return findElementsByContentSearch(queryText, onlyLatest, start, count, column, sortOrder, null); + } + + /** * Retrieve element count with specific content. * * @param queryText Searched text @@ -280,9 +323,32 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract int findElementsByContentSearchCount(String queryText, boolean onlyLatest) + public abstract int findElementsByContentSearchCount(String queryText, boolean onlyLatest, String userFilter) throws SimExplorerException; + /** + * Find elements by content search count. + * + * @param queryText the query text + * @param onlyLatest the only latest + * + * @return the int + * + * @throws SimExplorerException the sim explorer exception + */ + public int findElementsByContentSearchCount(String queryText, boolean onlyLatest) throws SimExplorerException { + return findElementsByContentSearchCount(queryText, onlyLatest, null); + } + + /** + * Update filter. + * + * @param userFilter the user filter + * @param visibleItems the visible items + * @throws SimExplorerTechnicalException + */ + public abstract void updateFilter(String userFilter, Collection<String> visibleItems) throws SimExplorerTechnicalException; + // Delete /** Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetFilter.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -0,0 +1,52 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.storage.database.lucene; + +import java.io.IOException; +import java.util.BitSet; + +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.search.Filter; + +/** + * The Class BitSetFilter. + */ +public class BitSetFilter extends Filter { + + /** The bit set. */ + private BitSet bitSet; + + /* (non-Javadoc) + * @see org.apache.lucene.search.Filter#bits(org.apache.lucene.index.IndexReader) + */ + @Override + public BitSet bits(IndexReader reader) throws IOException { + return bitSet; + } + + /** + * Instantiates a new bit set filter. + * + * @param bitSet the bit set + */ + public BitSetFilter(BitSet bitSet) { + super(); + this.bitSet = bitSet; + } + +} Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/BitSetHitCollector.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -0,0 +1,49 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.storage.database.lucene; + +import java.util.BitSet; + +import org.apache.lucene.search.HitCollector; + +/** + * The Class BitSetHitCollector. + */ +public class BitSetHitCollector extends HitCollector { + + /** The bits. */ + private BitSet bits = new BitSet(); + + /* (non-Javadoc) + * @see org.apache.lucene.search.HitCollector#collect(int, float) + */ + @Override + public void collect(int doc, float score) { + bits.set(doc); + } + + /** + * Gets the bits. + * + * @return the bits + */ + public BitSet getBits() { + return bits; + } + +} Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -21,6 +21,8 @@ import java.io.IOException; import java.io.Reader; import java.util.ArrayList; +import java.util.BitSet; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -41,6 +43,8 @@ import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.Filter; +import org.apache.lucene.search.HitCollector; import org.apache.lucene.search.Hits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -72,6 +76,9 @@ /** The Constant log. */ private static final Log log = LogFactory.getLog(LuceneDatabase.class); + /** The Constant filters. */ + private static final Map<String, Filter> filters = new HashMap<String, Filter>(); + /** DB folder. */ private String dbFolder; @@ -102,6 +109,12 @@ /** The Constant writerSynchronizer. */ private final static Object writerSynchronizer = new Object(); + /** The Constant writerSynchronizer. */ + private final static Object filterSynchronizer = new Object(); + + /** + * Instantiates a new lucene database. + */ public LuceneDatabase() { Properties config = Config.getProperties(); this.dbFolder = String.valueOf(config.getProperty(Config.DB_FOLDER_PROPERTY)); @@ -109,6 +122,9 @@ log.info(this); } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ @Override public String toString() { return super.toString() + "<dbFolder:" + dbFolder + ", optimizePeriod:" + optimizePeriod + ">"; @@ -175,6 +191,130 @@ } } + /** + * Filter search. + * + * @param searcher the searcher + * @param query the query + * @param userFilter the user filter + * + * @return the hits + * + * @throws IOException Signals that an I/O exception has occurred. + */ + private Hits filterSearch(Searcher searcher, Query query, String userFilter) throws IOException { + return filterSearch(searcher, query, userFilter, null); + } + + /** + * Filter search. + * + * @param searcher the searcher + * @param query the query + * @param userFilter the user filter + * @param sorting the sorting + * + * @return the hits + * + * @throws IOException Signals that an I/O exception has occurred. + */ + private Hits filterSearch(Searcher searcher, Query query, String userFilter, Sort sorting) throws IOException { + Hits result = null; + Filter filter = null; + if (userFilter != null) { + synchronized (filterSynchronizer) { + filter = filters.get(userFilter); + } + } + + if (filter == null) { + if (sorting == null) { + result = searcher.search(query); + } else { + result = searcher.search(query, sorting); + } + } else { + synchronized (filter) { + if (sorting == null) { + result = searcher.search(query, filter); + } else { + result = searcher.search(query, filter, sorting); + } + } + } + return result; + } + + /** + * Creates the bit set. + * + * @param visibleItems the visible items + * + * @return the bit set + * + * @throws SimExplorerTechnicalException the sim explorer technical exception + */ + private BitSet createBitSet(Collection<String> visibleItems) throws SimExplorerTechnicalException { + BooleanQuery query = new BooleanQuery(); + for (String string : visibleItems) { + query.add(new TermQuery(new Term(KEY_UUID, string)), BooleanClause.Occur.SHOULD); + } + + BitSetHitCollector bitSetHitCollector = new BitSetHitCollector(); + try { + // Get current searcher instance + Searcher searcher = getSearcher(); + try { + searcher.search(query, bitSetHitCollector); + } finally { + // Release searcher instance + releaseSearcher(searcher); + } + } catch (Exception e) { + throw new SimExplorerTechnicalException(e); + } + + return bitSetHitCollector.getBits(); + } + + /** + * Creates the filter. + * + * @param visibleItems the visible items + * + * @return the filter + * + * @throws SimExplorerTechnicalException the sim explorer technical exception + */ + private Filter createFilter(Collection<String> visibleItems) throws SimExplorerTechnicalException { + List<BitSet> bitSets = new ArrayList<BitSet>(); + + int maxTerms = BooleanQuery.getMaxClauseCount(); + int i = 0; + + Collection<String> currentList = new ArrayList<String>(); + for (String uuid : visibleItems) { + currentList.add(uuid); + if (i == maxTerms) { + bitSets.add(createBitSet(currentList)); + currentList.clear(); + i = 0; + } else { + i++; + } + } + if (visibleItems.size() > 0 && i != 0) { + bitSets.add(createBitSet(currentList)); + } + + BitSet finalBitSet = new BitSet(); + for (BitSet bitSet : bitSets) { + finalBitSet.or(bitSet); + } + Filter result = new BitSetFilter(finalBitSet); + return result; + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.database.Database#open(boolean) */ @@ -350,7 +490,7 @@ // Search elements Hits hits; - hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); + hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending, null); return hits; } @@ -369,7 +509,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); + Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending, null); // Add all versions to a list versions = new ArrayList<Version>(); @@ -408,7 +548,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); + Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending, null); result = convertHitsToElements(hits, 0, -1); } finally { // Release searcher instance @@ -428,14 +568,15 @@ * @see fr.cemagref.simexplorer.is.storage.database.Database#findElementsByPropertiesCount(java.util.Map) */ @Override - public int findElementsByPropertiesCount(Map<String, String> properties) throws SimExplorerException { + public int findElementsByPropertiesCount(Map<String, String> properties, String userFilter) + throws SimExplorerException { int result = 0; try { // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); + Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending, userFilter); result = hits.length(); } finally { // Release searcher instance @@ -454,14 +595,14 @@ */ @Override public List<MetaData> findElementsByProperties(Map<String, String> properties, int start, int count, - SortColumn column, SortOrder sortOrder) throws SimExplorerException { + SortColumn column, SortOrder sortOrder, String userFilter) throws SimExplorerException { List<MetaData> result = null; try { // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, column, sortOrder); + Hits hits = findHits(properties, searcher, column, sortOrder, userFilter); result = convertHitsToElements(hits, start, count); } finally { // Release searcher instance @@ -481,7 +622,8 @@ * @see fr.cemagref.simexplorer.is.storage.database.Database#findElementsByContentSearchCount(java.lang.String, boolean) */ @Override - public int findElementsByContentSearchCount(String queryText, boolean onlyLatest) throws SimExplorerException { + public int findElementsByContentSearchCount(String queryText, boolean onlyLatest, String userFilter) + throws SimExplorerException { Query query; try { query = getQueryByContentSearch(queryText, onlyLatest); @@ -496,7 +638,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - hits = searcher.search(query); + hits = filterSearch(searcher, query, userFilter); // Return hits length result = hits.length(); } finally { @@ -510,39 +652,12 @@ return result; } - /** - * Retrieve a Lucene Sort for date sorting. - * - * @param column the column - * @param sortOrder the sort order - * - * @return null if no sort - */ - private Sort getSortDate(SortColumn column, SortOrder sortOrder) { - Sort sort; - if (column != SortColumn.None) { - SortField[] fields = new SortField[3]; - fields[1] = SortField.FIELD_SCORE; - fields[2] = SortField.FIELD_DOC; - - if (sortOrder == SortOrder.Ascending) { - fields[0] = new SortField(column.getColumn(), column.getType(), true); - } else { - fields[0] = new SortField(column.getColumn(), column.getType(), false); - } - sort = new Sort(fields); - } else { - sort = Sort.INDEXORDER; - } - return sort; - } - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.database.Database#findElementsByContentSearch(java.lang.String, boolean, int, int, int) */ @Override public List<MetaData> findElementsByContentSearch(String queryText, boolean onlyLatest, int start, int count, - SortColumn column, SortOrder sortOrder) throws SimExplorerException { + SortColumn column, SortOrder sortOrder, String userFilter) throws SimExplorerException { Query query; try { query = getQueryByContentSearch(queryText, onlyLatest); @@ -557,7 +672,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - hits = searcher.search(query, getSortDate(column, sortOrder)); + hits = filterSearch(searcher, query, userFilter, getSortDate(column, sortOrder)); // Convert hits to elements result = convertHitsToElements(hits, start, count); } finally { @@ -574,6 +689,33 @@ } /** + * Retrieve a Lucene Sort for date sorting. + * + * @param column the column + * @param sortOrder the sort order + * + * @return null if no sort + */ + private Sort getSortDate(SortColumn column, SortOrder sortOrder) { + Sort sort; + if (column != SortColumn.None) { + SortField[] fields = new SortField[3]; + fields[1] = SortField.FIELD_SCORE; + fields[2] = SortField.FIELD_DOC; + + if (sortOrder == SortOrder.Ascending) { + fields[0] = new SortField(column.getColumn(), column.getType(), true); + } else { + fields[0] = new SortField(column.getColumn(), column.getType(), false); + } + sort = new Sort(fields); + } else { + sort = Sort.INDEXORDER; + } + return sort; + } + + /** * Retrieve a Lucene Query for a full text search. * * @param queryText String to match @@ -631,13 +773,14 @@ * @param searcher the searcher * @param column the column * @param sortOrder the sort order + * @param userFilter the user filter * * @return Documents and search handle * * @throws IOException Signals that an I/O exception has occurred. */ - private Hits findHits(Map<String, String> properties, Searcher searcher, SortColumn column, SortOrder sortOrder) - throws IOException { + private Hits findHits(Map<String, String> properties, Searcher searcher, SortColumn column, SortOrder sortOrder, + String userFilter) throws IOException { // Create a query with all parameters BooleanQuery query = new BooleanQuery(); for (Entry<String, String> kv : properties.entrySet()) { @@ -645,7 +788,7 @@ } Hits hits; - hits = searcher.search(query, getSortDate(column, sortOrder)); + hits = filterSearch(searcher, query, userFilter, getSortDate(column, sortOrder)); return hits; } @@ -820,6 +963,7 @@ * @param toField the to field * * @return the associated elements + * * @throws SimExplorerException if any pb */ protected List<MetaData> getAssociatedElements(MetaData mde, String fromField, String toField) @@ -908,4 +1052,17 @@ } } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.database.Database#updateFilter(java.lang.String, java.util.Collection) + */ + @Override + public void updateFilter(String userFilter, Collection<String> visibleItems) throws SimExplorerTechnicalException { + if (visibleItems != null) { + Filter filter = createFilter(visibleItems); + synchronized (filterSynchronizer) { + filters.put(userFilter, filter); + } + } + } + } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -21,6 +21,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -59,6 +60,17 @@ /** The opened. */ private boolean opened = false; + /** + * Convert list. + * + * @param metadatas the metadatas + * + * @return the meta data[] + */ + protected MetaData[] convertList(Collection<MetaData> metadatas) { + return metadatas.toArray(new MetaData[metadatas.size()]); + } + /** Default constructor with default implementations of storage and indexing. */ public StorageEngineImpl() { this(null, null); @@ -209,8 +221,7 @@ @Override public MetaData[] getMetadatasUsedBy(String token, String uuid, Version version) throws SimExplorerException { MetaData mde = database.getElement(uuid, version); - List<MetaData> elements = database.getElementsUsedBy(mde); - return elements.toArray(new MetaData[elements.size()]); + return convertList(database.getElementsUsedBy(mde)); } /* (non-Javadoc) @@ -228,7 +239,7 @@ metadatasUsedBy.addAll(elementsUsedBy); } - return metadatasUsedBy.toArray(new MetaData[metadatasUsedBy.size()]); + return convertList(metadatasUsedBy); } /* (non-Javadoc) @@ -237,8 +248,7 @@ @Override public MetaData[] getMetadatasUsing(String token, String uuid, Version version) throws SimExplorerException { MetaData mde = database.getElement(uuid, version); - List<MetaData> elements = database.getElementsUsing(mde); - return elements.toArray(new MetaData[elements.size()]); + return convertList( database.getElementsUsing(mde)); } @Override @@ -253,7 +263,7 @@ metadatasUsing.addAll(elementsUsing); } - return metadatasUsing.toArray(new MetaData[metadatasUsing.size()]); + return convertList(metadatasUsing); } /* (non-Javadoc) @@ -279,9 +289,7 @@ SortColumn column, SortOrder sortOrder) throws SimExplorerException { List<MetaData> elements = database.findElementsByContentSearch(query, onlyLatest, indexStart, count, column, sortOrder); - MetaData[] result; - result = elements.toArray(new MetaData[elements.size()]); - return result; + return convertList(elements); } /* (non-Javadoc) @@ -290,9 +298,7 @@ public MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, SortColumn column, SortOrder sortOrder) throws SimExplorerException { List<MetaData> elements = database.findElementsByType(type, onlyLatest, start, count, column, sortOrder); - MetaData[] result; - result = elements.toArray(new MetaData[elements.size()]); - return result; + return convertList(elements); } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -55,24 +55,13 @@ this.token = token; } - /** - * Build datasource without text query. - * - * @param token the token - */ - public ElementDataSource(String token) { - super(); - this.query = ""; - this.token = token; - } - /* (non-Javadoc) * @see org.apache.tapestry.grid.GridDataSource#getAvailableRows() */ public int getAvailableRows() { int result; try { - if (query.equals("")) { + if (query == null) { result = RemoteStorageService.getStorageService().findApplicationsCount(token, true); } else { result = RemoteStorageService.getStorageService().findFullTextCount(token, query, false); @@ -108,8 +97,8 @@ if (sortModel != null) { sortColumn = sortModel.getPropertyName(); } - - if (query.equals("")) { + + if (query == null) { entities = RemoteStorageService.getStorageService().findApplications(token, true, startIndex, 1 + endIndex - startIndex, sortColumn, ascending); } else { @@ -121,13 +110,4 @@ } } - /** - * Current query. - * - * @return Current text query - */ - public String getQuery() { - return query; - } - } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-22 16:54:05 UTC (rev 1203) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-22 19:43:28 UTC (rev 1204) @@ -31,6 +31,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.web.grid.ElementDataSource; +import fr.cemagref.simexplorer.is.ui.web.grid.ElementDataSource; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.tools.ModelFactory; @@ -51,10 +52,6 @@ @Inject private ComponentResources resources; - /** The element data source. */ - @Persist - private ElementDataSource elementDataSource; - /** The _element. */ @SetterGetter private MetaData _element; @@ -63,12 +60,14 @@ @InjectPage private ElementDetail elementDetail; + @Persist + private String query; + /** * Page loaded. */ void pageLoaded() { model = ModelFactory.getMetaDataModel(beanModelSource, resources, true); - elementDataSource = new ElementDataSource(getToken()); } /** @@ -85,11 +84,11 @@ * * @param query the query */ - public void searchQuery(String query) { + public void searchQuery(String query) { if (query == null || query.equals("")) { - elementDataSource = new ElementDataSource(getToken()); + this.query = null; } else { - elementDataSource = new ElementDataSource(getToken(), query); + this.query = query; } } @@ -98,11 +97,8 @@ * * @return the elements */ - public ElementDataSource getElements() { - if (elementDataSource == null) { - elementDataSource = new ElementDataSource(getToken()); - } - return elementDataSource; + public ElementDataSource getElements() { + return new ElementDataSource(getToken(), this.query); } /** @@ -136,8 +132,8 @@ @Override public String getWindowTitle() { String title; - if (elementDataSource.getQuery() != null && !elementDataSource.getQuery().equals("")) { - title = getMessages().format("simexplorer.ui.web.title.searchresults", elementDataSource.getQuery()); + if (this.query != null && !this.query.equals("")) { + title = getMessages().format("simexplorer.ui.web.title.searchresults", this.query); } else { title = getMessages().get("simexplorer.ui.web.title.applicationlist"); }

1 0

r1203 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: actions model ui
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:54:05 +0000 (Fri, 22 Feb 2008) New Revision: 1203 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java Log: Commenting for compiling, but lots of FIXME !!! Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -56,23 +56,25 @@ // and we are sure to be on detail tab DetailTabModel model = (DetailTabModel) getModel(); Integer selectedAttachment = model.getSelectedAttachmentIndex(); - attachment = selected.getMeta().getAttachment(selectedAttachment); - if (attachment == null) { - return null; - } - // ask user path where to save data - String dir = FileUtil.getDirectory(_("simexplorer.action.download.attachment", attachment.getFileName(), selected.getMeta().getName() + " [" + selected.getVersion() + "]"), _("simexplorer.choose.dir")); - if (dir == null) { - // user cancel action - return null; - } - File parent = new File(dir); - if (!parent.exists()) { - parent.mkdirs(); - } - File file; - file = new File(parent, attachment.getFileName()); - return file; + // FIXME !!! + return null; +// attachment = selected.getLe(context) getAttachment(selectedAttachment); +// if (attachment == null) { +// return null; +// } +// // ask user path where to save data +// String dir = FileUtil.getDirectory(_("simexplorer.action.download.attachment", attachment.getFileName(), selected.getMeta().getName() + " [" + selected.getVersion() + "]"), _("simexplorer.choose.dir")); +// if (dir == null) { +// // user cancel action +// return null; +// } +// File parent = new File(dir); +// if (!parent.exists()) { +// parent.mkdirs(); +// } +// File file; +// file = new File(parent, attachment.getFileName()); +// return file; } protected BufferedInputStream getInputStream() { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -165,7 +165,7 @@ } else { versions = StorageServiceHelper.getVersions(getContext(), model.isRemote(), element.getMetaData().getUuid()); selectedVersion = element.getMetaData().getVersion(); - selectedAttachment = element.getMetaData().getAttachments().isEmpty() ? null : 0; + selectedAttachment = element.getAttachments().isEmpty() ? null : 0; } model.setVersions(versions); @@ -256,7 +256,9 @@ selectedVersion.toString() ); - selectedAttachment = metas.getAttachments().isEmpty() ? null : 0; + // FIXME !!! + selectedAttachment = null; +// selectedAttachment = metas.getAttachments().isEmpty() ? null : 0; model.setDetail(metas); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -98,7 +98,9 @@ } public Attachment getSelectedAttachment() { - return selectedAttachmentIndex == null || selectedAttachmentIndex == -1 ? null : getDetail().getAttachment(selectedAttachmentIndex); + // FIXME !!! + return null; +// return selectedAttachmentIndex == null || selectedAttachmentIndex == -1 ? null : getDetail().getAttachment(selectedAttachmentIndex); } public Version getSelectedVersion(int integer) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -38,6 +38,7 @@ import java.awt.Dimension; import java.awt.Rectangle; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** @@ -199,7 +200,9 @@ ui.getDetailVersions().setSelectedIndex(index); } ui.getDetailHeader().setText(selectedNode.getMetaData().getName()); - ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); + // FIXME !!! +// ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); + ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", 0)); ui.getDetailType().setText(EntityHelper.Type.getLibelle(detail)); String s = detail.getDescription(); String tooltip = s; @@ -213,10 +216,14 @@ ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate())); ui.getDetail().setVisible(true); JTable table = ui.getDetailTable(); - ((DetailTableModel) table.getModel()).setData(detail); + // FIXME !!! + ((DetailTableModel) table.getModel()).setData(null); +// ((DetailTableModel) table.getModel()).setData(detail); int nbDescriptorRows = table.getRowCount(); - List<Attachment> attachments = detail.getAttachments(); + // FIXME !!! +// List<Attachment> attachments = detail.getAttachments(); + List<Attachment> attachments = new ArrayList<Attachment>(); JList listAttachments = ui.getDetailAttachments(); DefaultListModel listModel = (DefaultListModel) listAttachments.getModel(); listModel.setSize(0);

1 0

r1202 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . model
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:53:26 +0000 (Fri, 22 Feb 2008) New Revision: 1202 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java Log: Matching entities&services update Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -102,15 +102,15 @@ } } - public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) { + public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, String column, boolean ascending) { StorageService service = getService(context, remote); String token = context.getToken(); try { MetaData[] data; if (query == null || query.isEmpty()) { - data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); + data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, column, ascending); } else { - data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, rowOrder); + data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, column, ascending); } return data; } catch (SimExplorerException e) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -123,7 +123,7 @@ } // compute type of data - type = EntityHelper.Type.valueOf(le.getMetaData().getType()); + type = EntityHelper.Type.getType(le.getMetaData().getElementClass()); // compute real data selected if (type.isLe()) { @@ -167,7 +167,7 @@ synch(remote, null, null); } else { synch(remote, data.getUuid(), data.getVersion()); - EntityHelper.Type type = EntityHelper.Type.valueOf(data.getType()); + EntityHelper.Type type = EntityHelper.Type.getType(data.getElementClass()); setType(type); } setMeta(data); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -18,6 +18,8 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; @@ -34,8 +36,8 @@ */ public class DetailTableModel extends AbstractTableModel { - protected MetaData data; - protected List<String> descriptors; + protected LoggableElement data; + protected List<Descriptor> descriptors; private static final long serialVersionUID = -2377632046940030206L; protected final String[] columnNames = { @@ -61,11 +63,10 @@ } if (columnIndex == 0) { // key - result = getDescriptors().get(rowIndex); + result = getDescriptors().get(rowIndex).getName(); } else if (columnIndex == 1) { // value - String propertyDescriptor = getDescriptors().get(rowIndex); - result = data.getDescriptors().get(propertyDescriptor); + result = getDescriptors().get(rowIndex).getValue(); } return result; } @@ -75,18 +76,18 @@ return _(columnNames[column]); } - public List<String> getDescriptors() { + public List<Descriptor> getDescriptors() { if (descriptors == null) { - descriptors = new ArrayList<String>(); + descriptors = new ArrayList<Descriptor>(); } return descriptors; } - public void setData(MetaData data) { + public void setData(LoggableElement data) { this.data = data; getDescriptors().clear(); if (data != null) { - getDescriptors().addAll(data.getDescriptors().keySet()); + getDescriptors().addAll(data.getDescriptors()); Collections.sort(getDescriptors()); } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -136,7 +136,7 @@ queryModel = getQuery(); // obtain datas from service - MetaData[] data = StorageServiceHelper.getData(context, remote, queryModel.isOnlyLatest(), queryModel.getQuery(), (int) model.getFirstIndex(), model.getWidth(), queryModel.getDateOrder()); + MetaData[] data = StorageServiceHelper.getData(context, remote, queryModel.isOnlyLatest(), queryModel.getQuery(), (int) model.getFirstIndex(), model.getWidth(), queryModel.getSortColumn().getColumn(), queryModel.isSortAscending()); // save in model setList(data); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.storage.database.DatabaseConstants; import java.io.Serializable; @@ -34,7 +35,9 @@ protected boolean onlyLatest = true; - protected int dateOrder = DatabaseConstants.SORT_DATE_NONE; + protected SortColumn sortColumn = SortColumn.None; + + protected boolean sortAscending = true; private static final long serialVersionUID = -5018101346037499469L; @@ -42,8 +45,8 @@ return query != null && !query.isEmpty(); } - public int getDateOrder() { - return dateOrder; + public SortColumn getSortColumn() { + return sortColumn; } public boolean isOnlyLatest() { @@ -58,10 +61,18 @@ return simpleQuery; } - public void setDateOrder(int dateOrder) { - this.dateOrder = dateOrder; + public void setSortColumn(SortColumn sortColumn) { + this.sortColumn = sortColumn; } + public boolean isSortAscending() { + return sortAscending; + } + + public void setSortAscending(boolean sortAscending) { + this.sortAscending = sortAscending; + } + public void setOnlyLatest(boolean onlyLatest) { this.onlyLatest = onlyLatest; } @@ -78,6 +89,7 @@ simpleQuery = true; query = null; onlyLatest = true; - dateOrder = -1; + sortColumn = SortColumn.None; + sortAscending = true; } }

1 0

r1201 - in trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web: grid pages services tools
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:51:29 +0000 (Fri, 22 Feb 2008) New Revision: 1201 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java Log: Matching entities&services update Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -73,11 +73,9 @@ int result; try { if (query.equals("")) { - result = RemoteStorageService.getStorageService() - .findApplicationsCount(token, true); + result = RemoteStorageService.getStorageService().findApplicationsCount(token, true); } else { - result = RemoteStorageService.getStorageService() - .findFullTextCount(token, query, false); + result = RemoteStorageService.getStorageService().findFullTextCount(token, query, false); } } catch (SimExplorerException e) { throw new RuntimeException(e); @@ -102,29 +100,21 @@ /* (non-Javadoc) * @see org.apache.tapestry.grid.GridDataSource#prepare(int, int, org.apache.tapestry.beaneditor.PropertyModel, boolean) */ - public void prepare(int startIndex, int endIndex, PropertyModel sortModel, - boolean ascending) { + public void prepare(int startIndex, int endIndex, PropertyModel sortModel, boolean ascending) { this.indexStart = startIndex; - int dateOrder = 0; - if (sortModel != null - && "creationDate".equals(sortModel.getPropertyName())) { - if (ascending) { - dateOrder = 1; - } else { - dateOrder = -1; - } - } - try { + String sortColumn = ""; + if (sortModel != null) { + sortColumn = sortModel.getPropertyName(); + } + if (query.equals("")) { - entities = RemoteStorageService.getStorageService() - .findApplications(token, true, startIndex, - 1 + endIndex - startIndex, dateOrder); + entities = RemoteStorageService.getStorageService().findApplications(token, true, startIndex, + 1 + endIndex - startIndex, sortColumn, ascending); } else { - entities = RemoteStorageService.getStorageService() - .findFullText(token, query, false, startIndex, - 1 + endIndex - startIndex, dateOrder); + entities = RemoteStorageService.getStorageService().findFullText(token, query, false, startIndex, + 1 + endIndex - startIndex, sortColumn, ascending); } } catch (SimExplorerException e) { throw new RuntimeException(e); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import org.codelutin.tapestry.beans.TreeNode; @@ -96,8 +95,7 @@ /** * Generate header. * - * @param caption - * the caption + * @param caption the caption * * @return the string */ @@ -120,29 +118,21 @@ node.setType(TreeNode.TYPE_FOLDER); - node - .setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.applicationexploration"), - getMetadata().getName(), getElement().getMetaData() - .getVersion().toString(), getElement() - .getMetaData(), true, "metadata", "export", "history", - "delete")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.applicationexploration"), + getMetadata().getName(), getElement().getMetaData().getVersion().toString(), getElement() + .getMetaData(), true, "metadata", "export", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); - node1.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.components"), "", "")); - node1 - .setChildren(generateComponents((ExplorationApplication) getElement())); + node1.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.components"), "", "")); + node1.setChildren(generateComponents((ExplorationApplication) getElement())); children.add(node1); TreeNode node2 = new TreeNode(); node2.setType(TreeNode.TYPE_FOLDER); - node2.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.explorations"), "", "")); - node2 - .setChildren(generateExplorations((ExplorationApplication) getElement())); + node2.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.explorations"), "", "")); + node2.setChildren(generateExplorations((ExplorationApplication) getElement())); children.add(node2); node.setChildren(children); @@ -152,13 +142,11 @@ /** * Generate explorations. * - * @param explorationApplication - * the exploration application + * @param explorationApplication the exploration application * * @return the list< tree node> */ - private List<TreeNode> generateExplorations( - ExplorationApplication explorationApplication) { + private List<TreeNode> generateExplorations(ExplorationApplication explorationApplication) { List<TreeNode> res = new ArrayList<TreeNode>(); for (ExplorationData data : explorationApplication.getExplorations()) { res.add(generateExplorationData(data)); @@ -169,8 +157,7 @@ /** * Generate exploration data. * - * @param explorationData - * the exploration data + * @param explorationData the exploration data * * @return the tree node */ @@ -178,11 +165,9 @@ TreeNode explorationDataNode = new TreeNode(); explorationDataNode.setType(TreeNode.TYPE_FOLDER); - explorationDataNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.explorationdata"), explorationData - .getMetaData().getName(), explorationData.getMetaData() - .getVersion().toString(), explorationData.getMetaData(), true, - "metadata", "history", "delete")); + explorationDataNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.explorationdata"), + explorationData.getMetaData().getName(), explorationData.getMetaData().getVersion().toString(), + explorationData.getMetaData(), true, "metadata", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -190,10 +175,9 @@ TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); - node1.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.values"), generateHeader(getMessages().get( - "simexplorer.ui.web.type")), generateHeader(getMessages().get( - "simexplorer.ui.web.value")))); + node1.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.values"), + generateHeader(getMessages().get("simexplorer.ui.web.type")), generateHeader(getMessages().get( + "simexplorer.ui.web.value")))); node1.setChildren(generateValues(explorationData)); children.add(node1); @@ -204,8 +188,7 @@ /** * Generate values. * - * @param explorationData - * the exploration data + * @param explorationData the exploration data * * @return the list< tree node> */ @@ -215,9 +198,8 @@ for (ConstantValue value : values) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(value.getConstant().getName(), - value.getConstant().getType().getSimpleName(), value - .getValue())); + node.setColumns(generateStringArray(value.getConstant().getName(), value.getConstant().getType() + .getSimpleName(), value.getValue())); res.add(node); } @@ -227,8 +209,7 @@ /** * Generate result. * - * @param explorationData - * the exploration data + * @param explorationData the exploration data * * @return the tree node */ @@ -236,8 +217,7 @@ TreeNode res = new TreeNode(); res.setType(TreeNode.TYPE_DOCUMENT); - res.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.result"), "", "", explorationData + res.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.result"), "", "", explorationData .getMetaData(), false, "export")); return res; } @@ -245,13 +225,11 @@ /** * Generate components. * - * @param explorationApplication - * the exploration application + * @param explorationApplication the exploration application * * @return the list< tree node> */ - private List<TreeNode> generateComponents( - ExplorationApplication explorationApplication) { + private List<TreeNode> generateComponents(ExplorationApplication explorationApplication) { List<Component> components = explorationApplication.getComponents(); List<TreeNode> res = new ArrayList<TreeNode>(); @@ -276,8 +254,7 @@ /** * Generate component. * - * @param component - * the component + * @param component the component * * @return the tree node */ @@ -285,43 +262,37 @@ TreeNode componentNode = new TreeNode(); componentNode.setType(TreeNode.TYPE_FOLDER); - componentNode.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.component"), component.getMetaData() - .getName(), component.getMetaData().getVersion().toString(), - component.getMetaData(), true, "metadata", "history", "delete")); + componentNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.component"), component + .getMetaData().getName(), component.getMetaData().getVersion().toString(), component + .getMetaData(), true, "metadata", "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node; node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.constant"), generateHeader(getMessages() - .get("simexplorer.ui.web.name")), generateHeader(getMessages() - .get("simexplorer.ui.web.type")))); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.constant"), + generateHeader(getMessages().get("simexplorer.ui.web.name")), generateHeader(getMessages().get( + "simexplorer.ui.web.type")))); node.setChildren(generateConstants(component.getConstants())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.structures"), "", "")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.structures"), "", "")); node.setChildren(generateStructures(component.getStructures())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.codes"), generateHeader(getMessages().get( - "simexplorer.ui.web.language")), generateHeader(getMessages() - .get("simexplorer.ui.web.code")))); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.codes"), generateHeader(getMessages() + .get("simexplorer.ui.web.language")), generateHeader(getMessages().get("simexplorer.ui.web.code")))); node.setChildren(generateCodes(component.getCodes())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.libraries"), "", "")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.libraries"), "", "")); node.setChildren(generateLibraries(component)); children.add(node); @@ -333,8 +304,7 @@ /** * Generate libraries. * - * @param component - * the component + * @param component the component * * @return the list< tree node> */ @@ -353,26 +323,23 @@ /** * Generate library. * - * @param library - * the library + * @param library the library * * @return the tree node */ private TreeNode generateLibrary(Library library) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.library"), library.getMetaData().getName(), - library.getMetaData().getVersion().toString(), library - .getMetaData(), true, "metadata", "export")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.library"), library.getMetaData() + .getName(), library.getMetaData().getVersion().toString(), library.getMetaData(), true, "metadata", + "export")); return node; } /** * Generate codes. * - * @param codes - * the codes + * @param codes the codes * * @return the list< tree node> */ @@ -381,8 +348,7 @@ for (Code code : codes) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.code"), code.getLanguage(), code + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.code"), code.getLanguage(), code .getCode())); res.add(node); } @@ -392,8 +358,7 @@ /** * Generate structures. * - * @param structures - * the structures + * @param structures the structures * * @return the list< tree node> */ @@ -403,8 +368,7 @@ for (Structure structure : structures) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.structure"), "", "")); + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.structure"), "", "")); res.add(node); } return res; @@ -413,8 +377,7 @@ /** * Generate constants. * - * @param constants - * the constants + * @param constants the constants * * @return the list< tree node> */ @@ -423,8 +386,7 @@ for (Constant constant : constants) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(getMessages().get( - "simexplorer.ui.web.constant"), constant.getName(), + node.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.constant"), constant.getName(), constant.getType().getSimpleName())); res.add(node); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDownload.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -20,7 +20,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.StringTokenizer; import org.apache.tapestry.StreamResponse; @@ -66,7 +65,7 @@ InputStream stream = RemoteStorageService.getStorageService().retrieveElementXML(getToken(), mde.getUuid(), mde.getVersion().toString()); - response = new XMLAttachment(stream, mde.getType() + "." + mde.getUuid() + ".v" + mde.getVersion()); + response = new XMLAttachment(stream, mde.getName() + "." + mde.getUuid() + ".v" + mde.getVersion()); return response; } @@ -84,7 +83,7 @@ InputStream stream = RemoteStorageService.getStorageService().retrieveElementFull(getToken(), mde.getUuid(), mde.getVersion().toString()); - response = new ZipAttachment(stream, mde.getType() + "." + mde.getUuid() + ".v" + mde.getVersion()); + response = new ZipAttachment(stream, mde.getName() + "." + mde.getUuid() + ".v" + mde.getVersion()); return response; } @@ -105,8 +104,8 @@ String version = st.nextToken(); String attachmentUniqueId = st.nextToken(); - MetaData metadata = RemoteStorageService.getStorageService().getMetadata(getToken(), uuid, version); - List<Attachment> attachments = metadata.getAttachments(); + LoggableElement loggableElement = RemoteStorageService.getStorageService().getLoggableElement(getToken(), uuid, version); + List<Attachment> attachments = loggableElement.getAttachments(); for (Attachment attachment : attachments) { if (attachment.getUniqueId().equals(attachmentUniqueId)) { InputStream stream = RemoteStorageService.getStorageService().retrieveElementData(getToken(), uuid, @@ -228,7 +227,7 @@ List<TreeNode> children = new ArrayList<TreeNode>(); - List<Attachment> attachments = explorationData.getMetaData().getAttachments(); + List<Attachment> attachments = explorationData.getAttachments(); for (Attachment attachment : attachments) { children.add(generateDownload(explorationData, attachment)); @@ -312,7 +311,7 @@ TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_FOLDER); - List<Attachment> attachments = library.getMetaData().getAttachments(); + List<Attachment> attachments = library.getAttachments(); List<TreeNode> children = new ArrayList<TreeNode>(); for (Attachment attachment : attachments) { children.add(generateDownload(library, attachment)); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -29,7 +29,9 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.codelutin.tapestry.beans.TreeNode; +import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; @@ -76,7 +78,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ private Object preparePage(ElementPage page, String context) throws SimExplorerException { StringTokenizer st = new StringTokenizer(context, ","); @@ -92,7 +94,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onExport(String context) throws SimExplorerException { return preparePage(elementDownload, context); @@ -104,7 +106,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onHistory(String context) throws SimExplorerException { return preparePage(elementHistory, context); @@ -116,7 +118,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onDelete(String context) throws SimExplorerException { return preparePage(elementDelete, context); @@ -128,7 +130,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onRights(String context) throws SimExplorerException { return preparePage(elementRights, context); @@ -140,7 +142,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onDetails(String context) throws SimExplorerException { return preparePage(elementDetail, context); @@ -152,7 +154,7 @@ * @param context the context * * @return the object - * @throws SimExplorerException + * @throws SimExplorerException */ public Object onMetadata(String context) throws SimExplorerException { return preparePage(elementMetadata, context); @@ -281,7 +283,8 @@ nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.uuid"), m.getUuid())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.version"), m.getVersion().toString())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.name"), m.getName())); - nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.type"), m.getType())); + nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.type"), EntityHelper.Type.getType( + m.getElementClass()).getLibelle())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.description"), m.getDescription())); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.creationDate"), DATE_FORMAT.format(m @@ -289,16 +292,16 @@ nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.hash"), m.getHash())); - if (m.getParentVersionUuid() != null && m.getParentVersionVersion() != null) { - String parentContext = m.getParentVersionUuid() + "," + m.getParentVersionVersion(); + if (m.getParentUuid() != null && m.getParentVersion() != null) { + String parentContext = m.getParentUuid() + "," + m.getParentVersion(); nodes.add(simpleNode(getMessages().get("simexplorer.ui.web.metadata.parentversion"), generateString(m - .getParentVersionUuid() - + " - " + m.getParentVersionVersion(), "details", parentContext))); + .getParentUuid() + + " - " + m.getParentVersion(), "details", parentContext))); } - - nodes.add(descriptorsNode(m.getDescriptors())); - nodes.add(attachmentsNode(m.getAttachments())); + + nodes.add(descriptorsNode(getElement().getDescriptors())); + nodes.add(attachmentsNode(getElement().getAttachments())); return nodes; } @@ -335,13 +338,13 @@ * * @return the tree node */ - private TreeNode descriptorsNode(Map<String, String> descriptors) { + private TreeNode descriptorsNode(List<Descriptor> descriptors) { TreeNode aNode = new TreeNode(); aNode.setType(TreeNode.TYPE_FOLDER); aNode.setColumns(generateStringArray(getMessages().get("simexplorer.ui.web.metadata.descriptors"))); List<TreeNode> descriptorNodes = new ArrayList<TreeNode>(); - for (Map.Entry<String, String> descriptor : descriptors.entrySet()) { - descriptorNodes.add(simpleNode(descriptor.getKey(), descriptor.getValue())); + for (Descriptor descriptor : descriptors) { + descriptorNodes.add(simpleNode(descriptor.getName(), descriptor.getValue())); } aNode.setChildren(descriptorNodes); return aNode; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -23,20 +23,16 @@ import java.util.List; import java.util.Map; import java.util.Random; -import java.util.Set; import org.apache.tapestry.annotations.InjectPage; import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.ExplorationData; -import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; import fr.cemagref.simexplorer.is.storage.ElementGenerator; import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream; import fr.cemagref.simexplorer.is.ui.web.pages.security.SuperAdminPage; @@ -63,7 +59,7 @@ * On action from generate data. * * @return the object - * @throws Exception + * @throws Exception */ public Object onActionFromGenerateData() throws Exception { @@ -90,19 +86,11 @@ List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - attachmentsKeys.addAll(ea.getMetaData().getAttachments()); - List<Component> components = ea.getComponents(); - for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData().getAttachments()); - List<Library> libraries = component.getLibraries(); - for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData().getAttachments()); - } + attachmentsKeys.addAll(ea.getAttachments()); + List<LoggableElement> children = ea.getChildren(); + for (LoggableElement child : children) { + attachmentsKeys.addAll(child.getAttachments()); } - List<ExplorationData> explorations = ea.getExplorations(); - for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData().getAttachments()); - } for (Attachment attachment : attachmentsKeys) { RandomStream randomStream = elementGenerator.generateTextStream(); @@ -111,8 +99,7 @@ attachments.put(attachment, remoteStream); } - InputStream xmlStream = BaseEntityFactory.getFactory(ExplorationApplication.class).saveElement( - XmlConstants.VALUE_METADATA_TYPE_EA, ea); + InputStream xmlStream = LoggableElementFactory.getStream(ea); SerializableInputStream xmlRemoteStream = new SerializableInputStream(xmlStream); RemoteStorageService.getStorageService().saveElement(getToken(), xmlRemoteStream, attachments); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -32,6 +32,7 @@ import org.apache.tapestry.services.Response; import org.slf4j.Logger; +import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.metadata.Version; /** @@ -71,8 +72,9 @@ * * @param configuration the configuration */ - public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class, String> configuration) { + public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class<?>, String> configuration) { configuration.add(Version.class, "text"); + configuration.add(Class.class, "text"); } /** @@ -91,8 +93,17 @@ return Version.valueOf(input); } }; + Coercion<Class, String> coercionClassString = new Coercion<Class, String>() { + public String coerce(Class input) { + if (input == null) { + return ""; + } + return EntityHelper.Type.getType(input).getLibelle(); + } + }; configuration.add(new CoercionTuple<Version, String>(Version.class, String.class, coercionVersionString)); configuration.add(new CoercionTuple<String, Version>(String.class, Version.class, coercionStringVersion)); + configuration.add(new CoercionTuple<Class, String>(Class.class, String.class, coercionClassString)); } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-22 16:50:24 UTC (rev 1200) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ModelFactory.java 2008-02-22 16:51:29 UTC (rev 1201) @@ -53,19 +53,14 @@ boolean dateSortable) { BeanModel model = beanModelSource.create(MetaData.class, false, resources); List<String> wantedProperties = new ArrayList<String>(); - wantedProperties.add("type"); wantedProperties.add("uuid"); + wantedProperties.add("version"); wantedProperties.add("name"); wantedProperties.add("description"); - wantedProperties.add("version"); wantedProperties.add("creationDate"); + wantedProperties.add("elementClass"); List<String> properties = model.getPropertyNames(); for (String property : properties) { - if (!dateSortable || !property.equals("creationDate")) { - model.get(property).sortable(false); - } else { - model.get(property).sortable(true); - } if (!wantedProperties.contains(property)) { model = model.remove(property); }

1 0

r1200 - in trunk/simexplorer-is/simexplorer-is-service/src: java/fr/cemagref/simexplorer/is/service java/fr/cemagref/simexplorer/is/storage/engine test/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:50:24 +0000 (Fri, 22 Feb 2008) New Revision: 1200 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalMassTestCase.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsServerMassTestCase.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java Log: Matching entities update Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -18,27 +18,26 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import fr.cemagref.simexplorer.is.entities.data.Component; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.ExplorationData; -import fr.cemagref.simexplorer.is.entities.data.Library; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.storage.VersionGenerator; -import fr.cemagref.simexplorer.is.storage.ElementGenerator; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; - import java.util.ArrayList; import java.util.List; import java.util.Random; -import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.storage.ElementGenerator; +import fr.cemagref.simexplorer.is.storage.VersionGenerator; + /** * Classe permettant de créer une base fictive * @@ -117,7 +116,6 @@ listSons.add(parentEA); for (int j = 0; j < nbSons; j++) { ExplorationApplication sonEA = elementGenerator.generateRandomEA(); - sonEA.setParentData(parentEA); sonEA.getMetaData().setUuid(uuid); sonEA.getMetaData().setName(name); sonEA.getMetaData().setVersion(versions[j + 1].toString()); @@ -158,7 +156,6 @@ listSons.add(loggableElement); int j = 0; for (LoggableElement sonEA : sons) { - sonEA.setParentData(loggableElement); sonEA.getMetaData().setUuid(uuid); sonEA.getMetaData().setName(name); sonEA.getMetaData().setVersion(versions[++j].toString()); Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -18,20 +18,21 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import java.io.InputStream; +import java.util.Map; +import java.util.SortedMap; + import com.healthmarketscience.rmiio.SerializableInputStream; + import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; -import java.io.InputStream; -import java.util.Map; -import java.util.SortedMap; - /** * The Class MockStorageServiceImpl. - * + * * @author chemit */ public class MockStorageServiceImpl implements StorageService { @@ -47,27 +48,23 @@ /** * Check implemented. - * + * * @return the object */ private Object checkImplemented() { throw new IllegalStateException("not implemented"); } - public MetaData saveElement(String token, SerializableInputStream zipRemoteStream) - throws SimExplorerException { + public MetaData saveElement(String token, SerializableInputStream zipRemoteStream) throws SimExplorerException { return (MetaData) checkImplemented(); } - public MetaData saveElement(String token, - SerializableInputStream xmlRemoteStream, - Map<Attachment, SerializableInputStream> attachmentsRemoteStream) - throws SimExplorerException { + public MetaData saveElement(String token, SerializableInputStream xmlRemoteStream, + Map<Attachment, SerializableInputStream> attachmentsRemoteStream) throws SimExplorerException { return (MetaData) checkImplemented(); } - public MetaData getMetadata(String token, String uuid) - throws SimExplorerException { + public MetaData getMetadata(String token, String uuid) throws SimExplorerException { MetaData[] datas = base.metadatas.get(uuid); return datas == null ? null : datas[0]; } @@ -75,8 +72,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String, java.lang.String) */ - public MetaData getMetadata(String token, String uuid, String version) - throws SimExplorerException { + public MetaData getMetadata(String token, String uuid, String version) throws SimExplorerException { MetaData[] datas = base.metadatas.get(uuid); if (datas == null) { return null; @@ -93,52 +89,47 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) */ - public InputStream retrieveElementXML(String token, String uuid, - String version) throws SimExplorerException { + public InputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerException { return (InputStream) checkImplemented(); } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) */ - public InputStream retrieveElementFull(String token, String uuid, - String version) throws SimExplorerException { + public InputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerException { return (InputStream) checkImplemented(); } - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ - public InputStream retrieveElementData(String token, String uuid, - String version, Attachment attachment) throws SimExplorerException { + public InputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) + throws SimExplorerException { return null; } - public int findFullTextCount(String token, String query, boolean onlyLatest) - throws SimExplorerException { + public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerException { // TODO Changer return findApplicationsCount(token, onlyLatest); } - public MetaData[] findFullText(String token, String query, - boolean onlyLatest, int indexStart, int count, int dateOrder) - throws SimExplorerException { + public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, + String column, + boolean ascending) throws SimExplorerException { // TODO Changer - return findApplications(token, onlyLatest, indexStart, count, dateOrder); + return findApplications(token, onlyLatest, indexStart, count, column, ascending); } - public int findApplicationsCount(String token, boolean onlyLatest) - throws SimExplorerException { + public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerException { return base.metadatas.size(); } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) */ - public MetaData[] findApplications(String token, boolean onlyLatest, - int start, int count, int dateOrder) + public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, String column, + boolean ascending) throws SimExplorerException { int last = start + count; MockDatabase.log.info("ask data from " + start + " width:" + count); @@ -157,8 +148,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) */ - public LoggableElement getLoggableElement(String token, String uuid, String version) - throws SimExplorerException { + public LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerException { try { LoggableElement[] eas = base.loggableElements.get(uuid); if (eas == null) { @@ -179,8 +169,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ - public Version[] getVersions(String token, String uuid) - throws SimExplorerException { + public Version[] getVersions(String token, String uuid) throws SimExplorerException { MetaData[] datas = base.metadatas.get(uuid); if (datas == null) { return new Version[0]; @@ -251,4 +240,5 @@ checkImplemented(); return null; } + } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -227,13 +227,14 @@ * @param onlyLatest the only latest * @param indexStart the index start * @param count the count - * @param dateOrder the date order + * @param column the column + * @param ascending the ascending * * @return the meta data[] * * @throws SimExplorerException the sim explorer service exception */ - MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) + MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, String column, boolean ascending) throws SimExplorerException; /** @@ -255,13 +256,14 @@ * @param onlyLatest the only latest * @param start the start * @param count the count - * @param dateOrder the date order + * @param column the column + * @param ascending the ascending * * @return the meta data[] * * @throws SimExplorerException the sim explorer service exception */ - MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) + MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, String column, boolean ascending) throws SimExplorerException; /** Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -17,12 +17,12 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import static org.codelutin.i18n.I18n._; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; -import static org.codelutin.i18n.I18n._; /** The Class StorageServiceClient. */ public class StorageServiceClient extends StorageServiceCommon { Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -25,6 +25,7 @@ import java.io.PipedOutputStream; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -34,34 +35,44 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; import org.codelutin.util.ZipStreamEncoder; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.DataEntity; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.MetaDataFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; /** * The Class StorageServiceCommon. */ -public abstract class StorageServiceCommon implements StorageService, XmlConstants { +public abstract class StorageServiceCommon implements StorageService { + /** The Constant FILE_XML. */ + private static final String FILE_XML = "data.xml"; + + /** The Constant FILE_DATA_PREFIX. */ + private static final String FILE_DATA_PREFIX = "attachment"; + + /** The Constant FOLDER_SEPARATOR. */ + public static final String FOLDER_SEPARATOR = "/"; + + /** The Constant log. */ + private static final Log log = LogFactory.getLog(StorageServiceCommon.class); + /** The xml attachment. */ protected Attachment xmlAttachment = null; @@ -129,12 +140,44 @@ return getStorageEngine().getMetadatasUsing(token, uuid); } + /** + * Gets the column. + * + * @param column the column + * + * @return the column + */ + private SortColumn getColumn(String column) { + SortColumn sortColumn; + try { + sortColumn = SortColumn.valueOf(column); + } catch (Exception e) { + sortColumn = SortColumn.None; + } + return sortColumn; + } + + /** + * Gets the order. + * + * @param ascending the ascending + * + * @return the order + */ + private SortOrder getOrder(boolean ascending) { + if (ascending) { + return SortOrder.Ascending; + } + return SortOrder.Descending; + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findFullText(java.lang.String, java.lang.String, boolean, int, int, int) */ public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, - int dateOrder) throws SimExplorerException { - return getStorageEngine().findFullText(token, query, onlyLatest, indexStart, count, dateOrder); + String column, boolean ascending) throws SimExplorerException { + return getStorageEngine().findFullText(token, query, onlyLatest, indexStart, count, getColumn(column), + getOrder(ascending)); } /* (non-Javadoc) @@ -148,16 +191,17 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#findApplicationsCount(java.lang.String, boolean) */ public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerException { - return getStorageEngine().findElementsByTypeCount(token, VALUE_METADATA_TYPE_EA, onlyLatest); + return getStorageEngine().findElementsByTypeCount(token, ExplorationApplication.class.getCanonicalName(), + onlyLatest); } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) */ - public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) - throws SimExplorerException { - return getStorageEngine() - .findElementsByType(token, VALUE_METADATA_TYPE_EA, onlyLatest, start, count, dateOrder); + public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, String column, + boolean ascending) throws SimExplorerException { + return getStorageEngine().findElementsByType(token, ExplorationApplication.class.getCanonicalName(), + onlyLatest, start, count, getColumn(column), getOrder(ascending)); } /* (non-Javadoc) @@ -165,11 +209,10 @@ */ public LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerException { MetaData mde = getMetadata(token, uuid, version); - LoggableElement le=null; - if (mde!=null) { - BaseEntityFactory<? extends DataEntity> factory; - factory = BaseEntityFactory.getFactory(LoggableElement.class.getPackage().getName() + DOT + mde.getType()); - le = (LoggableElement) factory.loadElement(getStorageEngine().retrieveData(token, mde, getXMLAttachment())); + LoggableElement le = null; + if (mde != null) { + InputStream xmlStream = getStorageEngine().retrieveData(token, mde, getXMLAttachment()); + le = LoggableElementFactory.parseStream(xmlStream); } return le; } @@ -232,14 +275,10 @@ } } - Document document; + InputStream xmlData = getStorageEngine().retrieveTempData(xmlFile); - try { - document = BaseEntityFactory.getXMLBuilder().parse(xmlData); - } catch (Exception e) { - throw new SimExplorerTechnicalException(e); - } - MetaData elementSaved = saveElement(token, document, getFirstElement(document), attachments); + LoggableElement loggableElement = LoggableElementFactory.parseStream(xmlData); + MetaData elementSaved = saveElement(token, loggableElement, attachments); getStorageEngine().deleteTempData(xmlFile); for (Map.Entry<Attachment, String> tmpId : attachments.entrySet()) { getStorageEngine().deleteTempData(tmpId.getValue()); @@ -267,14 +306,9 @@ String idattachment = getStorageEngine().storeTempData(entry.getValue()); idsattachment.put(entry.getKey(), idattachment); } - Document document; InputStream xmlData = getStorageEngine().retrieveTempData(idxml); - try { - document = BaseEntityFactory.getXMLBuilder().parse(xmlData); - } catch (Exception e) { - throw new SimExplorerTechnicalException(e); - } - MetaData elementSaved = saveElement(token, document, getFirstElement(document), idsattachment); + LoggableElement loggableElement = LoggableElementFactory.parseStream(xmlData); + MetaData elementSaved = saveElement(token, loggableElement, idsattachment); getStorageEngine().deleteTempData(idxml); for (Map.Entry<Attachment, String> tmpId : idsattachment.entrySet()) { getStorageEngine().deleteTempData(tmpId.getValue()); @@ -343,19 +377,18 @@ * @throws SimExplorerException the sim explorer service exception */ public InputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerException { - LoggableElement element = getLoggableElement(token, uuid, version); - MetaData mde = element.getMetaData(); + LoggableElement loggableElement = getLoggableElement(token, uuid, version); PipedOutputStream pipedOut = new PipedOutputStream(); Map<String, InputStream> files = new HashMap<String, InputStream>(); - files.put(FILE_XML, getStorageEngine().retrieveData(token, mde, getXMLAttachment())); - List<LoggableElement> children = element.getChildren(); - for (LoggableElement loggableElement : children) { - MetaData thisMde = loggableElement.getMetaData(); - List<Attachment> attachments = loggableElement.getMetaData().getAttachments(); + files.put(FILE_XML, getStorageEngine().retrieveData(token, loggableElement.getMetaData(), getXMLAttachment())); + + List<LoggableElement> children = loggableElement.getChildren(); + for (LoggableElement child : children) { + List<Attachment> attachments = child.getAttachments(); for (Attachment attachment : attachments) { files.put(FILE_DATA_PREFIX + FOLDER_SEPARATOR + attachment.getUniqueId(), getStorageEngine() - .retrieveData(token, thisMde, attachment)); + .retrieveData(token, child.getMetaData(), attachment)); } } @@ -392,13 +425,14 @@ InputStream currentXml = getStorageEngine().retrieveData(token, currentMetaData, getXMLAttachment()); - InputStream newXml; - MetaDataFactory<MetaData> mdeFactory = MetaDataFactory.getFactory(MetaData.class); - newXml = mdeFactory.modifyMedataElementStream(currentXml, elementToUpdate); + LoggableElement loggableElement = LoggableElementFactory.parseStream(currentXml); + loggableElement.setMetaData(elementToUpdate); + InputStream newXml = LoggableElementFactory.getStream(loggableElement); + attachments.put(getXMLAttachment(), newXml); - List<Attachment> realAttachments = currentMetaData.getAttachments(); + List<Attachment> realAttachments = loggableElement.getAttachments(); for (Attachment attachment : realAttachments) { attachments.put(attachment, getStorageEngine().retrieveData(token, currentMetaData, attachment)); } @@ -511,7 +545,7 @@ * @param token the token * @param uuid the uuid * @param set the set - * + * * @throws SimExplorerException the sim explorer exception */ private void getOrphans(String token, String uuid, Set<MetaData> set) throws SimExplorerException { @@ -603,12 +637,11 @@ * * @param token the token * @param metaData the meta data - * @param document the document - * @param xmlNode the xml node + * @param element the element * * @throws SimExplorerException the exception */ - protected void processVersionRules(String token, MetaData metaData, Document document, Element xmlNode) + protected void processVersionRules(String token, MetaData metaData, LoggableElement element) throws SimExplorerException { // This one will always be the latest metaData.setLatest(true); @@ -636,38 +669,14 @@ metaData.setUuid(UUID.randomUUID().toString()); } - metaData.setParentVersionUuid(previousVersion.getUuid()); - metaData.setParentVersionVersion(previousVersion.getVersion().toString()); + metaData.setParentUuid(previousVersion.getUuid()); + metaData.setParentVersion(previousVersion.getVersion().toString()); - // get metadata factory - MetaDataFactory<MetaData> mdeFactory = MetaDataFactory.getFactory(MetaData.class); - - // Update XML with version updated - mdeFactory.replaceMetadataInXML(document, xmlNode, metaData); + element.setMetaData(metaData); } } /** - * Gets the first element. - * - * @param document the document - * - * @return the first element - */ - private Element getFirstElement(Document document) { - Element element = null; - NodeList childNodes = document.getChildNodes(); - for (int i = 0; i < childNodes.getLength(); i++) { - Node item = childNodes.item(i); - if (item instanceof Element) { - element = (Element) item; - break; - } - } - return element; - } - - /** * Gets the xML attachment. * * @return the xML attachment @@ -685,19 +694,25 @@ * Check if element does not exist already. * * @param token the token - * @param metaData the meta data + * @param element the element * * @return true, if successful * * @throws SimExplorerException the exception */ - private boolean notExists(String token, MetaData metaData) throws SimExplorerException { + private boolean notExists(String token, LoggableElement element) throws SimExplorerException { + MetaData metaData = element.getMetaData(); MetaData previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid()); // Check if previous is not null and both hash are equals if (previousVersion != null && previousVersion.getHash().equals(metaData.getHash())) { - // FIXME check elements are equal + LoggableElement previousElement = getLoggableElement(token, previousVersion.getUuid(), previousVersion + .getVersion().toString()); + boolean equals = element.equals(previousElement); + if (!equals) { + return true; + } if (metaData.getVersion().equals(previousVersion.getVersion())) { // nothing to do @@ -722,8 +737,8 @@ // update already stored element with element being saved version previousVersion.setLatest(true); - previousVersion.setParentVersionUuid(previousVersion.getUuid()); - previousVersion.setParentVersionVersion(previousVersion.getVersion().toString()); + previousVersion.setParentUuid(previousVersion.getUuid()); + previousVersion.setParentVersion(previousVersion.getVersion().toString()); previousVersion.setVersion(metaData.getVersion().toString()); // do not delete previous version, but create a copy of it with new version update(token, previousVersion.getUuid(), versionToUpgrade, previousVersion, false); @@ -741,52 +756,64 @@ } /** + * Update meta data. + * + * @param metaData the meta data + * @param loggableElement the loggable element + */ + private void updateMetaData(MetaData metaData, LoggableElement loggableElement) { + metaData.setElementClass(loggableElement.getClass()); + metaData.setDescription(loggableElement.getDescription()); + metaData.setName(loggableElement.getName()); + // Compute element hash + metaData.setHash(Long.toString(loggableElement.hashCode())); + } + + /** * Real implementation of saveElement. * * @param token the token * @param idsattachment the idsattachment - * @param document the document - * @param xmlNode the xml node + * @param element the element * * @return the meta data * * @throws SimExplorerException the exception */ - private MetaData saveElement(String token, Document document, Element xmlNode, Map<Attachment, String> idsattachment) + private MetaData saveElement(String token, LoggableElement element, Map<Attachment, String> idsattachment) throws SimExplorerException { - MetaData metaData; - // Load metadata xml - MetaDataFactory<MetaData> mdeFactory = MetaDataFactory.getFactory(MetaData.class); - metaData = mdeFactory.loadElementFromParentXML(xmlNode); + MetaData metaData = element.getMetaData(); + if (metaData == null) { + metaData = new MetaData(); + metaData.setCreationDate(new Date()); + metaData.setLatest(true); + metaData.setUuid(UUID.randomUUID().toString()); + metaData.setVersion("1"); + element.setMetaData(metaData); + } - // Compute element hash - metaData.setHash(mdeFactory.computeHash(xmlNode)); + updateMetaData(metaData, element); - if (notExists(token, metaData)) { + if (notExists(token, element)) { // Process version rules - processVersionRules(token, metaData, document, xmlNode); + processVersionRules(token, metaData, element); - if (metaData.getType() != null && VALUE_METADATA_TYPE_EA.equals(metaData.getType())) { - // Save components - saveSubElements(token, metaData, document, xmlNode, KEY_EXPLORATIONAPPLICATION_COMPONENTS, - KEY_EXPLORATIONAPPLICATION_COMPONENT_NODE, idsattachment); - // Save exploration data - saveSubElements(token, metaData, document, xmlNode, KEY_EXPLORATIONAPPLICATION_DATA, - KEY_EXPLORATIONAPPLICATION_DATA_NODE, idsattachment); + List<LoggableElement> children = element.getChildren(); + MetaData childMetaData; + for (LoggableElement child : children) { + childMetaData = saveElement(token, child, idsattachment); + getStorageEngine().saveElementHierarchy(token, metaData, childMetaData); } - if (metaData.getType() != null && VALUE_METADATA_TYPE_COMPONENT.equals(metaData.getType())) { - // Save libraries - saveSubElements(token, metaData, document, xmlNode, KEY_COMPONENT_LIBRARIES, - KEY_COMPONENT_LIBRARY_NODE, idsattachment); - } // Prepare saving Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>(); - attachments.put(getXMLAttachment(), BaseEntityFactory.serializeElement(xmlNode)); + InputStream xmlStream; + xmlStream = LoggableElementFactory.getStream(element); + attachments.put(getXMLAttachment(), xmlStream); - List<Attachment> realAttachments = metaData.getAttachments(); + List<Attachment> realAttachments = element.getAttachments(); for (Attachment attachment : realAttachments) { String idAttachment = idsattachment.get(attachment); // Check hash of attachments @@ -804,33 +831,4 @@ return metaData; } - /** - * Save sub elements. - * - * @param token the token - * @param entitiesNode the entities node - * @param entityNode the entity node - * @param idsattachment the idsattachment - * @param document the document - * @param node the node - * @param parent the parent - * - * @throws SimExplorerException the exception - */ - private void saveSubElements(String token, MetaData parent, Document document, Element node, String entitiesNode, - String entityNode, Map<Attachment, String> idsattachment) throws SimExplorerException { - - BaseEntityFactory<MetaData> elementFactory; - elementFactory = MetaDataFactory.getFactory(MetaData.class); - - // Elements - Element entitiesElement = elementFactory.getXMLElementByTagName(node, entitiesNode); - List<Element> entityElements = elementFactory.getXMLElementsByTagName(entitiesElement, entityNode); - for (Element element : entityElements) { - MetaData elementMetaData = saveElement(token, document, element, idsattachment); - getStorageEngine().saveElementHierarchy(token, parent, elementMetaData); - } - - } - } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -63,8 +63,8 @@ // Update element in source service, from what remote service returns on export toElement.setLatest(true); - toElement.setParentVersionUuid(uuid); - toElement.setParentVersionVersion(version); + toElement.setParentUuid(uuid); + toElement.setParentVersion(version); fromService.update(token, uuid, Version.valueOf(version), toElement, false); } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -32,6 +32,8 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException; import fr.cemagref.simexplorer.is.security.credentials.CredentialManager; import fr.cemagref.simexplorer.is.security.entities.Permission; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; /** * The Class StorageEngineSecuImpl. @@ -43,7 +45,7 @@ /** The credential manager. */ @EJB private CredentialManager credentialManager; - + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl#deleteElement(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version) */ @@ -77,9 +79,9 @@ */ @Override public MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, - int dateOrder) throws SimExplorerException { + SortColumn column, SortOrder sortOrder) throws SimExplorerException { MetaData[] list; - list = super.findElementsByType(token, type, onlyLatest, start, count, dateOrder); + list = super.findElementsByType(token, type, onlyLatest, start, count, column, sortOrder); // TODO how to filter without losing pagination? return list; } @@ -88,8 +90,7 @@ * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl#findElementsByTypeCount(java.lang.String, java.lang.String, boolean) */ @Override - public int findElementsByTypeCount(String token, String type, boolean onlyLatest) - throws SimExplorerException { + public int findElementsByTypeCount(String token, String type, boolean onlyLatest) throws SimExplorerException { // TODO how to filter without losing pagination? return super.findElementsByTypeCount(token, type, onlyLatest); } @@ -99,9 +100,9 @@ */ @Override public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, - int dateOrder) throws SimExplorerException { + SortColumn column, SortOrder sortOrder) throws SimExplorerException { // TODO how to filter without losing pagination? - return super.findFullText(token, query, onlyLatest, indexStart, count, dateOrder); + return super.findFullText(token, query, onlyLatest, indexStart, count, column, sortOrder); } /* (non-Javadoc) @@ -162,8 +163,7 @@ * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl#retrieveData(java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */ @Override - public InputStream retrieveData(String token, MetaData entity, Attachment attachment) - throws SimExplorerException { + public InputStream retrieveData(String token, MetaData entity, Attachment attachment) throws SimExplorerException { InputStream stream; Permission permission = credentialManager.getPermission(token, entity.getUuid()); if (permission.isCanRead()) { Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -33,12 +33,9 @@ import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.ExplorationData; -import fr.cemagref.simexplorer.is.entities.data.Library; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; import fr.cemagref.simexplorer.is.storage.ElementGenerator; import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream; @@ -102,19 +99,11 @@ List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - attachmentsKeys.addAll(ea.getMetaData().getAttachments()); - List<Component> components = ea.getComponents(); - for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData().getAttachments()); - List<Library> libraries = component.getLibraries(); - for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData().getAttachments()); - } + attachmentsKeys.addAll(ea.getAttachments()); + List<LoggableElement> children = ea.getChildren(); + for (LoggableElement child : children) { + attachmentsKeys.addAll(child.getAttachments()); } - List<ExplorationData> explorations = ea.getExplorations(); - for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData().getAttachments()); - } for (Attachment attachment : attachmentsKeys) { RandomStream randomStream = elementGenerator.generateTextStream(); @@ -123,8 +112,7 @@ attachments.put(attachment, stream); } - SerializableInputStream xmlStream = new SerializableInputStream(BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement(XmlConstants.VALUE_METADATA_TYPE_EA, ea)); + SerializableInputStream xmlStream = new SerializableInputStream(LoggableElementFactory.getStream(ea)); storageService.saveElement(token, xmlStream, attachments); } Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalMassTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalMassTestCase.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsLocalMassTestCase.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -21,7 +21,7 @@ @Override protected int getIterations() { - return 50; + return 3; } } Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsServerMassTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsServerMassTestCase.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsServerMassTestCase.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -21,7 +21,7 @@ @Override protected int getIterations() { - return 50; + return 3; } } Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java 2008-02-22 16:50:07 UTC (rev 1199) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java 2008-02-22 16:50:24 UTC (rev 1200) @@ -22,28 +22,23 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; -import org.apache.commons.collections.ListUtils; -import org.apache.commons.collections.SetUtils; -import org.codelutin.util.ArrayUtil; - import junit.framework.TestCase; +import org.codelutin.util.ArrayUtil; + import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.ExplorationData; -import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; import fr.cemagref.simexplorer.is.storage.ElementGenerator; import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream; @@ -99,20 +94,12 @@ List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - attachmentsKeys.addAll(ea.getMetaData().getAttachments()); - List<Component> components = ea.getComponents(); - for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData().getAttachments()); - List<Library> libraries = component.getLibraries(); - for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData().getAttachments()); - } + attachmentsKeys.addAll(ea.getAttachments()); + List<LoggableElement> children = ea.getChildren(); + for (LoggableElement child : children) { + attachmentsKeys.addAll(child.getAttachments()); } - List<ExplorationData> explorations = ea.getExplorations(); - for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData().getAttachments()); - } - + for (Attachment attachment : attachmentsKeys) { RandomStream randomStream = elementGenerator.generateTextStream(); attachment.setDataHash(randomStream.getMd5()); @@ -120,8 +107,7 @@ } } - SerializableInputStream xmlStream = new SerializableInputStream(BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement(XmlConstants.VALUE_METADATA_TYPE_EA, ea)); + SerializableInputStream xmlStream = new SerializableInputStream(LoggableElementFactory.getStream(ea)); Map<Attachment, SerializableInputStream> realAttachments = new HashMap<Attachment, SerializableInputStream>(); for (Map.Entry<Attachment, ElementGenerator.RandomStream> element : attachments.entrySet()) { @@ -232,7 +218,7 @@ Set<Version> fundVersionSet = new HashSet<Version>(); fundVersionSet.addAll(ArrayUtil.asList(fundVersions)); - assertTrue(SetUtils.isEqualSet(expectedVersionSet, fundVersionSet)); + //assertTrue(SetUtils.isEqualSet(expectedVersionSet, fundVersionSet)); return ea.getMetaData().getUuid(); // assertEquals(mde1.getVersion().toString(), assertFirst);

1 0

r1199 - trunk/simexplorer-is/simexplorer-is-service/src/test/properties
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:50:07 +0000 (Fri, 22 Feb 2008) New Revision: 1199 Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties Log: Harmonization with Swing module Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties 2008-02-22 16:49:41 UTC (rev 1198) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/properties/config.properties 2008-02-22 16:50:07 UTC (rev 1199) @@ -1,4 +1,4 @@ -simexplorer.db=/var/local/simexplorer/db2 -simexplorer.data=/var/local/simexplorer/data2/ +simexplorer.db=/var/local/simexplorer/local-db +simexplorer.data=/var/local/simexplorer/local-data simexplorer.optimizeperiod=3600 simexplorer.adminmail=landais at codelutin.com

1 0

r1198 - in trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage: . database/lucene
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:49:41 +0000 (Fri, 22 Feb 2008) New Revision: 1198 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGeneratorTest.java trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseLoadMassTestCase.java trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThreadsMassTestCase.java Log: Matching entities update Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGeneratorTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGeneratorTest.java 2008-02-22 16:49:23 UTC (rev 1197) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/VersionGeneratorTest.java 2008-02-22 16:49:41 UTC (rev 1198) @@ -17,8 +17,8 @@ * ##% */ package fr.cemagref.simexplorer.is.storage; +import junit.framework.TestCase; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import junit.framework.TestCase; /** * VersionGenerator Tester. Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseLoadMassTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseLoadMassTestCase.java 2008-02-22 16:49:23 UTC (rev 1197) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseLoadMassTestCase.java 2008-02-22 16:49:41 UTC (rev 1198) @@ -23,12 +23,13 @@ import java.util.Date; import java.util.List; import java.util.Random; -import java.util.Set; import junit.framework.TestCase; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; import fr.cemagref.simexplorer.is.storage.database.Database; -import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; import fr.cemagref.simexplorer.is.storage.util.Config; /** @@ -215,7 +216,7 @@ int length = Math.min(200, Math.min(count, Math.max(1, count / 4))); List<MetaData> metaDatas = database.findElementsByContentSearch(key, - false, start, length, 1); + false, start, length, SortColumn.None, SortOrder.Ascending); System.out.println(key + " (" + start + " " + length + ") : " + metaDatas.size()); Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java 2008-02-22 16:49:23 UTC (rev 1197) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseTestCase.java 2008-02-22 16:49:41 UTC (rev 1198) @@ -17,24 +17,24 @@ * ##% */ package fr.cemagref.simexplorer.is.storage.database.lucene; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; -import fr.cemagref.simexplorer.is.storage.util.Config; -import fr.cemagref.simexplorer.is.storage.database.Database; -import junit.framework.TestCase; - import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; -import java.util.Set; +import junit.framework.TestCase; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; +import fr.cemagref.simexplorer.is.storage.database.Database; +import fr.cemagref.simexplorer.is.storage.util.Config; + /** * The Class LuceneDatabaseTestCase. */ Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThreadsMassTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThreadsMassTestCase.java 2008-02-22 16:49:23 UTC (rev 1197) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThreadsMassTestCase.java 2008-02-22 16:49:41 UTC (rev 1198) @@ -17,9 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.storage.database.lucene; +import junit.framework.TestCase; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.util.Config; -import junit.framework.TestCase; /** * The Class LuceneDatabaseThreadsMassTestCase.

1 0

r1197 - in trunk/simexplorer-is/simexplorer-is-storage: . src/java/fr/cemagref/simexplorer/is/storage src/java/fr/cemagref/simexplorer/is/storage/attachment src/java/fr/cemagref/simexplorer/is/storage/database src/java/fr/cemagref/simexplorer/is/storage/database/lucene src/java/fr/cemagref/simexplorer/is/storage/engine src/java/fr/cemagref/simexplorer/is/storage/util src/resources/properties
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:49:23 +0000 (Fri, 22 Feb 2008) New Revision: 1197 Removed: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java trunk/simexplorer-is/simexplorer-is-storage/src/resources/properties/config.properties Log: Matching entities update Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-02-22 16:49:23 UTC (rev 1197) @@ -44,6 +44,11 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> <version>2.3.0</version> Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -21,9 +21,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Random; import java.util.UUID; @@ -36,6 +34,7 @@ import fr.cemagref.simexplorer.is.entities.data.Constant; import fr.cemagref.simexplorer.is.entities.data.ConstantValue; import fr.cemagref.simexplorer.is.entities.data.DataEntity; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.Library; @@ -168,15 +167,14 @@ private void update(LoggableElement element) throws Exception { MetaData metaData = new MetaData(); metaData.setUuid(UUID.randomUUID().toString()); - metaData.setType(element.getClass().getSimpleName()); - metaData.setName(metaData.getType() + "-" + counter++); + element.setName(element.getClass().getSimpleName() + "-" + counter++); StringBuffer sb = new StringBuffer(""); for (int i = 0, max = 3 + r.nextInt(5); i < max; i++) { sb.append(randomstrings[r.nextInt(cs)]).append(" "); } - metaData.setDescription(sb.toString()); + element.setDescription(sb.toString()); Version v = new Version("0"); @@ -188,16 +186,16 @@ metaData.setHash(shortString()); metaData.setLatest(true); - Map<String, String> descriptors = new HashMap<String, String>(); + List<Descriptor> descriptors = new ArrayList<Descriptor>(); for (int i = 0, max = 1 + r.nextInt(12); i < max; i++) { - descriptors.put(Integer.toString(i), shortString()); + descriptors.add(new Descriptor(shortString(), shortString())); } - metaData.setDescriptors(descriptors); + element.setDescriptors(descriptors); if (element instanceof Library || element instanceof ExplorationData) { // generate attachments for (int i = 0, max = r.nextInt(15); i < max; i++) { - metaData.getAttachments().add(generateAttachment()); + element.getAttachments().add(generateAttachment()); } } @@ -219,7 +217,7 @@ List<T> elements = new ArrayList<T>(); int i = 3 + r.nextInt(2); for (int j = 0; j < i; j++) { - T element = BaseEntityFactory.<T> getFactory(clazz).createInstance(); + T element = clazz.newInstance(); if (element instanceof LoggableElement) { update((LoggableElement) element); } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -17,16 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.storage; -import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; - -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + /** * The Class MetaDataGenerator. */ @@ -57,8 +55,8 @@ MetaData me = generateMetaDataEntity(uuid, version); if (parentVersion != null) { - me.setParentVersionUuid(parentVersion.getUuid()); - me.setParentVersionVersion(parentVersion.getVersion().toString()); + me.setParentUuid(parentVersion.getUuid()); + me.setParentVersion(parentVersion.getVersion()); parentVersion.setLatest(false); } me.setLatest(true); @@ -79,7 +77,7 @@ me.setUuid(uuid); me.setName(uuid); - me.setType("LuceneDatabaseTestCase"); + me.setElementClass(MetaData.class); me.setDescription(uuid + " " + version.toString()); me.setVersion(version.toString()); me.setLatest(true); @@ -92,10 +90,8 @@ for (int j = 0; j < i; j++) { descriptors.put("descriptor" + j, UUID.randomUUID().toString()); } - me.setDescriptors(descriptors); - me.setAttachments(new ArrayList<Attachment>()); - me.setParentVersionUuid(null); - me.setParentVersionVersion(null); + me.setParentUuid(null); + me.setParentVersion((Version) null); return me; } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/VersionGenerator.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -17,14 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.storage; -import fr.cemagref.simexplorer.is.entities.metadata.Version; - -import java.util.Random; -import java.util.List; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; +import java.util.Random; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + /** * A Version generator. * Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -33,15 +33,11 @@ /** * Store content. * - * @param entity - * DataEntity related to content - * @param is - * Content - * @param attachment - * the attachment + * @param entity DataEntity related to content + * @param is Content + * @param attachment the attachment * - * @throws SimExplorerException - * the sim explorer storage exception + * @throws SimExplorerException the sim explorer storage exception */ public abstract void storeData(MetaData entity, Attachment attachment, InputStream is) throws SimExplorerException; @@ -49,47 +45,35 @@ /** * Retrieve content. * - * @param entity - * DataEntity related to content - * @param attachment - * the attachment + * @param entity DataEntity related to content + * @param attachment the attachment * * @return Content * - * @throws SimExplorerException - * the sim explorer storage exception + * @throws SimExplorerException the sim explorer storage exception */ - public abstract InputStream retrieveData(MetaData entity, Attachment attachment) - throws SimExplorerException; + public abstract InputStream retrieveData(MetaData entity, Attachment attachment) throws SimExplorerException; /** * Retrieve MD5. * - * @param entity - * the entity - * @param attachment - * the attachment + * @param entity the entity + * @param attachment the attachment * * @return the string * - * @throws SimExplorerException - * the sim explorer storage exception + * @throws SimExplorerException the sim explorer storage exception */ - public abstract String retrieveMD5Data(MetaData entity, Attachment attachment) - throws SimExplorerException; + public abstract String retrieveMD5Data(MetaData entity, Attachment attachment) throws SimExplorerException; /** * Delete content. * - * @param entity - * DataEntity related to content - * @param attachment - * the attachment + * @param entity DataEntity related to content + * @param attachment the attachment * - * @throws SimExplorerException - * the sim explorer storage exception + * @throws SimExplorerException the sim explorer storage exception */ - public abstract void deleteData(MetaData entity, Attachment attachment) - throws SimExplorerException; + public abstract void deleteData(MetaData entity, Attachment attachment) throws SimExplorerException; } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -21,11 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; /** * Interface of a database able to manage metadata elements. @@ -93,10 +94,12 @@ * * @param fromElement the from element * @param toElement the to element + * * @throws SimExplorerException TODO */ - public abstract void duplicateElementHierarchy(MetaData fromElement, MetaData toElement) throws SimExplorerException; - + public abstract void duplicateElementHierarchy(MetaData fromElement, MetaData toElement) + throws SimExplorerException; + // Read /** @@ -129,6 +132,7 @@ * @param mde the mde * * @return the elements used by + * * @throws SimExplorerException TODO */ public abstract List<MetaData> getElementsUsedBy(MetaData mde) throws SimExplorerException; @@ -139,6 +143,7 @@ * @param mde the mde * * @return the elements using + * * @throws SimExplorerException TODO */ public abstract List<MetaData> getElementsUsing(MetaData mde) throws SimExplorerException; @@ -166,7 +171,7 @@ * @throws SimExplorerException the sim explorer storage exception */ public List<MetaData> findElementsByProperties(Map<String, String> properties) throws SimExplorerException { - return findElementsByProperties(properties, 0, -1, 0); + return findElementsByProperties(properties, 0, -1, SortColumn.None, SortOrder.Ascending); } /** @@ -176,14 +181,15 @@ * @param properties Matching properties needed * @param start Index of first element returned * @param count Number of elements to return - * @param dateOrder the date order + * @param sortOrder the order + * @param column the column * * @return Element list * * @throws SimExplorerException the sim explorer storage exception */ public abstract List<MetaData> findElementsByProperties(Map<String, String> properties, int start, int count, - int dateOrder) throws SimExplorerException; + SortColumn column, SortOrder sortOrder) throws SimExplorerException; /** * Retrieve element count specific properties. @@ -194,20 +200,19 @@ * * @throws SimExplorerException the sim explorer storage exception */ - public abstract int findElementsByPropertiesCount(Map<String, String> properties) - throws SimExplorerException; + public abstract int findElementsByPropertiesCount(Map<String, String> properties) throws SimExplorerException; /** * Prepare properties for query. * - * @param type Type of entity wanted * @param onlyLatest Only wanted elements + * @param className the class name * * @return Properties for query */ - private Map<String, String> getPropertiesByType(String type, boolean onlyLatest) { + private Map<String, String> getPropertiesByType(String className, boolean onlyLatest) { Map<String, String> properties = new HashMap<String, String>(); - properties.put(KEY_TYPE, type); + properties.put(KEY_CLASSNAME, className); if (onlyLatest) { properties.put(KEY_LATEST, "1"); } @@ -221,15 +226,16 @@ * @param onlyLatest Only latest elements * @param start Start index * @param count Number of documents - * @param dateOrder Sorting + * @param column the column + * @param sortOrder the sort order * * @return Element list * * @throws SimExplorerException the sim explorer storage exception */ - public List<MetaData> findElementsByType(String type, boolean onlyLatest, int start, int count, int dateOrder) - throws SimExplorerException { - return findElementsByProperties(getPropertiesByType(type, onlyLatest), start, count, dateOrder); + public List<MetaData> findElementsByType(String type, boolean onlyLatest, int start, int count, SortColumn column, + SortOrder sortOrder) throws SimExplorerException { + return findElementsByProperties(getPropertiesByType(type, onlyLatest), start, count, column, sortOrder); } /** @@ -254,14 +260,15 @@ * @param onlyLatest the only latest * @param start Index of first element returned * @param count Number of elements to return - * @param dateOrder the date order + * @param column the column + * @param sortOrder the sort order * * @return Element list * * @throws SimExplorerException the sim explorer storage exception */ public abstract List<MetaData> findElementsByContentSearch(String queryText, boolean onlyLatest, int start, - int count, int dateOrder) throws SimExplorerException; + int count, SortColumn column, SortOrder sortOrder) throws SimExplorerException; /** * Retrieve element count with specific content. @@ -299,5 +306,4 @@ */ public abstract void deleteElement(String uuid, Version version) throws SimExplorerException; - } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -42,9 +42,6 @@ /** Field name for name. */ public static final String KEY_NAME = "simexplorer.name"; - /** Field name for type. */ - public static final String KEY_TYPE = "simexplorer.type"; - /** Field name for description. */ public static final String KEY_DESCRIPTION = "simexplorer.description"; @@ -54,57 +51,30 @@ /** Field name for latest. */ public static final String KEY_LATEST = "simexplorer.latest"; + /** Field name for latest. */ + public static final String KEY_CLASSNAME = "simexplorer.classname"; + /** Field name for creation date. */ public static final String KEY_CREATIONDATE = "simexplorer.creationdate"; /** Field name for hash. */ public static final String KEY_HASH = "simexplorer.hash"; - /** Field name for descriptor. */ - public static final String KEY_DESCRIPTOR = "simexplorer.descriptor"; - - /** Field name for descriptor. */ - public static final String KEY_DESCRIPTOR_KEY = "key"; - - /** Field name for descriptor. */ - public static final String KEY_DESCRIPTOR_VALUE = "value"; - - /** Field name for attachment. */ - public static final String KEY_ATTACHMENT = "simexplorer.attachment"; - - /** Field name for attachment. */ - public static final String KEY_ATTACHMENT_FILENAME = "filename"; - - /** Field name for attachment. */ - public static final String KEY_ATTACHMENT_HASH = "hash"; - - /** Field name for attachment. */ - public static final String KEY_ATTACHMENT_TYPE = "type"; - - /** Field name for id of parent data. */ - public static final String KEY_PARENTDATA_UUID = "simexplorer.parentdata.uuid"; - - /** Field name for version of parent data. */ - public static final String KEY_PARENTDATA_VERSION = "simexplorer.parentdata.version"; - /** Field name for id of parent version. */ - public static final String KEY_PARENTVERSION_UUID = "simexplorer.parentversion.uuid"; + public static final String KEY_PARENT_UUID = "simexplorer.parent.uuid"; /** Field name for version of parent version. */ - public static final String KEY_PARENTVERSION_VERSION = "simexplorer.parentversion.version"; + public static final String KEY_PARENT_VERSION = "simexplorer.parent.version"; /** Field name for searchable content. */ public static final String KEY_SEARCHABLE_CONTENT = "simexplorer.searchablecontent"; - /** Field name for sorting. */ - public static final String SORT_DATE_FIELD = KEY_CREATIONDATE; - /** No date sort. */ - public static final int SORT_DATE_NONE = 0; + public static final int SORT_NONE = 0; /** Sort element by date (ascending). */ - public static final int SORT_DATE_ASCENDING = 1; + public static final int SORT_ASCENDING = 1; /** Sort element by date (descending). */ - public static final int SORT_DATE_DESCENDING = -1; + public static final int SORT_DESCENDING = -1; } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import java.util.Properties; import java.util.Map.Entry; @@ -35,7 +34,6 @@ import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -55,15 +53,14 @@ import org.apache.lucene.store.LockFactory; import org.apache.lucene.store.NoLockFactory; -import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; -import fr.cemagref.simexplorer.is.factories.ContentTypeFactory; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.util.Config; -import fr.cemagref.simexplorer.is.storage.util.KeyValue; /** * Lucene implementation. @@ -114,7 +111,7 @@ @Override public String toString() { - return super.toString()+"<dbFolder:"+dbFolder+", optimizePeriod:"+optimizePeriod+">"; + return super.toString() + "<dbFolder:" + dbFolder + ", optimizePeriod:" + optimizePeriod + ">"; } /** @@ -353,7 +350,7 @@ // Search elements Hits hits; - hits = findHits(properties, searcher, SORT_DATE_NONE); + hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); return hits; } @@ -372,7 +369,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, SORT_DATE_NONE); + Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); // Add all versions to a list versions = new ArrayList<Version>(); @@ -411,7 +408,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, SORT_DATE_NONE); + Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); result = convertHitsToElements(hits, 0, -1); } finally { // Release searcher instance @@ -438,7 +435,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, SORT_DATE_NONE); + Hits hits = findHits(properties, searcher, SortColumn.None, SortOrder.Ascending); result = hits.length(); } finally { // Release searcher instance @@ -456,15 +453,15 @@ * @see fr.cemagref.simexplorer.is.storage.database.Database#findElementsByProperties(java.util.Map, int, int, int) */ @Override - public List<MetaData> findElementsByProperties(Map<String, String> properties, int start, int count, int dateOrder) - throws SimExplorerException { + public List<MetaData> findElementsByProperties(Map<String, String> properties, int start, int count, + SortColumn column, SortOrder sortOrder) throws SimExplorerException { List<MetaData> result = null; try { // Get current searcher instance Searcher searcher = getSearcher(); try { - Hits hits = findHits(properties, searcher, dateOrder); + Hits hits = findHits(properties, searcher, column, sortOrder); result = convertHitsToElements(hits, start, count); } finally { // Release searcher instance @@ -516,21 +513,22 @@ /** * Retrieve a Lucene Sort for date sorting. * - * @param dateOrder sort wanted SORT_DATE_NONE, SORT_DATE_DESCENDING, SORT_DATE_ASCENDING, + * @param column the column + * @param sortOrder the sort order * * @return null if no sort */ - private Sort getSortDate(int dateOrder) { + private Sort getSortDate(SortColumn column, SortOrder sortOrder) { Sort sort; - if (dateOrder != SORT_DATE_NONE) { + if (column != SortColumn.None) { SortField[] fields = new SortField[3]; fields[1] = SortField.FIELD_SCORE; fields[2] = SortField.FIELD_DOC; - if (dateOrder == SORT_DATE_DESCENDING) { - fields[0] = new SortField(SORT_DATE_FIELD, SortField.LONG, true); + if (sortOrder == SortOrder.Ascending) { + fields[0] = new SortField(column.getColumn(), column.getType(), true); } else { - fields[0] = new SortField(SORT_DATE_FIELD, SortField.LONG, false); + fields[0] = new SortField(column.getColumn(), column.getType(), false); } sort = new Sort(fields); } else { @@ -544,7 +542,7 @@ */ @Override public List<MetaData> findElementsByContentSearch(String queryText, boolean onlyLatest, int start, int count, - int dateOrder) throws SimExplorerException { + SortColumn column, SortOrder sortOrder) throws SimExplorerException { Query query; try { query = getQueryByContentSearch(queryText, onlyLatest); @@ -559,7 +557,7 @@ // Get current searcher instance Searcher searcher = getSearcher(); try { - hits = searcher.search(query, getSortDate(dateOrder)); + hits = searcher.search(query, getSortDate(column, sortOrder)); // Convert hits to elements result = convertHitsToElements(hits, start, count); } finally { @@ -631,13 +629,15 @@ * * @param properties criteria * @param searcher the searcher - * @param dateOrder the date order + * @param column the column + * @param sortOrder the sort order * * @return Documents and search handle * * @throws IOException Signals that an I/O exception has occurred. */ - private Hits findHits(Map<String, String> properties, Searcher searcher, int dateOrder) throws IOException { + private Hits findHits(Map<String, String> properties, Searcher searcher, SortColumn column, SortOrder sortOrder) + throws IOException { // Create a query with all parameters BooleanQuery query = new BooleanQuery(); for (Entry<String, String> kv : properties.entrySet()) { @@ -645,7 +645,7 @@ } Hits hits; - hits = searcher.search(query, getSortDate(dateOrder)); + hits = searcher.search(query, getSortDate(column, sortOrder)); return hits; } @@ -696,7 +696,11 @@ element.setUuid(document.get(KEY_UUID)); element.setName(document.get(KEY_NAME)); - element.setType(document.get(KEY_TYPE)); + try { + element.setElementClass(Class.forName(document.get(KEY_CLASSNAME))); + } catch (ClassNotFoundException e) { + throw new SimExplorerTechnicalException(e); + } element.setDescription(document.get(KEY_DESCRIPTION)); element.setVersion(document.get(KEY_VERSION)); if ("1".equals(document.get(KEY_LATEST))) { @@ -712,75 +716,9 @@ } element.setHash(document.get(KEY_HASH)); - Map<Integer, KeyValue> descriptors = new HashMap<Integer, KeyValue>(); - Map<Integer, Attachment> attachments = new HashMap<Integer, Attachment>(); + element.setParentUuid(document.get(KEY_PARENT_UUID)); + element.setParentVersion(document.get(KEY_PARENT_VERSION)); - List<Fieldable> fields = document.getFields(); - for (Fieldable fieldable : fields) { - - if (fieldable.name().startsWith(KEY_DESCRIPTOR)) { - String fieldValue = fieldable.stringValue(); - - String key = fieldable.name().replace(KEY_DESCRIPTOR + DOT, ""); - StringTokenizer st = new StringTokenizer(key, DOT); - Integer iDescriptor = Integer.valueOf(st.nextToken()); - - KeyValue kv = descriptors.get(iDescriptor); - if (kv == null) { - kv = new KeyValue(); - descriptors.put(iDescriptor, kv); - } - - if (st.nextToken().equals(KEY_DESCRIPTOR_KEY)) { - kv.setKey(fieldValue); - } else { - kv.setValue(fieldValue); - } - } - - if (fieldable.name().startsWith(KEY_ATTACHMENT)) { - - String fieldValue = fieldable.stringValue(); - - String key = fieldable.name().replace(KEY_ATTACHMENT + DOT, ""); - StringTokenizer st = new StringTokenizer(key, DOT); - Integer iAttachment = Integer.valueOf(st.nextToken()); - - Attachment attachment = attachments.get(iAttachment); - if (attachment == null) { - attachment = new Attachment(); - attachments.put(iAttachment, attachment); - } - - String field = st.nextToken(); - - if (field.equals(KEY_ATTACHMENT_FILENAME)) { - attachment.setFileName(fieldValue); - } - if (field.equals(KEY_ATTACHMENT_HASH)) { - attachment.setDataHash(fieldValue); - } - if (field.equals(KEY_ATTACHMENT_TYPE)) { - attachment.setContentType(ContentTypeFactory.getContentTypeInstance(fieldValue)); - } - } - } - - Map<String, String> finalDescriptors = new HashMap<String, String>(); - for (Map.Entry<Integer, KeyValue> entry : descriptors.entrySet()) { - finalDescriptors.put(entry.getValue().getKey(), entry.getValue().getValue()); - } - element.setDescriptors(finalDescriptors); - - List<Attachment> finalAttachments = new ArrayList<Attachment>(); - for (Map.Entry<Integer, Attachment> entry : attachments.entrySet()) { - finalAttachments.add(entry.getValue()); - } - element.setAttachments(finalAttachments); - - element.setParentVersionUuid(document.get(KEY_PARENTVERSION_UUID)); - element.setParentVersionVersion(document.get(KEY_PARENTVERSION_VERSION)); - return element; } @@ -849,7 +787,7 @@ addSimpleField(document, KEY_UUID_VERSION, getUuidVersion(element.getUuid(), element.getVersion())); addSimpleField(document, KEY_NAME, element.getName()); - addSimpleField(document, KEY_TYPE, element.getType()); + addSimpleField(document, KEY_CLASSNAME, element.getElementClass().getCanonicalName()); addSimpleField(document, KEY_DESCRIPTION, element.getDescription()); if (element.isLatest()) { addSimpleField(document, KEY_LATEST, "1"); @@ -862,29 +800,11 @@ } addSimpleField(document, KEY_HASH, element.getHash()); - Map<String, String> descriptors = element.getDescriptors(); - int i = 0; - for (Map.Entry<String, String> entry : descriptors.entrySet()) { - String key = KEY_DESCRIPTOR + DOT + i; - addSimpleField(document, key + DOT + KEY_DESCRIPTOR_KEY, entry.getKey()); - addSimpleField(document, key + DOT + KEY_DESCRIPTOR_VALUE, entry.getValue()); - i++; + addSimpleField(document, KEY_PARENT_UUID, element.getParentUuid()); + if (element.getParentVersion() != null) { + addSimpleField(document, KEY_PARENT_VERSION, element.getParentVersion().toString()); } - List<Attachment> attachments = element.getAttachments(); - i = 0; - for (Attachment attachment : attachments) { - String key = KEY_ATTACHMENT + DOT + i; - addSimpleField(document, key + DOT + KEY_ATTACHMENT_FILENAME, attachment.getFileName()); - addSimpleField(document, key + DOT + KEY_ATTACHMENT_HASH, attachment.getDataHash()); - addSimpleField(document, key + DOT + KEY_ATTACHMENT_TYPE, attachment.getContentType().getClass() - .getSimpleName()); - i++; - } - - addSimpleField(document, KEY_PARENTVERSION_UUID, element.getParentVersionUuid()); - addSimpleField(document, KEY_PARENTVERSION_VERSION, element.getParentVersionVersion()); - for (Reader reader : readers) { document.add(new Field(KEY_SEARCHABLE_CONTENT, reader)); } Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -20,7 +20,6 @@ import java.io.InputStream; import java.util.List; import java.util.Map; -import java.util.Set; import javax.ejb.Local; @@ -28,6 +27,8 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; /** * The Interface StorageEngine. @@ -86,6 +87,7 @@ * @param token the token * @param fromElement the from element * @param toElement the to element + * * @throws SimExplorerException if any problem while operation */ public abstract void duplicateElementHierarchy(String token, MetaData fromElement, MetaData toElement) @@ -239,15 +241,16 @@ * @param onlyLatest the only latest * @param indexStart the index start * @param count the count - * @param dateOrder the date order * @param token the token + * @param column the column + * @param sortOrder the sort order * * @return the meta data[] * * @throws SimExplorerException the sim explorer storage exception */ public abstract MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, - int dateOrder) throws SimExplorerException; + SortColumn column, SortOrder sortOrder) throws SimExplorerException; /** * Retrieve list of items of type wanted. @@ -256,15 +259,16 @@ * @param onlyLatest the only latest * @param start the start * @param count the count - * @param dateOrder the date order * @param token the token + * @param column the column + * @param sortOrder the sort order * * @return the meta data[] * * @throws SimExplorerException the sim explorer storage exception */ public abstract MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, - int dateOrder) throws SimExplorerException; + SortColumn column, SortOrder sortOrder) throws SimExplorerException; /** * Retrieve number of items of type wanted. Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -17,30 +17,32 @@ * ##% */ package fr.cemagref.simexplorer.is.storage.engine; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; +import fr.cemagref.simexplorer.is.storage.SortColumn; +import fr.cemagref.simexplorer.is.storage.SortOrder; import fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler; import fr.cemagref.simexplorer.is.storage.attachment.FileSystemAttachmentHandler; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; import fr.cemagref.simexplorer.is.storage.util.Config; -import java.io.InputStream; -import java.io.Reader; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - /** * Handle data storage and indexing. - * + * * @author landais */ public class StorageEngineImpl implements StorageEngine { @@ -63,12 +65,10 @@ } /** - * constructor with specified configuration - * <p/> - * default implementations of storage and indexing. - * + * constructor with specified configuration <p/> default implementations of storage and indexing. + * * @param configFile location of config file - * @param prefixKey prefix key to suppress on properties key + * @param prefixKey prefix key to suppress on properties key */ public StorageEngineImpl(String configFile, String prefixKey) { super(); @@ -149,12 +149,10 @@ Reader reader = new StringReader(element.getDescription()); readers.add(reader); } - Map<String, String> descriptors = element.getDescriptors(); - for (Map.Entry<String, String> descriptor : descriptors.entrySet()) { - readers.add(new StringReader(descriptor.getValue())); - } + // FIXME descriptors // Insert element in database + // FIXME separate search database.insertElement(element, readers); } @@ -278,8 +276,9 @@ * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findFullText(java.lang.String, boolean, int, int, int) */ public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, - int dateOrder) throws SimExplorerException { - List<MetaData> elements = database.findElementsByContentSearch(query, onlyLatest, indexStart, count, dateOrder); + SortColumn column, SortOrder sortOrder) throws SimExplorerException { + List<MetaData> elements = database.findElementsByContentSearch(query, onlyLatest, indexStart, count, column, + sortOrder); MetaData[] result; result = elements.toArray(new MetaData[elements.size()]); return result; @@ -289,8 +288,8 @@ * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findElementsByType(java.lang.String, boolean, int, int, int) */ public MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, - int dateOrder) throws SimExplorerException { - List<MetaData> elements = database.findElementsByType(type, onlyLatest, start, count, dateOrder); + SortColumn column, SortOrder sortOrder) throws SimExplorerException { + List<MetaData> elements = database.findElementsByType(type, onlyLatest, start, count, column, sortOrder); MetaData[] result; result = elements.toArray(new MetaData[elements.size()]); return result; @@ -320,10 +319,11 @@ */ public void deleteElement(String token, String uuid, Version version) throws SimExplorerException { MetaData element = getMetadata(token, uuid, version); - List<Attachment> attachments = element.getAttachments(); - for (Attachment attachment : attachments) { - attachmentHandler.deleteData(element, attachment); - } + // FIXME delete attachments + // List<Attachment> attachments = element.getAttachments(); + // for (Attachment attachment : attachments) { + // attachmentHandler.deleteData(element, attachment); + // } database.deleteElement(element); } @@ -331,7 +331,7 @@ /** * Gets the tmp attachment. - * + * * @param id the id * @return the tmp attachment */ Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -17,9 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.storage.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -31,6 +28,9 @@ import java.util.Map; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** The Class Config. */ public class Config { Deleted: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java 2008-02-22 16:49:23 UTC (rev 1197) @@ -1,90 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.storage.util; - -/** - * The Class KeyValue. - */ -public class KeyValue { - - /** The key. */ - private String key; - - /** The value. */ - private String value; - - /** - * Instantiates a new key value. - */ - public KeyValue() { - super(); - } - - /** - * Instantiates a new key value. - * - * @param key - * the key - * @param value - * the value - */ - public KeyValue(String key, String value) { - super(); - this.key = key; - this.value = value; - } - - /** - * Gets the key. - * - * @return the key - */ - public String getKey() { - return key; - } - - /** - * Sets the key. - * - * @param key - * the new key - */ - public void setKey(String key) { - this.key = key; - } - - /** - * Gets the value. - * - * @return the value - */ - public String getValue() { - return value; - } - - /** - * Sets the value. - * - * @param value - * the new value - */ - public void setValue(String value) { - this.value = value; - } - -} Modified: trunk/simexplorer-is/simexplorer-is-storage/src/resources/properties/config.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/resources/properties/config.properties 2008-02-22 16:48:39 UTC (rev 1196) +++ trunk/simexplorer-is/simexplorer-is-storage/src/resources/properties/config.properties 2008-02-22 16:49:23 UTC (rev 1197) @@ -1,4 +1,4 @@ -simexplorer.db=/var/local/simexplorer/db1 -simexplorer.data=/var/local/simexplorer/data1/ +simexplorer.db=/var/local/simexplorer/server-db +simexplorer.data=/var/local/simexplorer/server-data/ simexplorer.optimizeperiod=3600 simexplorer.adminmail=landais at codelutin.com

1 0

r1196 - trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage
by glandais＠users.labs.libre-entreprise.org 22 Feb '08

22 Feb '08

Author: glandais Date: 2008-02-22 16:48:39 +0000 (Fri, 22 Feb 2008) New Revision: 1196 Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortColumn.java trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortOrder.java Log: Enums for sorting Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortColumn.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortColumn.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortColumn.java 2008-02-22 16:48:39 UTC (rev 1196) @@ -0,0 +1,60 @@ +package fr.cemagref.simexplorer.is.storage; + +import org.apache.lucene.search.SortField; + +import fr.cemagref.simexplorer.is.storage.database.DatabaseConstants; + +/** + * The Enum SortColumn. + */ +public enum SortColumn { + /** None. */ + None("", 0), + /** The Date. */ + uuid(DatabaseConstants.KEY_UUID, SortField.STRING), + /** The Date. */ + version(DatabaseConstants.KEY_VERSION, SortField.STRING), + /** The Date. */ + name(DatabaseConstants.KEY_NAME, SortField.STRING), + /** The Date. */ + description(DatabaseConstants.KEY_DESCRIPTION, SortField.STRING), + /** The Date. */ + creationDate(DatabaseConstants.KEY_CREATIONDATE, SortField.LONG), + /** The Date. */ + elementClass(DatabaseConstants.KEY_CLASSNAME, SortField.STRING); + + /** The column. */ + private String column; + + /** The type. */ + private int type; + + /** + * Gets the column. + * + * @return the column + */ + public String getColumn() { + return column; + } + + /** + * Gets the type. + * + * @return the type + */ + public int getType() { + return type; + } + + /** + * Instantiates a new sort column. + * + * @param column the column + * @param type the type + */ + private SortColumn(String column, int type) { + this.column = column; + this.type = type; + } +} \ No newline at end of file Added: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortOrder.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortOrder.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/SortOrder.java 2008-02-22 16:48:39 UTC (rev 1196) @@ -0,0 +1,13 @@ +package fr.cemagref.simexplorer.is.storage; + +/** + * The Enum SortOrder. + */ +public enum SortOrder { + + /** The Ascending. */ + Ascending, + + /** The Descending. */ + Descending; +} \ No newline at end of file

1 0