April 2015 - Observe-commits - mailman.cloud.codelutin.com

12/35: refs #6913 modification du fichier des rapports
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f3c07de61cd8bfd320a42fc914c3702fe91883ff Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 18:20:29 2015 +0200 refs #6913 modification du fichier des rapports --- .../src/main/filters/observe-reports.properties | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 1d3b498..e313a53 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -80,7 +80,7 @@ report.dailySetAndCatch.request.1=0,0|row|\ report.dcpUsage.name=Utilisation des DCP report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es +report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau seuls,Nombre renforc\u00e9s par radeau balis\u00e9,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|Select to.id From ObjectTypeImpl to Where to In (Select to From ObjectTypeImpl to, TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ Where \ m.id = :tripId \ @@ -142,10 +142,22 @@ report.dcpUsage.request.5=4,0|row|\ and a in elements(r.activitySeine) \ and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ - and dcp.objectOperation.code = 4 + and ( dcp.objectFate.code = 8 and dcp.objectOperation.code != 1 ) report.dcpUsage.request.5.repeat=typeObjetId|column -report.dcpUsage.request.6=5,0|row| \ +report.dcpUsage.request.6=5,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + Where \ + m.id = :tripId \ + and r in elements(m.route) \ + and a in elements(r.activitySeine) \ + and dcp in elements(a.floatingObject) \ + and dcp.objectType.id = :typeObjetId \ + and dcp.objectOperation.code = 4 +report.dcpUsage.request.6.repeat=typeObjetId|column + +report.dcpUsage.request.7=6,0|row| \ Select Sum(efo.count) \ From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp, ObjectObservedSpeciesImpl efo \ Where \ @@ -160,7 +172,7 @@ report.dcpUsage.request.6=5,0|row| \ Where ef2.speciesGroup = gef2 \ and gef2.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' \ ) -report.dcpUsage.request.6.repeat=typeObjetId|column +report.dcpUsage.request.7.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

11/35: fixes #6923: Amélioration du script apply-extra.sh Merge branch 'feature/6923' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit be1457d6fa1e5d567508b11905a2a8390ef19d03 Merge: bb72058 8705801 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:09:08 2015 +0200 fixes #6923: Amélioration du script apply-extra.sh Merge branch 'feature/6923' into develop .../src/main/assembly/dist/obstuna-admin/apply-extra.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

10/35: refs #6923 Ajout de dbHost et dbPort dans le script
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8705801f7368ed28b71aec3961c423a9928eb1b3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:09:03 2015 +0200 refs #6923 Ajout de dbHost et dbPort dans le script --- .../src/main/assembly/dist/obstuna-admin/apply-extra.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh b/observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh old mode 100644 new mode 100755 index 31ca06a..558a083 --- a/observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh +++ b/observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh @@ -32,6 +32,18 @@ if [ "$dbName" == "" ] ; then dbName=obstuna fi +echo -n "Machine de la base à utiliser ? [localhost] " +read dbHost +if [ "$dbHost" == "" ] ; then + dbHost=localhost +fi + +echo -n "Port de la base à utiliser ? [5432] " +read dbPort +if [ "$dbPort" == "" ] ; then + dbPort=5432 +fi + echo -n "Nom de l'utilisateur administrateur de la base ? [admin] " read dbUser if [ "$dbUser" == "" ] ; then @@ -43,6 +55,6 @@ for script in $(ls extra/*.sql); do read i if [ "$i" == "O" -o "$i" == "o" -o "$i" == "" ] ; then echo "Execution du script $script" - cat $script | psql -d $dbName -U $dbUser -h localhost + cat $script | psql -d $dbName -U $dbUser -h $dbHost -p $dbPort fi done \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

09/35: fixes #6922: Problème de création d'une nouvelle base (table tms_version non créée) Merge branch 'feature/6922' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bb7205838d271c0a78002ebff67c4496b87b5310 Merge: 900b718 57e9f55 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:05:32 2015 +0200 fixes #6922: Problème de création d'une nouvelle base (table tms_version non créée) Merge branch 'feature/6922' into develop pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

08/35: refs #6922 topia 2.9.5 corrige le problème
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 57e9f55315a1eef08789bcfad4107fcaaa83ba84 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:05:23 2015 +0200 refs #6922 topia 2.9.5 corrige le problème --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb6a90f..00f97cd 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> - <topiaVersion>2.9.4</topiaVersion> + <topiaVersion>2.9.5</topiaVersion> <jaxxVersion>2.23</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

07/35: fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 900b71842561f9e5f08deb4f2578dcb9613b7dae Merge: bc47e51 5c79e02 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:35 2015 +0200 fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop .../src/main/java/fr/ird/observe/db/util/PGInstall.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

06/35: refs #6920: Ne pas supprimer le schméma public
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5c79e025955e73e30ae746360725f20d6feba59e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:25 2015 +0200 refs #6920: Ne pas supprimer le schméma public --- .../src/main/java/fr/ird/observe/db/util/PGInstall.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java index 2a39632..d57a514 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java @@ -81,7 +81,9 @@ public abstract class PGInstall { protected static final Set<String> EXTRA_TABLES = Sets.newHashSet(TMSVersionDAO.TABLE_NAME, TMSVersionDAO.LEGACY_TABLE_NAME); - public static final Set<String> SCHEMAS = Sets.newHashSet("public", + protected static final String SCHEMA_PUBLIC = "public"; + + protected static final Set<String> SCHEMAS = Sets.newHashSet(SCHEMA_PUBLIC, "OBSERVE_COMMON", "OBSERVE_SEINE", "OBSERVE_LONGLINE"); @@ -223,7 +225,9 @@ public abstract class PGInstall { for (String schema : SCHEMAS) { - builder.append(String.format(DROP_SCHEMA_PATTERN, schema)); + if (!SCHEMA_PUBLIC.equals(schema)) { + builder.append(String.format(DROP_SCHEMA_PATTERN, schema)); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

05/35: fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bc47e5137ffd11a93439991291f8a11907f9697e Merge: 9c79c44 54c2925 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:25:04 2015 +0200 fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop .../main/java/fr/ird/observe/db/ReplicationService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

04/35: refs #6919 (possibilité d'avoir la source en cours de création)
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 54c2925b2805ddb2ca1823bf28d3bc4419d622b6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:24:31 2015 +0200 refs #6919 (possibilité d'avoir la source en cours de création) --- .../main/java/fr/ird/observe/db/ReplicationService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java index 0468030..da02d00 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java +++ b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java @@ -29,7 +29,6 @@ import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglines; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineDAO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.Pair; @@ -40,7 +39,6 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; import org.nuiton.topia.replication.TopiaReplicationService; import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.util.StringUtil; @@ -141,6 +139,8 @@ public class ReplicationService { throw new NullPointerException("dstService can not be null"); } srcService.checkState(DataSourceState.OPEN); + // le service peut-être en cours d'ouverture + dstService.checkState(DataSourceState.INIT, DataSourceState.OPEN); // recuperation des marees a repliquer @@ -151,15 +151,18 @@ public class ReplicationService { srcCtxt = srcService.beginTransaction("replicateData"); TripSeineDAO srcTripDAO = ObserveDAOHelper.getTripSeineDAO(srcCtxt); - List<TripSeine> srcTripSeines = srcTripDAO.findAll(); + List<String> allIds = srcTripDAO.findAllIds(); + +// List<TripSeine> srcTripSeines = srcTripDAO.findAll(); - if (CollectionUtils.isEmpty(srcTripSeines)) { + if (CollectionUtils.isEmpty(allIds)) { // aucune donnee a repliquer srcService.fireNewMessage( t("observe.storage.message.replicate.data.no.data")); return; } - topiaIds = TopiaEntityHelper.getTopiaIdArray(srcTripSeines); +// topiaIds = TopiaEntityHelper.getTopiaIdArray(srcTripSeines); + topiaIds= allIds.toArray(new String[allIds.size()]); } catch (TopiaException e) { throw new DataSourceException(e, "replicateData"); @@ -199,7 +202,9 @@ public class ReplicationService { } srcService.checkState(DataSourceState.OPEN); - dstService.checkState(DataSourceState.OPEN); + // le service peut-être en cours d'ouverture + dstService.checkState(DataSourceState.INIT, DataSourceState.OPEN); + if (srcService.equals(dstService)) { throw new IllegalArgumentException( "can not replcate to the same service..."); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

03/35: fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9c79c4407aa9f7fb1eedb01bbd3fc12acb1624da Merge: 92410cf a036248 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:37 2015 +0200 fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop .../src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0