- Echobase-commits - mailman.cloud.codelutin.com

r439 - trunk
by tchemit＠users.forge.codelutin.com 29 Mar '12

29 Mar '12

Author: tchemit Date: 2012-03-29 12:00:37 +0200 (Thu, 29 Mar 2012) New Revision: 439 Url: http://forge.codelutin.com/repositories/revision/echobase/439 Log: use topia 2.6.9 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-28 18:26:53 UTC (rev 438) +++ trunk/pom.xml 2012-03-29 10:00:37 UTC (rev 439) @@ -126,7 +126,7 @@  <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.8</topiaVersion> + <topiaVersion>2.6.9</topiaVersion> <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10</nuitonWebVersion>

1 0

r438 - in trunk/echobase-tools: . src/test/java/fr/ifremer/echobase/tools
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 20:26:53 +0200 (Wed, 28 Mar 2012) New Revision: 438 Url: http://forge.codelutin.com/repositories/revision/echobase/438 Log: use last version of legacy datas Modified: trunk/echobase-tools/pom.xml trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-03-28 18:09:06 UTC (rev 437) +++ trunk/echobase-tools/pom.xml 2012-03-28 18:26:53 UTC (rev 438) @@ -196,14 +196,14 @@ <profile> <activation> <file> - <exists>src/test/private/echobase-2012-03-20</exists> + <exists>src/test/private/echobase-2012-03-28</exists> </file> </activation> <id>echobase-csv-inputs</id> <build> <testResources> <testResource> - <directory>src/test/private/echobase-2012-03-20</directory> + <directory>src/test/private/echobase-2012-03-28</directory> <includes> <include>**/*.csv</include> </includes> Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-03-28 18:09:06 UTC (rev 437) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-03-28 18:26:53 UTC (rev 438) @@ -57,7 +57,7 @@ protected static final long timestamp = System.currentTimeMillis(); /** La version du jeux de données utilisé. */ - public static final String ECHOBASE_CSV_VERSION = "2012-03-20"; + public static final String ECHOBASE_CSV_VERSION = "2012-03-28"; public static File getBasedir() { if (basedir == null) {

1 0

r437 - in trunk: echobase-entities/src/main/resources/i18n echobase-services/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 20:09:06 +0200 (Wed, 28 Mar 2012) New Revision: 437 Url: http://forge.codelutin.com/repositories/revision/echobase/437 Log: update i18n Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties 2012-03-28 18:00:58 UTC (rev 436) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties 2012-03-28 18:09:06 UTC (rev 437) @@ -74,7 +74,6 @@ echobase.common.echosounderSoundSpeed= echobase.common.echotype= echobase.common.echotypeCategory= -echobase.common.eiThreshold= echobase.common.email= echobase.common.endDate= echobase.common.endLocality= @@ -178,8 +177,6 @@ echobase.common.precision= echobase.common.principalInvestigator= echobase.common.principalInvestigatorEmail= -echobase.common.processedAge= -echobase.common.processedLength= echobase.common.processingDescription= echobase.common.processingMethod= echobase.common.processingSoftwareVersion= Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-03-28 18:00:58 UTC (rev 436) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-03-28 18:09:06 UTC (rev 437) @@ -74,7 +74,6 @@ echobase.common.echosounderSoundSpeed= echobase.common.echotype= echobase.common.echotypeCategory= -echobase.common.eiThreshold= echobase.common.email=Courriel echobase.common.endDate= echobase.common.endLocality= @@ -178,8 +177,6 @@ echobase.common.precision= echobase.common.principalInvestigator=Chercheur echobase.common.principalInvestigatorEmail=Courriel du chercheur -echobase.common.processedAge= -echobase.common.processedLength= echobase.common.processingDescription= echobase.common.processingMethod= echobase.common.processingSoftwareVersion= Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-03-28 18:00:58 UTC (rev 436) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-03-28 18:09:06 UTC (rev 437) @@ -1,5 +1,4 @@ echobase.common.biometrySampleFile= -echobase.common.cellMapResultFile= echobase.common.cellMapsFile= echobase.common.cellPositionReference.end= echobase.common.cellPositionReference.mid= Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-03-28 18:00:58 UTC (rev 436) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-03-28 18:09:06 UTC (rev 437) @@ -1,5 +1,4 @@ echobase.common.biometrySampleFile=Fichier BiometrySample -echobase.common.cellMapResultFile=Fichier de résultats de cellules Carte echobase.common.cellMapsFile=Fichier des cellules Cartes echobase.common.cellPositionReference.end=Fin echobase.common.cellPositionReference.mid=Milieu

1 0

r436 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 20:00:58 +0200 (Wed, 28 Mar 2012) New Revision: 436 Url: http://forge.codelutin.com/repositories/revision/echobase/436 Log: i18n revert Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-28 17:56:01 UTC (rev 435) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-28 18:00:58 UTC (rev 436) @@ -36,7 +36,7 @@ echobase.error.warlocation.notFound=War not found at location %s echobase.info.import.failed=L'import a échoué. echobase.info.import.succeded= -echobase.info.new.sqlQuery.inprogress=\=New query creation in progress +echobase.info.new.sqlQuery.inprogress=New query creation in progress echobase.info.no.sqlQuery.saved= echobase.info.no.sqlQuery.selected= echobase.info.no.table.selected= @@ -47,7 +47,7 @@ echobase.info.user.update= echobase.information.mission.created= echobase.label.exportAsSeen=Export as seen on screen -echobase.legend.dbeditor.show=Visualisation de '%s' +echobase.legend.dbeditor.show=Detail of '%s' echobase.legend.importData.result.resume=Résultat echobase.legend.libreOfficeQuery=Requète "libre office" echobase.menu.editData=Modify datas Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-28 17:56:01 UTC (rev 435) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-28 18:00:58 UTC (rev 436) @@ -1,25 +1,258 @@ -echobase.error.bad.password= -echobase.error.email.already.used= -echobase.error.invalid.sql= -echobase.error.login.unknown= -echobase.error.mission.name.already.exist= -echobase.error.no.embeddedApplication.configurationFound= -echobase.error.no.embeddedApplication.exportFileFound= -echobase.error.no.exportDb.configurationFound= -echobase.error.no.exportDb.exportFileFound= -echobase.error.query.name.already.exists= -echobase.error.required.email= -echobase.error.required.password= -echobase.error.warlocation.notFound= -echobase.info.import.failed= -echobase.info.import.succeded= -echobase.info.new.sqlQuery.inprogress= -echobase.info.no.sqlQuery.saved= -echobase.info.no.sqlQuery.selected= -echobase.info.no.table.selected= -echobase.info.no.voyagee.found= -echobase.info.sqlQuery.not.modifiable= -echobase.info.user.create= -echobase.info.user.delete= -echobase.info.user.update= -echobase.information.mission.created= +echobase.action.applySqlQuery=Appliquer la requête +echobase.action.backToUserList=Retour à la liste des utilisateurs +echobase.action.cancel=Annuler +echobase.action.cloneSqlQuery=Cloner +echobase.action.configureImport=Configurer l'import +echobase.action.create=Créer +echobase.action.createEmbeddedApplication=Créer l'application +echobase.action.createMission=Créer la mission +echobase.action.createNewMission=Créer une nouvelle mission +echobase.action.createSqlQuery=Enregistrer +echobase.action.delete=Suppression +echobase.action.deleteSqlQuery=Supprimer +echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée +echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complête +echobase.action.export=Exporter +echobase.action.exportSqlData=Exporter les données +echobase.action.exportTable=Exporter +echobase.action.generateSqlQuery=Générer la requète +echobase.action.import=Importer +echobase.action.importTable=Importer +echobase.action.locale.english=Anglais +echobase.action.locale.french=Français +echobase.action.login=Connection +echobase.action.logout=Déconnexion +echobase.action.newLibreOfficeQuery=Nouvelle requète Libre office +echobase.action.newQuery=Nouvelle requète +echobase.action.reloadSqlQuery=Recharger +echobase.action.reset=Annuler +echobase.action.return=Retour +echobase.action.save=Sauvegarder +echobase.action.saveSqlQuery=Mettre à jour +echobase.action.toEnglish=Utiliser la version anglaise +echobase.action.toFrench=Utiliser la version française +echobase.action.usingEnglish=Version anglaise utilisé +echobase.action.usingFrench=Version française utilisé +echobase.common.acousticDensityUnit=acousticDensityUnit +echobase.common.acquisitionSoftwareVersionER60=acquisitionSoftwareVersion (ER60 instrument) +echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) +echobase.common.addDataAcquisition=Toujours créer des DataAcqusitions +echobase.common.admin=Administrateur +echobase.common.cellPositionReference=cellPositionReference +echobase.common.digitThreshold=digitThreshold +echobase.common.echosounderSoundSpeed=echosounderSoundSpeed +echobase.common.email=Email +echobase.common.entityType=Type d'entité +echobase.common.importDataMode=Type d'import +echobase.common.importError=Message d'erreur +echobase.common.importFileName=Nom du fichier importé +echobase.common.importMode=Type d'import +echobase.common.importResult=Résultat de l'import +echobase.common.inProgress=en cours... +echobase.common.jdbcLogin=Login de connexion +echobase.common.jdbcPassword=Mot de passe +echobase.common.jdbcUrl=Url de connexion +echobase.common.loggedDataDatatype=loggedDataDatatype +echobase.common.loggedDataFormat=loggedDataFormat +echobase.common.nbCreatedObjects=Nombre d'objets crées +echobase.common.notes=notes +echobase.common.password=Mot de passe +echobase.common.pingDutyCycle=pingDutyCycle +echobase.common.processingDescription=processingDescription +echobase.common.processingTemplate=processingTemplate +echobase.common.resultLabel=Result label +echobase.common.soundSpeedCalculationsER60=soundSpeedCalculations (ER60 instrument) +echobase.common.soundSpeedCalculationsME70=soundSpeedCalculations (ME70 instrument) +echobase.common.sounderConstant=sounderConstant +echobase.common.transceiverAcquisitionAbsorptionDescription=transceiverAcquisitionAbsorptionDescription +echobase.common.transectBinUnitsPingAxis=BinUnitsPingAxis (transect) +echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) +echobase.common.transectLicence=Licence (transect) +echobase.common.transitRelatedActivity=RelatedActivity (transit) +echobase.common.user=Utilisateur +echobase.common.voyageDescription=Description +echobase.confirm.delete.query=Confirmer la suppression de la requète suivante +echobase.error.bad.password=Mot de passe incorrrect +echobase.error.email.already.used=Nom d'utilisateur déjà pris +echobase.error.export.description.requiredstring=La description de l'export est obligatoire +echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire +echobase.error.export.sqlQuery.forbidden.alter.word=La requète contient le mot 'ALTER', ce qui est interdit +echobase.error.export.sqlQuery.forbidden.delete.word=La requète contient le mot 'DELETE', ce qui est interdit +echobase.error.export.sqlQuery.forbidden.drop.word=La requète contient le mot 'DROP', ce qui est interdit +echobase.error.export.sqlQuery.forbidden.insert.word=La requète contient le mot 'INSERT', ce qui est interdit +echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit +echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire +echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide +echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné +echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné +echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné +echobase.error.import.areaOfOperation.required=La sélection d'une zone d'opération est obligatoire +echobase.error.import.biometrySampleFile.required=La sélection d'un fichier BiometrySample est obligatoire +echobase.error.import.cellPositionReference.required=La sélection d'un cellPositionReference est obligatoire +echobase.error.import.datum.required=Datum de la campagne non rengeigné +echobase.error.import.digitThreshold.required=digitThreshold non renseigné +echobase.error.import.echosounderSoundSpeed.required=echosounderSoundSpeed non renseigné +echobase.error.import.echotypeFile.required=La sélection d'un fichier Echotype est obligatoire +echobase.error.import.esduByEchotypeAndSpeciesCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.esduByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.esduBySpeciesAndAgeCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.esduBySpeciesAndSizeCategoryFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.gearMetadataFile.required=La sélection d'un fichier GearMetadata est obligatoire +echobase.error.import.importMode.required=Le mode d'import est obligatoire +echobase.error.import.lengthWeightKeyFile.required=La sélection d'un fichier lengthWeightKey est obligatoire +echobase.error.import.loggedDataDatatype.required=loggedDataDatatype non renseigné +echobase.error.import.loggedDataFormat.required=loggedDataFormat non renseigné +echobase.error.import.mapResultFile.required=La sélection d'un fichier de résultats de Carte est obligatoire +echobase.error.import.mapsFile.required=La sélection d'un fichier Carte est obligatoire +echobase.error.import.mission.required=La sélection d'une mission est obligatoire +echobase.error.import.missionAbstract.required=Le résumé de la mission est obligatoire +echobase.error.import.missionName.required=Le nom de la mission est obligatoire +echobase.error.import.moviesFile.required=La sélection d'un fichier Movies est obligatoire +echobase.error.import.notes.required=Note des DataProcessing non renseigné +echobase.error.import.operationFile.required=La sélection d'un fichier Operation est obligatoire +echobase.error.import.operationMetadataFile.required=La sélection d'un fichier OperationMetadata est obligatoire +echobase.error.import.pingDutyCycle.required=pingDutyCycle non renseigné +echobase.error.import.processingDescription.required=processingDescription non renseigné +echobase.error.import.processingTemplate.required=processingTemplate non renseigné +echobase.error.import.regionAssociationFile.required=La sélection d'un fichier d'association de Région est obligatoire +echobase.error.import.regionResultFile.required=La sélection d'un fichier de résultats de Région est obligatoire +echobase.error.import.regionsFile.required=La sélection d'un fichier Region est obligatoire +echobase.error.import.resultImportFile.required=Veuillez sélectionner au moins un fichier à importer +echobase.error.import.resultLabel.required=Le champs ResultLabel est obligatoire +echobase.error.import.soundSpeedCalculationsER60.required=soundSpeedCalculationsER60 non renseigné +echobase.error.import.soundSpeedCalculationsME70.required=soundSpeedCalculationsME70 non renseigné +echobase.error.import.sounderConstant.required=sounderConstant non renseigné +echobase.error.import.subSampleFile.required=La sélection d'un fichier SubSample est obligatoire +echobase.error.import.totalSampleFile.required=La sélection d'un fichier Sample est obligatoire +echobase.error.import.transceiverAcquisitionAbsorptionDescription.required=transceiverAcquisitionAbsorptionDescription non renseigné +echobase.error.import.transectBinUnitsPingAxis.required=BinUnitsPingAxis des transtects non rengeigné +echobase.error.import.transectFile.required=La sélection d'un fichier Transect est obligatoire +echobase.error.import.transectGeospatialVerticalPositive.required=GeospatialVerticalPositive des transtects non rengeigné +echobase.error.import.transectLicence.required=Licence des transtects non rengeigné +echobase.error.import.transit.required=La sélection d'un transit est obligatoire +echobase.error.import.transitFile.required=La sélection d'un fichier Transit est obligatoire +echobase.error.import.transitRelatedActivity.required=RelatedActivity des transits non rengeigné +echobase.error.import.vessel.required=La sélection d'un navire est obligatoire +echobase.error.import.voyage.required=La sélection d'une campagne est obligatoire +echobase.error.import.voyageDescription.required=Description de la campagne non rengeigné +echobase.error.import.voyageFile.required=La sélection d'un fichier Voyage est obligatoire +echobase.error.importFile.required=Fichier d'import obligatoire +echobase.error.importHistorical.input.required=Le fichier d'import est obligatoire +echobase.error.invalid.sql=Requète non valide \: %s +echobase.error.login.unknown=Utilisateur inconnu +echobase.error.login.wrongLogin=Le login est déjà utilisé +echobase.error.mission.name.already.exist=Nom de mission déjà utilisé +echobase.error.no.embeddedApplication.configurationFound=La configuration de création d'application embarquée non trouvée +echobase.error.no.embeddedApplication.exportFileFound=L'application embarquée générée non trouvée +echobase.error.no.exportDb.configurationFound=La configuration de l'export de la base non trouvée +echobase.error.no.exportDb.exportFileFound=L'archive d'export de la base non trouvée +echobase.error.query.name.already.exists=Nom de requète déjà utilisé +echobase.error.required.email=L'email est obligatoire +echobase.error.required.password=Le mot de passe est obligatoire +echobase.error.warlocation.notFound=L'application n'a pas été trouvé à l'emplacement suivant %s +echobase.header.request.result=Résultat de la requête sql +echobase.header.user.gridTitle=Liste des utilisateurs +echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données +echobase.info.import.failed=L'import a échoué. +echobase.info.import.succeded=L'import a réussi. +echobase.info.new.sqlQuery.inprogress=Nouvelle requète en cours de création +echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistrée +echobase.info.no.sqlQuery.selected=Aucune requête d'export sql sélectionnée +echobase.info.no.table.selected=Aucune table sélectionnée +echobase.info.no.voyagee.found=Aucune campagne à exporter +echobase.info.sqlQuery.not.modifiable=Vous ne pouvez pas modifier la requète sélectionnée +echobase.info.user.create=L'utilisateur '%s' a été créée +echobase.info.user.delete=L'utilisateur '%s' a été supprimé +echobase.info.user.update=L'utilisateur '%s' a été mis à jour +echobase.information.create.mission=Si la mission n'existe, suivez le lien pour en créer une nouvelle. +echobase.information.mission.created=La mission %s a été créée +echobase.label.admin.user.create=Création d'un utilisateur +echobase.label.admin.user.delete=Suppression d'un utilisateur +echobase.label.admin.user.edit=Mise à jour d'un utilisateur +echobase.label.createIfNotFound=Créer les entités non trouvées en base +echobase.label.embeddedApplicationFileName=Nom de l'archive à télécharger +echobase.label.embeddedWarFileName=Nom du war à utiliser +echobase.label.exportAsSeen=Exporter "comme à l'écran" +echobase.label.exportDbFileName=Nom du fichier d'export +echobase.label.exportFileName=Nom du fichier d'export +echobase.label.import.accoustique=Fichier accoustique +echobase.label.import.events=Fichier evenements +echobase.label.import.lectureAgeGen=Fichier lecture age +echobase.label.import.pecherie=Fichier pecherie +echobase.label.import.typeEchoSpecies=Fichier espèces +echobase.label.importFile=Fichier à importer +echobase.label.info.changePassword=Changement du mot de passe +echobase.label.language=Language +echobase.label.locale.english=Anglais +echobase.label.locale.french=Français +echobase.label.login=Connexion +echobase.label.numberOfCreatedEntities=Nombre d'entitiés créées +echobase.label.numberOfUpdatedEntities=Nombre d'entitiés mises à jour +echobase.label.query.description=Description +echobase.label.query.name=Nom +echobase.label.query.sql=SQL +echobase.label.sqlQueries=Requêtes enregistrées +echobase.label.user.login=Utilisateur \: %s +echobase.label.voyageToSelect=Voyage à exporter +echobase.legend.connectionToDb.detail=Détail de la connection à la base de données +echobase.legend.dbeditor.edit=Edition de '%s' +echobase.legend.dbeditor.show=Visualisation de '%s' +echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée +echobase.legend.exportDb.configuration.files=Configuration de l'export +echobase.legend.importData.configuration.files=Choix des fichiers d'import +echobase.legend.importData.configuration.mission=Configurer la mission +echobase.legend.importData.configuration.mission.resume=Résumé de la mission à utiliser +echobase.legend.importData.configuration.resume=Résumé de la configuration d'import +echobase.legend.importData.configuration.selectImportType=Sélection du type d'import +echobase.legend.importData.configure=Configurer l'import +echobase.legend.importData.configure.CommonData.selectMission=Sélection de la mission +echobase.legend.importData.createMission=Caractéristiques de la nouvelle mission +echobase.legend.importData.result.resume=Résultat +echobase.legend.importDb.configuration.files=Choix du fichier d'import de la base complête (fichier zip) +echobase.legend.importFileResult=Résultat de l'import %s +echobase.legend.libreOfficeQuery=Requète "libre office" +echobase.legend.sqlQuery.configuration=Configuration de la requête +echobase.legend.sqlQuery.result=Résultats de la requête +echobase.menu.connectToDbInformations=Informations de connection à la base de données +echobase.menu.createEmbeddedApplication=Créer une application embarquée +echobase.menu.editData=Modifier les données +echobase.menu.export=Exporter des données +echobase.menu.exportDb=Exporter une base complête +echobase.menu.importData=Importer des données +echobase.menu.importDb=Importer une base complête +echobase.menu.logs=Journal des modifications +echobase.menu.users=Gérer les utilisateurs +echobase.menu.viewData=Visualiser les données +echobase.message.askAdministratorPassword=Demander à un administrateur le mot de passe pour l'utilisateur donné +echobase.message.no.row.selected=Aucune donnée sélectionnée +echobase.message.noEntrySelection=Aucune entrée sélectionnée +echobase.message.warnEmbeddedApplicationInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de la création de l'application embarquée. +echobase.message.warnExportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'export. +echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. +echobase.title.confirm.deleteQuery=Supprimer une requète +echobase.title.connectToDbInformations=Informations de connection à la base de données +echobase.title.createEmbeddedApplication=Création de l'application embarquée +echobase.title.createMission=Créer une mission +echobase.title.dbEditor=Modification de la base +echobase.title.embeddedApplicationProgress=Création de l'application embarquée en cours +echobase.title.embeddedApplicationResult=Résultat de la création de l'application embarquée +echobase.title.entityModificationLogs=Journal des modifications +echobase.title.export=Export Sql +echobase.title.exportDb=Export complet de la base +echobase.title.exportDbProgress=Export complêt de la base de données en cours +echobase.title.exportDbResult=Résultat de l'export complêt de la base de données +echobase.title.exportTable=Exporter une table +echobase.title.importData=Import de données +echobase.title.importData.configuration=Configuration d'un import de données +echobase.title.importData.selectImportType=Sélection du type d'import +echobase.title.importDataProgress=Import de données en cours +echobase.title.importDataResult=Résultats de l'import de données +echobase.title.importDb=Import de données historiques +echobase.title.importDbProgress=Import de données en cours +echobase.title.importDbResult=Résultats de l'import de données +echobase.title.importTable=Importer une table +echobase.title.login=Connexion +echobase.title.modification.detail=Détail de la modification +echobase.title.newLibreOfficeQuery=Importer une requète Libre-office +echobase.title.users=Adminitration des utilisateurs +echobase.title.welcome=Bienvenue dans EchoBase

1 0

r435 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata: . csv
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 19:56:01 +0200 (Wed, 28 Mar 2012) New Revision: 435 Url: http://forge.codelutin.com/repositories/revision/echobase/435 Log: last modif on import api Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-03-28 17:56:01 UTC (rev 435) @@ -35,6 +35,9 @@ import fr.ifremer.echobase.entities.EntityModificationLog; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.CategoryDAO; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Data; +import fr.ifremer.echobase.entities.data.DataDAO; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.DataMetadata; @@ -347,4 +350,18 @@ } return result; } + + protected void createCellData(DataDAO dao, + Cell cell, + DataMetadata dataMetaData, + String dataValue, + CsvFileImportResult importResult) { + + Data data = create(dao); + data.setDataMetadata(dataMetaData); + data.setDataValue(dataValue); + cell.addData(data); + + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data); + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-03-28 17:56:01 UTC (rev 435) @@ -336,7 +336,6 @@ metas); - DecoratorService decoratorService = getService(DecoratorService.class); Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java 2012-03-28 17:56:01 UTC (rev 435) @@ -75,9 +75,6 @@ /** Map cells file to import. */ protected final InputFile mapsFile; - /** Map cell results file to import. */ - protected final InputFile mapResultFile; - /** Echotype file to import. */ protected final InputFile echotypeFile; @@ -96,8 +93,6 @@ l_(locale, "echobase.common.cellRegionResultFile")); mapsFile = InputFile.newFile( l_(locale, "echobase.common.cellMapsFile")); - mapResultFile = InputFile.newFile( - l_(locale, "echobase.common.cellMapResultFile")); echotypeFile = InputFile.newFile( l_(locale, "echobase.common.echotypeFile")); lengthAgeKeyFile = InputFile.newFile( @@ -162,10 +157,6 @@ return mapsFile; } - public InputFile getMapResultFile() { - return mapResultFile; - } - public InputFile getEchotypeFile() { return echotypeFile; } @@ -198,7 +189,7 @@ public InputFile[] getInputFiles() { return new InputFile[]{regionsFile, regionAssociationFile, regionResultFile, - mapsFile, mapResultFile, echotypeFile, + mapsFile, echotypeFile, lengthAgeKeyFile, lengthWeightKeyFile, esduByEchotypeFile, esduByEchotypeAndSpeciesCategoryFile, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-03-28 17:56:01 UTC (rev 435) @@ -376,20 +376,4 @@ closeReader(reader, inputFile); } } - - private void createCellData(DataDAO dao, - Cell cell, - DataMetadata dataMetaData, - String dataValue, - CsvFileImportResult importResult) { - - Data data = create(dao); - data.setDataMetadata(dataMetaData); - data.setDataValue(dataValue); - cell.addData(data); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data); - } - - } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-03-28 17:56:01 UTC (rev 435) @@ -70,7 +70,7 @@ String name = metadata.getName(); newMandatoryColumn( name, - EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.newResultValueParser(metadata, false), EchobaseCsvUtil.<EsduResultByEchotypeAndSpeciesCategoryImportRow>newResultValueSetter()); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-03-28 17:56:01 UTC (rev 435) @@ -62,7 +62,7 @@ String name = metadata.getName(); newMandatoryColumn( name, - EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.newResultValueParser(metadata, false), EchobaseCsvUtil.<EsduResultByEchotypeImportRow>newResultValueSetter()); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-03-28 17:56:01 UTC (rev 435) @@ -66,7 +66,7 @@ String name = metadata.getName(); newMandatoryColumn( name, - EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.newResultValueParser(metadata, false), EchobaseCsvUtil.<EsduResultBySpeciesAndAgeCategoryImportRow>newResultValueSetter()); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-03-28 17:56:01 UTC (rev 435) @@ -66,7 +66,7 @@ String name = metadata.getName(); newMandatoryColumn( name, - EchobaseCsvUtil.newResultValueParser(metadata), + EchobaseCsvUtil.newResultValueParser(metadata, false), EchobaseCsvUtil.<EsduResultBySpeciesAndSizeCategoryImportRow>newResultValueSetter()); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java 2012-03-28 17:55:12 UTC (rev 434) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java 2012-03-28 17:56:01 UTC (rev 435) @@ -68,10 +68,9 @@ newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); for (DataMetadata metadata : dataMetadatas) { - String name = metadata.getName(); newMandatoryColumn( - name, - EchobaseCsvUtil.newResultValueParser(metadata), + metadata.getName(), + EchobaseCsvUtil.newResultValueParser(metadata, true), EchobaseCsvUtil.<RegionCellResultImportRow>newResultValueSetter()); } }

1 0

r434 - trunk/src/doc/reunions
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 19:55:12 +0200 (Wed, 28 Mar 2012) New Revision: 434 Url: http://forge.codelutin.com/repositories/revision/echobase/434 Log: update doc Modified: trunk/src/doc/reunions/reunion-2012-03-29.txt Modified: trunk/src/doc/reunions/reunion-2012-03-29.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-03-29.txt 2012-03-28 17:54:51 UTC (rev 433) +++ trunk/src/doc/reunions/reunion-2012-03-29.txt 2012-03-28 17:55:12 UTC (rev 434) @@ -30,6 +30,7 @@ On a pas utiliser les dataProcessing.id ? J'ai renommé les colonne des datas dans Map (minuscule sur première lettre) +et ageCategory ? oubli ou pas a utiliser (map import) Suppression des résultats -------------------------

1 0

r433 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/importdata echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 19:54:51 +0200 (Wed, 28 Mar 2012) New Revision: 433 Url: http://forge.codelutin.com/repositories/revision/echobase/433 Log: do last import : Map Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-03-28 17:53:48 UTC (rev 432) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-03-28 17:54:51 UTC (rev 433) @@ -32,19 +32,24 @@ import fr.ifremer.echobase.csv.EchoBaseImport; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Category; +import fr.ifremer.echobase.entities.data.CategoryDAO; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellDAO; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.DataDAO; +import fr.ifremer.echobase.entities.data.Result; +import fr.ifremer.echobase.entities.data.ResultDAO; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.SpeciesCategory; +import fr.ifremer.echobase.entities.references.SpeciesCategoryDAO; import fr.ifremer.echobase.services.ImportException; import fr.ifremer.echobase.services.importdata.csv.MapCellImportModel; import fr.ifremer.echobase.services.importdata.csv.MapCellImportRow; -import fr.ifremer.echobase.services.importdata.csv.MapCellResultImportModel; -import fr.ifremer.echobase.services.importdata.csv.MapCellResultImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.ImportRuntimeException; @@ -77,30 +82,16 @@ public List<CsvFileImportResult> startImport(ResultsImportConfiguration configuration, EchoBaseUser user) throws ImportException { - List<CsvFileImportResult> result = Lists.newLinkedList(); - // get selected voyage Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); InputFile inputFile = configuration.getMapsFile(); - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapFile( - configuration, - inputFile, voyage); + CsvFileImportResult importResult = importMapFile( + configuration, inputFile, voyage); - addResultAndLog(result, inputFile, - importResult, user); - } - inputFile = configuration.getMapResultFile(); - if (inputFile.hasFile()) { - CsvFileImportResult importResult = importMapResultFile( - configuration, - inputFile, voyage); - - addResultAndLog(result, inputFile, importResult, user); - } - + List<CsvFileImportResult> result = Lists.newLinkedList(); + addResultAndLog(result, inputFile, importResult, user); return result; } @@ -108,41 +99,67 @@ InputFile inputFile, Voyage voyage) throws ImportException { + String resultLabel = configuration.getResultLabel(); + CellType cellType = getEntityByProperty( CellType.class, CellType.PROPERTY_ID, "Map"); Preconditions.checkNotNull(cellType); - DataMetadata dataXMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "LongitudeEnd"); - Preconditions.checkNotNull(dataXMeta); + DataMetadata dataLongitudeMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "GridCellLongitude"); + Preconditions.checkNotNull(dataLongitudeMeta); - DataMetadata dataYMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "LatitudeEnd"); - Preconditions.checkNotNull(dataYMeta); + DataMetadata dataLatitudeMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "GridCellLatitude"); + Preconditions.checkNotNull(dataLatitudeMeta); - DataMetadata dataDepthSurfaceMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefSurfaceEnd"); - Preconditions.checkNotNull(dataDepthSurfaceMeta); + DataMetadata dataDepthMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "GridCellDepth"); + Preconditions.checkNotNull(dataDepthMeta); - DataMetadata dataDepthBottomMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "DepthRefBottomEnd"); - Preconditions.checkNotNull(dataDepthBottomMeta); + DataMetadata dataLongitudeLagMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "GridLongitudeLag"); + Preconditions.checkNotNull(dataLongitudeLagMeta); - DataMetadata dataSurfaceMeta = getEntityByProperty( - DataMetadata.class, DataMetadata.PROPERTY_NAME, "Surface"); - Preconditions.checkNotNull(dataSurfaceMeta); + DataMetadata dataLatitudeLagMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "GridLatitudeLag"); + Preconditions.checkNotNull(dataLatitudeLagMeta); + DataMetadata dataDepthLagMeta = getEntityByProperty( + DataMetadata.class, DataMetadata.PROPERTY_NAME, "GridDepthLag"); + Preconditions.checkNotNull(dataDepthLagMeta); + // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( voyage), EchoBaseFunctions.VOYAGE_NAME); - Map<String, DepthStratum> depthStratumMap = getEntitiesMap( - DepthStratum.class, - EchoBaseFunctions.DEPTH_STRATUM_ID); + Map<String, Species> speciesMap = getEntitiesMap( + Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Map<String, SizeCategory> sizeCategoryMap = Maps.newTreeMap(); + sizeCategoryMap.putAll(getEntitiesMap( + SizeCategory.class, EchoBaseFunctions.SIZE_CATEGORY_NAME)); + + Map<String, DataMetadata> dataMetadataMap = getEntitiesMap( + DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); + + // first get header of file to detect which results to import + String[] header = EchoBaseImport.getHeader(inputFile.getFile(), + getCsvSeparator()); + + + List<DataMetadata> metas = getMetas( + MapCellImportModel.COLUMN_NAMES_TO_EXCLUDE, + dataMetadataMap, + header); + MapCellImportModel csvModel = new MapCellImportModel( - serviceContext.getConfiguration().getCsvSeparator(), cellType, - voyageMap, depthStratumMap); + serviceContext.getConfiguration().getCsvSeparator(), + cellType, + voyageMap, + speciesMap, + sizeCategoryMap, + metas); if (log.isInfoEnabled()) { log.info("Starts import of Map cells from file " + @@ -153,8 +170,14 @@ inputFile.getFileName()); CellDAO dao = getDAO(Cell.class, CellDAO.class); + DataDAO dataDao = getDAO(Data.class, DataDAO.class); + ResultDAO resultDao = getDAO(Result.class, ResultDAO.class); + SpeciesCategoryDAO speciesCategoryDAO = + getDAO(SpeciesCategory.class, SpeciesCategoryDAO.class); + CategoryDAO categoryDAO = getDAO(Category.class, CategoryDAO.class); + Reader reader = getInputFileReader(inputFile); try { EchoBaseImport<MapCellImportRow> importer = @@ -162,111 +185,85 @@ configuration.incrementsProgression(); - int rowNumber = 0; for (MapCellImportRow row : importer) { - rowNumber++; configuration.incrementsProgression(); - //TODO Do me - Cell cell = create(dao, row.getCell()); voyage.addPostCell(cell); importResult.incrementsNumberCreated(EchoBaseEntityEnum.Cell); + + // add gridCellLongitude data createCellData(dataDao, cell, - dataXMeta, - String.valueOf(row.getDataX()), + dataLongitudeMeta, + String.valueOf(row.getGridCellLongitude()), importResult ); + // add gridCellLatitude data createCellData(dataDao, cell, - dataYMeta, - String.valueOf(row.getDataY()), + dataLatitudeMeta, + String.valueOf(row.getGridCellLatitude()), importResult ); - String depthStratumId = row.getDepthStratum().getId(); + // add gridCellDepth data + createCellData(dataDao, + cell, + dataDepthMeta, + String.valueOf(row.getGridCellDepth()), + importResult + ); - DataMetadata depth = null; - - if ("SURF".equals(depthStratumId)) { - - depth = dataDepthSurfaceMeta; - } else if ("CLAS".equals(depthStratumId)) { - depth = dataDepthBottomMeta; - - } else { - throw new ImportException( - "[Line " + rowNumber + - "] Depth stratum should be 'SURF' or 'CLAS', " + - "but was " + depthStratumId); - } - + // add gridLongitudeLag data createCellData(dataDao, cell, - depth, - String.valueOf(row.getDataZ()), + dataLongitudeLagMeta, + String.valueOf(row.getGridLongitudeLag()), importResult ); + // add gridLatitudeLag data createCellData(dataDao, cell, - dataSurfaceMeta, - String.valueOf(row.getDataLag()), + dataLatitudeLagMeta, + String.valueOf(row.getGridLatitudeLag()), importResult ); + // add gridDepthLag data createCellData(dataDao, cell, - dataSurfaceMeta, - String.valueOf(row.getDataValue()), + dataDepthLagMeta, + String.valueOf(row.getGridDepthLag()), importResult ); - } - return importResult; - } catch (ImportRuntimeException e) { - throw new ImportException(getLocale(), inputFile, e); - } finally { - closeReader(reader, inputFile); - } - } + List<Result> results = row.getResult(); - protected CsvFileImportResult importMapResultFile(ResultsImportConfiguration configuration, - InputFile inputFile, - Voyage voyage) throws ImportException { - MapCellResultImportModel csvModel = new MapCellResultImportModel( - serviceContext.getConfiguration().getCsvSeparator()); + Category category = getResultCategory(categoryDAO, + speciesCategoryDAO, + null, + row.getSpecies(), + row.getSizeCategory(), + null, + importResult); - if (log.isInfoEnabled()) { - log.info("Starts import of Map cell results from file " + - inputFile.getFileName()); - } + for (Result result : results) { - String resultLabel = configuration.getResultLabel(); + result.setCategory(category); + result.setResultLabel(resultLabel); - CsvFileImportResult importResult = new CsvFileImportResult( - inputFile.getFileName()); + Result resultCreated = create(resultDao, result); - CellDAO dao = getDAO(Cell.class, CellDAO.class); + cell.addResult(resultCreated); - Reader reader = getInputFileReader(inputFile); - try { - EchoBaseImport<MapCellResultImportRow> importer = - EchoBaseImport.newImport(csvModel, reader); - - configuration.incrementsProgression(); - for (MapCellResultImportRow row : importer) { - - configuration.incrementsProgression(); - - //TODO Do me - - importResult.incrementsNumberUpdated(EchoBaseEntityEnum.Cell); + importResult.incrementsNumberCreated(EchoBaseEntityEnum.Result); + } } return importResult; @@ -277,18 +274,4 @@ } } - - private void createCellData(DataDAO dao, - Cell cell, - DataMetadata dataMetaData, - String dataValue, - CsvFileImportResult importResult) { - - Data data = create(dao); - data.setDataMetadata(dataMetaData); - data.setDataValue(dataValue); - cell.addData(data); - - importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data); - } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java 2012-03-28 17:53:48 UTC (rev 432) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java 2012-03-28 17:54:51 UTC (rev 433) @@ -27,8 +27,11 @@ import fr.ifremer.echobase.csv.EchobaseCsvUtil; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; +import java.util.List; import java.util.Map; /** @@ -39,30 +42,53 @@ */ public class MapCellImportModel extends AbstractImportModel<MapCellImportRow> { + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { + MapCellImportRow.PROPERTY_NAME, + "baracoudaCode", + MapCellImportRow.PROPERTY_DATA_GRID_CELL_LONGITUDE, + MapCellImportRow.PROPERTY_DATA_GRID_CELL_LATITUDE, + MapCellImportRow.PROPERTY_DATA_GRID_CELL_DEPTH, + MapCellImportRow.PROPERTY_DATA_GRID_LONGITUDE_LAG, + MapCellImportRow.PROPERTY_DATA_GRID_LATITUDE_LAG, + MapCellImportRow.PROPERTY_DATA_GRID_DEPTH_LAG, + MapCellImportRow.PROPERTY_VOYAGE, + MapCellImportRow.PROPERTY_SIZE_CATEGORY + }; + protected final CellType cellType; public MapCellImportModel(char separator, CellType cellType, Map<String, Voyage> voyageMap, - Map<String, DepthStratum> depthStramMap) { + Map<String, Species> speciesMap, + Map<String, SizeCategory> sizeCategoryMap, + List<DataMetadata> dataMetadatas) { super(separator); this.cellType = cellType; newForeignKeyColumn(MapCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn(MapCellImportRow.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStramMap); + newMandatoryColumn(MapCellImportRow.PROPERTY_NAME); + newForeignKeyColumn("baracoudaCode", MapCellImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(MapCellImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newMandatoryColumn(MapCellImportRow.PROPERTY_NAME); - newMandatoryColumn("x", MapCellImportRow.PROPERTY_DATA_X, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("y", MapCellImportRow.PROPERTY_DATA_Y, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("z", MapCellImportRow.PROPERTY_DATA_Z, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("lag", MapCellImportRow.PROPERTY_DATA_LAG, EchobaseCsvUtil.PRIMITIVE_FLOAT); - newMandatoryColumn("value", MapCellImportRow.PROPERTY_DATA_VALUE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_CELL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_CELL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_CELL_DEPTH, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_LONGITUDE_LAG, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_LATITUDE_LAG, EchobaseCsvUtil.PRIMITIVE_FLOAT); + newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_DEPTH_LAG, EchobaseCsvUtil.PRIMITIVE_FLOAT); + + for (DataMetadata metadata : dataMetadatas) { + newMandatoryColumn( + metadata.getName(), + EchobaseCsvUtil.newResultValueParser(metadata, false), + EchobaseCsvUtil.<MapCellImportRow>newResultValueSetter()); + } } @Override public MapCellImportRow newEmptyInstance() { - MapCellImportRow row = new MapCellImportRow(); - row.getCell().setCellType(cellType); + MapCellImportRow row = new MapCellImportRow(cellType); return row; } } \ No newline at end of file Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java 2012-03-28 17:53:48 UTC (rev 432) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportRow.java 2012-03-28 17:54:51 UTC (rev 433) @@ -23,53 +23,73 @@ */ package fr.ifremer.echobase.services.importdata.csv; +import com.google.common.collect.Lists; +import fr.ifremer.echobase.csv.EchobaseCsvUtil; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellImpl; +import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; +import java.util.List; + /** * Bean used as a row for import of {@link MapCellImportModel}. * * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -public class MapCellImportRow { +public class MapCellImportRow implements EchobaseCsvUtil.ResultAble { public static final String PROPERTY_NAME = "name"; public static final String PROPERTY_VOYAGE = "voyage"; - public static final String PROPERTY_DEPTH_STRATUM = "depthStratum"; + public static final String PROPERTY_CELL = "cell"; - public static final String PROPERTY_DATA_X = "dataX"; + public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_DATA_Y = "dataY"; + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - public static final String PROPERTY_DATA_Z = "dataZ"; + public static final String PROPERTY_DATA_GRID_CELL_LONGITUDE = "gridCellLongitude"; - public static final String PROPERTY_DATA_LAG = "dataLag"; + public static final String PROPERTY_DATA_GRID_CELL_LATITUDE = "gridCellLatitude"; - public static final String PROPERTY_DATA_VALUE = "dataValue"; + public static final String PROPERTY_DATA_GRID_CELL_DEPTH = "gridCellDepth"; + public static final String PROPERTY_DATA_GRID_LONGITUDE_LAG = "gridLongitudeLag"; + + public static final String PROPERTY_DATA_GRID_LATITUDE_LAG = "gridLatitudeLag"; + + public static final String PROPERTY_DATA_GRID_DEPTH_LAG = "gridDepthLag"; + protected Voyage voyage; - protected DepthStratum depthStratum; - protected final Cell cell; - protected float dataX; + protected List<Result> result = Lists.newArrayList(); - protected float dataY; + protected Species species; - protected float dataZ; + protected SizeCategory sizeCategory; - protected float dataLag; + protected float gridCellLongitude; - protected float dataValue; + protected float gridCellLatitude; - public MapCellImportRow() { + protected float gridCellDepth; + + protected float gridLongitudeLag; + + protected float gridLatitudeLag; + + protected float gridDepthLag; + + public MapCellImportRow(CellType cellType) { this.cell = new CellImpl(); + this.cell.setCellType(cellType); } public Cell getCell() { @@ -80,30 +100,42 @@ return voyage; } - public DepthStratum getDepthStratum() { - return depthStratum; + public Species getSpecies() { + return species; } - public float getDataX() { - return dataX; + public SizeCategory getSizeCategory() { + return sizeCategory; } - public float getDataY() { - return dataY; + public List<Result> getResult() { + return result; } - public float getDataZ() { - return dataZ; + public float getGridCellLongitude() { + return gridCellLongitude; } - public float getDataLag() { - return dataLag; + public float getGridCellLatitude() { + return gridCellLatitude; } - public float getDataValue() { - return dataValue; + public float getGridCellDepth() { + return gridCellDepth; } + public float getGridLongitudeLag() { + return gridLongitudeLag; + } + + public float getGridLatitudeLag() { + return gridLatitudeLag; + } + + public float getGridDepthLag() { + return gridDepthLag; + } + public void setName(String name) { getCell().setName(name); } @@ -112,27 +144,40 @@ this.voyage = voyage; } - public void setDepthStratum(DepthStratum depthStratum) { - this.depthStratum = depthStratum; + public void setSpecies(Species species) { + this.species = species; } - public void setDataX(float dataX) { - this.dataX = dataX; + public void setSizeCategory(SizeCategory sizeCategory) { + this.sizeCategory = sizeCategory; } - public void setDataY(float dataY) { - this.dataY = dataY; + public void setGridCellLongitude(float GridCellLongitude) { + this.gridCellLongitude = GridCellLongitude; } - public void setDataZ(float dataZ) { - this.dataZ = dataZ; + public void setGridCellLatitude(float GridCellLatitude) { + this.gridCellLatitude = GridCellLatitude; } - public void setDataLag(float dataLag) { - this.dataLag = dataLag; + public void setGridCellDepth(float GridCellDepth) { + this.gridCellDepth = GridCellDepth; } - public void setDataValue(float dataValue) { - this.dataValue = dataValue; + public void setGridLongitudeLag(float GridLongitudeLag) { + this.gridLongitudeLag = GridLongitudeLag; } + + public void setGridLatitudeLag(float GridLatitudeLag) { + this.gridLatitudeLag = GridLatitudeLag; + } + + public void setGridDepthLag(float GridDepthLag) { + this.gridDepthLag = GridDepthLag; + } + + @Override + public void addResult(Result result) { + this.result.add(result); + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java 2012-03-28 17:53:48 UTC (rev 432) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java 2012-03-28 17:54:51 UTC (rev 433) @@ -193,18 +193,6 @@ getModel().getMapsFile().setFileName(fileName); } - public void setMapResultFile(File file) { - getModel().getMapResultFile().setFile(file); - } - - public void setMapResultFileContentType(String contentType) { - getModel().getMapResultFile().setContentType(contentType); - } - - public void setMapResultFileFileName(String fileName) { - getModel().getMapResultFile().setFileName(fileName); - } - public void setLengthAgeKeyFile(File file) { getModel().getLengthAgeKeyFile().setFile(file); } Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml 2012-03-28 17:53:48 UTC (rev 432) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeMap-validation.xml 2012-03-28 17:54:51 UTC (rev 433) @@ -44,11 +44,4 @@ </field-validator> </field> - <field name="mapResultFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.mapResultFile.file!=null</param> - <message key="echobase.error.import.mapResultFile.required"/> - </field-validator> - </field> - </validators> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-28 17:53:48 UTC (rev 432) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp 2012-03-28 17:54:51 UTC (rev 433) @@ -218,7 +218,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="REGION" label=''/> + <s:hidden key="model.importMode" value="MAP" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -229,9 +229,6 @@ <s:file key="mapsFile" required="true" label='%{getText("echobase.common.cellMapsFile")}'/> - - <s:file key="mapResultFile" required="true" - label='%{getText("echobase.common.cellMapResultFile")}'/> </fieldset> <br/> <s:submit action="ConfigureResults-modeMap" key='echobase.action.import'/>

1 0

r432 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 19:53:48 +0200 (Wed, 28 Mar 2012) New Revision: 432 Url: http://forge.codelutin.com/repositories/revision/echobase/432 Log: remove TODO from tests (referentiel is ok) Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-28 17:49:29 UTC (rev 431) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-03-28 17:53:48 UTC (rev 432) @@ -25,16 +25,12 @@ import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.csv.CsvFileImportResult; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.references.AgeCategory; -import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import java.util.List; @@ -47,10 +43,6 @@ */ public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ResultsEsduCellImportServiceIT.class); - protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext( IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT); @@ -113,12 +105,6 @@ addMissingEsduCells("name", conf.getVoyageId(), inputFile); - //TODO Remove this when referentiel is ok - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondBiomass"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance"); - - List<CsvFileImportResult> result; result = doImport(conf, ResultsEsduCellImportService.class, 1); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-28 17:49:29 UTC (rev 431) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-03-28 17:53:48 UTC (rev 432) @@ -24,11 +24,11 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; +import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import org.junit.Ignore; import org.junit.Test; import java.util.List; @@ -50,18 +50,15 @@ return new String[]{"/import-data", "result", "map", filename}; } - @Ignore @Test public void doImportMap() throws Exception { - //TODO - assertImportCommonData(); assertImportOperations(); assertImportSampleDatas(); assertImportVoyageResult(); - assertNoEntities(Result.class); + assertNoEntities(Result.class, Data.class); ResultsImportConfiguration conf = new ResultsImportConfiguration(getLocale()); @@ -71,16 +68,14 @@ conf.setImportMode(ResultsImportMode.MAP); prepareInputFile(conf.getMapsFile(), getImportPath("maps.csv.gz")); - //TODO Use this - //prepareInputFile(conf.getMapResultFile(), getImportPath("mapResults.csv.gz")); List<CsvFileImportResult> result; result = doImport(conf, ResultsMapCellImportService.class, 1); - assertCsvImportResult(result, 0, Cell.class, 0); - assertCsvImportResult(result, 0, Data.class, 0); -// assertCsvImportResult(result,1, Result.class, 0); - + assertCsvImportResult(result, 0, Cell.class, 380); + assertCsvImportResult(result, 0, Data.class, 2280); + assertCsvImportResult(result, 0, Result.class, 380); + assertCsvImportResult(result, 0, Category.class, 1); } } \ No newline at end of file Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-28 17:49:29 UTC (rev 431) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-03-28 17:53:48 UTC (rev 432) @@ -24,13 +24,10 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.csv.CsvFileImportResult; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Test; @@ -78,30 +75,6 @@ prepareInputFile(conf.getRegionResultFile(), getImportPath("regionResults.csv.gz")); - //TODO Remove this when referentiel is ok - create(getDAO(EchoBaseEntityEnum.CellType), CellType.PROPERTY_NAME, "RegionSURF"); - create(getDAO(EchoBaseEntityEnum.CellType), CellType.PROPERTY_NAME, "RegionCLAS"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "RegionEnvCoordinates"); - - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "VarianceXe"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "VarianceNASC"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "MeanNASC"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedMeanXe"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Nesdu"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Nhauls"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "MeanNASCWeightedBiomassDensity"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedEstimationVariance"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedEstimationCV"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "MeanBiomassDensity"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "EstimationVariance"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "EstimationCV"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "TotalEstimationVariance"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "TotalNASCWeightedEstimationVariance"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "ProportionOfTotalEstimationVariance"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "ProportionOfNASCWeightedTotalEstimationVariance"); - //create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Biomass"); - create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedBiomass"); - addMissingEsduCells("esdu.name", conf.getVoyageId(), conf.getRegionAssociationFile()); @@ -112,9 +85,9 @@ assertCsvImportResult(result, 0, Cell.class, 10, 0, 2083); assertCsvImportResult(result, 0, Data.class, 238); assertCsvImportResult(result, 1, Cell.class, 0, 4146, 2083); - assertCsvImportResult(result,2, Result.class, 1873); - assertCsvImportResult(result,2, Category.class, 27); - assertCsvImportResult(result,2, SpeciesCategory.class, 1,0,458); + assertCsvImportResult(result, 2, Result.class, 1873); + assertCsvImportResult(result, 2, Category.class, 27); + assertCsvImportResult(result, 2, SpeciesCategory.class, 1, 0, 458); } } \ No newline at end of file

1 0

r431 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 19:49:29 +0200 (Wed, 28 Mar 2012) New Revision: 431 Url: http://forge.codelutin.com/repositories/revision/echobase/431 Log: add useFillValue in ResultValueParser Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-28 17:44:08 UTC (rev 430) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-28 17:49:29 UTC (rev 431) @@ -131,7 +131,6 @@ return new CellValueParser(voyage, cellDAO); } - public static interface ResultAble { void addResult(Result value); } @@ -148,8 +147,9 @@ } } - public static ValueParser<Result> newResultValueParser(DataMetadata metadata) { - return new ResultValueParser(metadata); + public static ValueParser<Result> newResultValueParser( + DataMetadata metadata, boolean useFillValue) { + return new ResultValueParser(metadata, useFillValue); } } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2012-03-28 17:44:08 UTC (rev 430) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2012-03-28 17:49:29 UTC (rev 431) @@ -40,15 +40,24 @@ final DataMetadata metadata; - public ResultValueParser(DataMetadata metadata) { + final boolean useFillValue; + + public ResultValueParser(DataMetadata metadata, boolean useFillValue) { this.metadata = metadata; + this.useFillValue = useFillValue; } @Override public Result parse(String value) throws ParseException { + Result result = new ResultImpl(); result.setDataMetadata(metadata); result.setResultValue(value); + if ("NA".equals(value) && useFillValue) { + + // use metadata fillValue + result.setResultValue(String.valueOf(metadata.getFillValue())); + } return result; } }

1 0

r430 - in trunk/echobase-services/src/test/resources: . import-data import-data/result/map
by tchemit＠users.forge.codelutin.com 28 Mar '12

28 Mar '12

Author: tchemit Date: 2012-03-28 19:44:08 +0200 (Wed, 28 Mar 2012) New Revision: 430 Url: http://forge.codelutin.com/repositories/revision/echobase/430 Log: update import datas Added: trunk/echobase-services/src/test/resources/import-data/result/map/maps.csv.gz Modified: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz Modified: trunk/echobase-services/src/test/resources/echobase-0.3-importDb-referentiel.zip =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches-and-voyage-result.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-catches.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-commonData.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-nodata.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-0.3-operation.h2.db.gz =================================================================== (Binary files differ) Added: trunk/echobase-services/src/test/resources/import-data/result/map/maps.csv.gz =================================================================== (Binary files differ) Property changes on: trunk/echobase-services/src/test/resources/import-data/result/map/maps.csv.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0