- Tutti-commits - mailman.cloud.codelutin.com

[ANN] - Tutti 3.0 released
by forge.codelutin.com Release Notification Jan. 16, 2014

Jan. 16, 2014

The Tutti team is pleased to announce the tutti-3.0 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [TECH] Améliorer les temps d'éxecution Issue: 2865. Thanks to Tony Chemit. Resolved by vbadts. o [EXPORT SUMATRA] le nombre d'individus dans la capture est faux Issue: 3320. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] pouvoir choisir dans la configuration l'unité de saisie des poids (espèces benthos macro déchets) kg ou g et donc adapter les intitulés des colonnes Issue: 2619. Thanks to Vincent BADTS. Resolved by tchemit. o [ERGO] Permettre à l'utilisateur d'ordonner les attributs à afficher, et pas seulement le premier à afficher Issue: 2455. Thanks to Vincent BADTS. Resolved by tchemit. o [PROTOCOLE] tableau espèces : impossible de sélectionner plusieurs lignes d'espèces pour supprimer Issue: 2458. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] gestion des poids dans le tableau Issue: 2537. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] à la création d'un lot, scanner le protocole et proposer la catégorisation du protocole Issue: 2843. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] ajouter bouton "réinitialiser" dans l'écran pour effacer toutes les classes de tailles et les nombres Issue: 2852. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] pouvoir modifier la valeur de la catégorisation d'un lot Issue: 2621. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] - Renseigner le champ "Type de mesure" à la saisie des mensuration avec la valeur du lot frère Issue: 2260. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] pouvoir saisir aussi le nombre dès la création d'un lot Issue: 2714. Thanks to Vincent BADTS. Resolved by tchemit. o [ESPECES] pouvoir saisir plusieurs lots pères sans refermer le formulaire Issue: 2172. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Modification de l'url de mise à jour des données Issue: 4125. Thanks to Christian BONNET. Resolved by cbonnet. o [TECH] Faciliter l'import d'une nouvelle base Issue: 2840. Thanks to Kevin Morin. Resolved by tchemit. o [ERGO] - Lisibilité des tableaux (captures, protocole) Issue: 2545. Thanks to Christian BONNET. Resolved by tchemit. o [DONNEES INDIVIDUELLES] liste des espèces possibles. Saisie au km Issue: 2443. Thanks to Vincent BADTS. Resolved by tchemit. o [DONNEES INDIVIDUELLES] gérer les colonnes du tableau dans le protocole Issue: 2330. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURES] - Ajouter une décimale aux poids (4 décimales pour les poids en kg et une décimale pour les grammes) Issue: 2476. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] manque information sur l'espèce en cours de saisie Issue: 2435. Thanks to Vincent BADTS. Resolved by tchemit. o Compléter l'aide en ligne Issue: 3878. Thanks to Tony Chemit. Resolved by tchemit. o [MACRO-DECHETS] Permettre la saisie de plusieurs macro-déchets sans avoir à fermer l'écran de création Issue: 3295. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURES ACCIDENTELLES] Permettre la saisie de plusieurs captures accidentelles sans avoir à fermer l'écran de création Issue: 3296. Thanks to Tony Chemit. Resolved by tchemit. o [RAPPORT] ajouter sur onglet "Résumé" un bouton pour obtenir la composition de la capture Issue: 2853. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] - Mise à jour de la base de données : pas de vérification au lancement Issue: 2382. Thanks to Christian BONNET. Resolved by tchemit. o [DONNEES INDIVIDUELLES] pouvoir copier les mensurations depuis la page ESPECES Issue: 2838. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Import de base : Structure autorisée pour le zip contenant la base à importer Issue: 3604. Thanks to Christian BONNET. Resolved by cbonnet. o [CAPTURE] ne pas calculer les poids totaux espèces ou benthos quand il y a échantillonage de la capture avant trie Issue: 3839. Thanks to Vincent BADTS. Resolved by vbadts. o [CAMPAGNE] pouvoir ajouter plusieur engins professionnels de même type à une campagne Issue: 2335. Thanks to Vincent BADTS. Resolved by tchemit. o [CAMPAGNE] gestion des navires asocié (ex. chalutage en boeuf) Issue: 2338. Thanks to Vincent BADTS. Resolved by tchemit. o [ESPECES] Catégorisation des lots : on ne peut plus ajouter une catégorie une fois la catégorisation effectuée Issue: 2478. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] ajout bouton "enregistrer et passer à l'espèce suivante" dans écran mensurations Issue: 2436. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] Pouvoir choisir un PSFM de classe de taille non renseigné au niveau du protocole Issue: 2449. Thanks to Vincent BADTS. Resolved by tchemit. o [ERGO] améliorer saisie lat et long Issue: 2717. Thanks to Vincent BADTS. Resolved by tchemit. o [EXPORT GENERIQUE] erreur à l'export si pas d'engin affecté sur l'opération Issue: 2878. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] - Prise en compte de nouvelles catégories dans l'applicatif Issue: 2121. Thanks to Christian BONNET. Resolved by tchemit. o [Rapport] Intégration de rapports générés par Birt Issue: 3430. Thanks to Christian BONNET. Resolved by tchemit. o [EXPORT GENERIQUE] Ne pas bloquer l'export en cas de problème sur l'élévation Issue: 2873. Thanks to Christian BONNET. Resolved by tchemit. o [ERGO] Tri du tableau des espèces Issue: 2459. Thanks to Vincent BADTS. Resolved by tchemit. Fixed Bugs: o [PROTOCOLE] Gestion des caractéristiques "Classe de taille" sur les imports de protocole Issue: 2442. Thanks to Vincent BADTS. Resolved by tchemit. o [AIDE] L'aide contextuelle ne fonctionne pas sur certains boutons Issue: 4047. Thanks to Tony Chemit. Resolved by tchemit. o Erreur lors d'un export Sumatra Issue: 3880. Thanks to Léo Kaufmann. Resolved by tchemit. o [TECH] Mise à jour de référentiel - Erreur sur les données suite à la mise à jour Issue: 4124. Thanks to Christian BONNET. Resolved by tchemit. Changes: o [DONNES INDIVIDUELLES] Validation de la date de création Issue: 3305. Thanks to Tony Chemit. Resolved by cbonnet. o [CAPTURES ACCIDENTELLES] Validation de la date de création Issue: 3307. Thanks to Tony Chemit. Resolved by cbonnet. o [TECH] - Vérification de la version utilisée par rapport à la BDD Issue: 1894. Thanks to Benoit Wilcox. Resolved by tchemit. o [ERGO] Alignement des cellules contenant les chiffres Issue: 2447. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Intégration de l'aide en ligne dans le site généré Issue: 4136. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Amélioration des logs au démarrage Issue: 4126. Thanks to Tony Chemit. Resolved by tchemit. o [REFERENTIEL] - Stades oeuf ; larve ; juvénile et adulte ; non précisé Issue: 1826. Thanks to Benoit Wilcox. Resolved by vbadts. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-3.0-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/1349 * tutti-3.0-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/1350 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1496 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 18:22:59 +0100 (Thu, 16 Jan 2014) New Revision: 1496 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1496 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-16 17:22:49 UTC (rev 1495) +++ trunk/pom.xml 2014-01-16 17:22:59 UTC (rev 1496) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0</version> + <version>3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -97,12 +97,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-16 17:22:49 UTC (rev 1495) +++ trunk/tutti-persistence/pom.xml 2014-01-16 17:22:59 UTC (rev 1496) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-16 17:22:49 UTC (rev 1495) +++ trunk/tutti-service/pom.xml 2014-01-16 17:22:59 UTC (rev 1496) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-16 17:22:49 UTC (rev 1495) +++ trunk/tutti-ui-swing/pom.xml 2014-01-16 17:22:59 UTC (rev 1496) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1495 - tags
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 18:22:49 +0100 (Thu, 16 Jan 2014) New Revision: 1495 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1495 Log: [maven-release-plugin] copy for tag tutti-3.0 Added: tags/tutti-3.0/

1 0

r1494 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 18:22:40 +0100 (Thu, 16 Jan 2014) New Revision: 1494 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1494 Log: [maven-release-plugin] prepare release tutti-3.0 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-16 17:19:38 UTC (rev 1493) +++ trunk/pom.xml 2014-01-16 17:22:40 UTC (rev 1494) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0</version> <packaging>pom</packaging> <name>Tutti</name> @@ -97,12 +97,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0 </developerConnection> </scm> <distributionManagement> @@ -744,10 +744,7 @@ <configuration> <tasks> <echo message="Copy help to site" /> - <copy verbose="${maven.verbose}" - failonerror="false" - overwrite="true" - todir="${project.reporting.outputDirectory}/help"> + <copy verbose="${maven.verbose}" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/help"> <fileset dir="${project.basedir}/tutti-ui-swing/src/main/help"> <include name="**/*" /> </fileset> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-16 17:19:38 UTC (rev 1493) +++ trunk/tutti-persistence/pom.xml 2014-01-16 17:22:40 UTC (rev 1494) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-16 17:19:38 UTC (rev 1493) +++ trunk/tutti-service/pom.xml 2014-01-16 17:22:40 UTC (rev 1494) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-16 17:19:38 UTC (rev 1493) +++ trunk/tutti-ui-swing/pom.xml 2014-01-16 17:22:40 UTC (rev 1494) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1493 - trunk/src/site/rst
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 18:19:38 +0100 (Thu, 16 Jan 2014) New Revision: 1493 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1493 Log: update doc Modified: trunk/src/site/rst/dbversions.rst Modified: trunk/src/site/rst/dbversions.rst =================================================================== --- trunk/src/site/rst/dbversions.rst 2014-01-16 15:08:54 UTC (rev 1492) +++ trunk/src/site/rst/dbversions.rst 2014-01-16 17:19:38 UTC (rev 1493) @@ -52,6 +52,8 @@ +---------------------+------------+---------------------------+ + 3.0-rc-2 + 2013.11.29 + 3.4.1 + +---------------------+------------+---------------------------+ ++ 3.0 + 2014.01.10 + 3.4.1 + ++---------------------+------------+---------------------------+ Légende :

1 0

r1492 - in trunk: . src/site
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 16:08:54 +0100 (Thu, 16 Jan 2014) New Revision: 1492 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1492 Log: fixes #4136: [TECH] Int?\195?\169gration de l'aide en ligne dans le site g?\195?\169n?\195?\169r?\195?\169 Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-16 14:36:24 UTC (rev 1491) +++ trunk/pom.xml 2014-01-16 15:08:54 UTC (rev 1492) @@ -159,12 +159,6 @@  <jreVersion>1.7.45</jreVersion> -  - <dbVersion>2013.12.19</dbVersion> - -  - <reportVersion>2013.12.05</reportVersion> - </properties> <repositories> @@ -499,6 +493,11 @@ <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> + <dependency> + <groupId>fr.ifremer.shared</groupId> + <artifactId>application</artifactId> + <version>${ifremerApplicationVersion}</version> + </dependency> </dependencies> </plugin> @@ -602,14 +601,6 @@ <property>jreVersion</property> <message>You must set a jreVersion property!</message> </requireProperty> - <requireProperty> - <property>dbVersion</property> - <message>You must set a dbVersion property!</message> - </requireProperty> - <requireProperty> - <property>reportVersion</property> - <message>You must set a reportVersion property!</message> - </requireProperty> </rules> <ignoreCache>true</ignoreCache> <failFast>true</failFast> @@ -733,7 +724,7 @@ </profile> <profile> - <id>deploy-tutti-data-update</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> @@ -742,25 +733,23 @@ </activation> <build> - <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>copy tutti-data.properties to site</id> - <phase>package</phase> + <id>Copy help site</id> + <phase>pre-site</phase> <inherited>false</inherited> <configuration> <tasks> - <echo message="copy tutti-db.properties to site" /> - <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> - <filterset> - <filter value="${dbVersion}" token="dbVersion" /> - <filter value="${reportVersion}" token="reportVersion" /> - </filterset> - <fileset dir="${basedir}/src/update/"> - <include name="tutti-data.properties" /> + <echo message="Copy help to site" /> + <copy verbose="${maven.verbose}" + failonerror="false" + overwrite="true" + todir="${project.reporting.outputDirectory}/help"> + <fileset dir="${project.basedir}/tutti-ui-swing/src/main/help"> + <include name="**/*" /> </fileset> </copy> </tasks> @@ -771,46 +760,8 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> - <executions> - <execution> - <id>deploy tutti-db.properties</id> - <phase>deploy</phase> - <inherited>false</inherited> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>forge.codelutin.com</serverId> - <fromFile> - ${project.build.directory}/update/tutti-data.properties - </fromFile> - <url> - scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti - </url> - </configuration> - </execution> - </executions> - - </plugin> </plugins> </build> - - </profile> - - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <reporting> <plugins> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-01-16 14:36:24 UTC (rev 1491) +++ trunk/src/site/site_fr.xml 2014-01-16 15:08:54 UTC (rev 1492) @@ -23,7 +23,10 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -97,13 +100,20 @@ <menu name="Tutti"> <item name="Accueil" href="index.html"/> <item name="Fonctionnalités" href="./features.html"/> - <item name="Téléchargement" + <item name="Téléchargement" target="forge" href="http://forge.codelutin.com/projects/tutti/files"/> - <item name="Roadmap" + <item name="Roadmap" target="forge" href="http://forge.codelutin.com/projects/tutti/roadmap"/> <item name="Historique des versions" href="changes-report.html"/> </menu> + <menu name="Documentation utilisateur"> + <item name="Aide en ligne (FR)" href="./help/fr/index.html" + target="help"/> + <item name="Aide en ligne (EN)" href="./help/en/index.html" + target="help"/> + </menu> + <menu name="Documentation Technique"> <item name="Configuration" href="./application-config-report.html"/> <item name="Référentiel" href="./referential.html"/>

1 0

r1491 - in trunk/tutti-ui-swing/src/main: help/fr java/fr/ifremer/tutti/ui/swing/content/operation/catches resources/i18n
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 15:36:24 +0100 (Thu, 16 Jan 2014) New Revision: 1491 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1491 Log: fixes #3839: [CAPTURE] ne pas calculer les poids totaux esp?\195?\168ces ou benthos quand il y a ?\195?\169chantillonage de la capture avant trie Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-01-16 14:36:24 UTC (rev 1491) @@ -279,9 +279,9 @@ : si la valeur du Poids total NON TRIE est non nulle, la valeur calculée dans ce champ n'a aucune signification car l'application va sommer un VRAC qui doit être élevé avec un HORS VRAC qui n'est par - définition pas élevé. Cette anomalie de la 3.0 sera corrigée dans une - version - ultérieure. + définition pas élevé. + <br/> + Dans ce cas un message remplace la valeur calculée. </dd> <dt>Poids total VRAC</dt> <dd> @@ -306,8 +306,9 @@ style="font-weight: bold;">ATTENTION</span> : si la valeur du Poids total NON TRIE est non nulle, la valeur calculée dans ce champ n'a aucune signification car l'application va sommer un vrac qui doit - être élevé avec un hrs vrac qui n'est par définition pas élevé. Cette - anomalie sera corrigée dans une version ultérieure. + être élevé avec un hrs vrac qui n'est par définition pas élevé. + <br/> + Dans ce cas un message remplace la valeur calculée. </dd> <dt>Poids total VRAC</dt> <dd> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-01-16 14:36:24 UTC (rev 1491) @@ -191,7 +191,8 @@ } #speciesTotalWeightField { - text: {getWeightStringValue(model.getSpeciesTotalComputedWeight())}; + text: {handler.getWeightStringValueForTotalWeight(model.getCatchTotalRejectedWeight(), model.getSpeciesTotalComputedWeight())}; + disabledTextColor: {handler.getWeightColorForTotalWeight(model.getCatchTotalRejectedWeight(), model.getSpeciesTotalComputedWeight())}; _computed: true; _help: {"tutti.editCatchBatch.field.speciesTotalWeight.help"}; } @@ -256,7 +257,8 @@ } #benthosTotalWeightField { - text: {getWeightStringValue(model.getBenthosTotalComputedWeight())}; + text: {handler.getWeightStringValueForTotalWeight(model.getCatchTotalRejectedWeight(), model.getBenthosTotalComputedWeight())}; + disabledTextColor: {handler.getWeightColorForTotalWeight(model.getCatchTotalRejectedWeight(), model.getBenthosTotalComputedWeight())}; _computed: true; _help: {"tutti.editCatchBatch.field.benthosTotalWeight.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-16 14:36:24 UTC (rev 1491) @@ -26,9 +26,8 @@ import com.google.common.collect.Sets; import fr.ifremer.shared.application.swing.tab.TabHandler; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; @@ -40,7 +39,6 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -51,7 +49,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import java.awt.Container; +import java.awt.Color; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -589,22 +587,28 @@ } } -// public String buildReminderLabelTitle(Species species, -// Iterable<SampleCategory<?>> categories, -// String prefix, -// String suffix) { -// StringBuilder title = new StringBuilder(prefix); -// -// title.append(" - [").append(decorate(species)).append("]"); -// -// for (SampleCategory<?> sampleCategory : categories) { -// if (sampleCategory.getCategoryValue() != null) { -// title.append(" - "); -// title.append(decorate(sampleCategory.getCategoryValue())); -// } -// } -// -// title.append(" - ").append(suffix); -// return title.toString(); -// } + public String getWeightStringValueForTotalWeight(Float rejectWeight, Float totalWeight) { + String result; + if (rejectWeight == null || totalWeight == null) { + + // no reject weight, so can let this weight + result = TuttiEntities.getWeightStringValue(totalWeight); + } else { + result = _("tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed"); + } + return result; + } + + public Color getWeightColorForTotalWeight(Float rejectWeight, Float totalWeight) { + //jTextField.setDisabledTextColor( + Color result; + if (rejectWeight == null || totalWeight == null) { + + // no reject weight, so can let this weight + result = getConfig().getColorComputedWeights(); + } else { + result = Color.RED; + } + return result; + } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-16 14:36:24 UTC (rev 1491) @@ -564,6 +564,7 @@ tutti.editCatchBatch.field.catchTotalWeight.tip= tutti.editCatchBatch.field.marineLitterTotalWeight= tutti.editCatchBatch.field.marineLitterTotalWeight.tip= +tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed= tutti.editCatchBatch.field.speciesTotalSampleSortedWeight= tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= tutti.editCatchBatch.field.speciesTotalSortedWeight= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-16 14:36:24 UTC (rev 1491) @@ -557,6 +557,7 @@ tutti.editCatchBatch.field.catchTotalWeight.tip=Poids total de la capture (sauf macro déchets et captures accidentelles) tutti.editCatchBatch.field.marineLitterTotalWeight=Poids TOTAL tutti.editCatchBatch.field.marineLitterTotalWeight.tip=Poids total des macro déchets dans la capture +tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed=poids non calculable dans ce contexte tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) tutti.editCatchBatch.field.speciesTotalSortedWeight=Poids total VRAC

1 0

r1490 - trunk
by tchemit＠users.forge.codelutin.com Jan. 16, 2014

Jan. 16, 2014

Author: tchemit Date: 2014-01-16 15:35:57 +0100 (Thu, 16 Jan 2014) New Revision: 1490 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1490 Log: add L?\195?\169o as commiter Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-15 17:10:23 UTC (rev 1489) +++ trunk/pom.xml 2014-01-16 14:35:57 UTC (rev 1490) @@ -77,6 +77,17 @@ </roles> <timezone>Europe/Paris</timezone> </developer> + <developer> + <id>lkaufmann</id> + <name>Léo Kaufmann</name> + <email>morin at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <roles> + <role>Technical writer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> </developers> <modules>

1 0

r1489 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti
by tchemit＠users.forge.codelutin.com Jan. 15, 2014

Jan. 15, 2014

Author: tchemit Date: 2014-01-15 18:10:23 +0100 (Wed, 15 Jan 2014) New Revision: 1489 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1489 Log: fixes #4125: [TECH] Modification de l'url de mise ?\195?\160 jour des donn?\195?\169es Modified: trunk/README.txt trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2014-01-15 16:34:18 UTC (rev 1488) +++ trunk/README.txt 2014-01-15 17:10:23 UTC (rev 1489) @@ -30,5 +30,5 @@ +---------------------+------------+---------------------------+ + 3.0-rc-2 + 2013.11.29 + 3.4.1 + +---------------------+------------+---------------------------+ -+ 3.0 + 2013.12.19 + 3.4.1 + ++ 3.0 + 2014.01.10 + 3.4.1 + +---------------------+------------+---------------------------+ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-15 16:34:18 UTC (rev 1488) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-15 17:10:23 UTC (rev 1489) @@ -329,7 +329,7 @@ UPDATE_DATA_URL( "tutti.update.data.url", n_("tutti.config.option.update.data.url.description"), - "http://appup.forge.codelutin.com/tutti/tutti-data.properties", + "https://www.ifremer.fr/sih-resource-private/tutti/tutti-data.properties", String.class, false ),

1 0

r1488 - in trunk/tutti-persistence/src: main/java/fr/ifremer/adagio/core/service/technical/synchro main/java/fr/ifremer/adagio/core/service/technical/synchro/specific main/java/fr/ifremer/tutti/persistence main/java/fr/ifremer/tutti/persistence/service main/resources/META-INF/services test/java/fr/ifremer/adagio/core/service/technical/synchro
by tchemit＠users.forge.codelutin.com Jan. 15, 2014

Jan. 15, 2014

Author: tchemit Date: 2014-01-15 17:34:18 +0100 (Wed, 15 Jan 2014) New Revision: 1488 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1488 Log: refs #4124: [TECH] Mise ?\195?\160 jour de r?\195?\169f?\195?\169rentiel - Erreur sur les donn?\195?\169es suite ?\195?\160 la mise ?\195?\160 jour Added: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-01-15 12:45:59 UTC (rev 1487) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.io.Closeables; +import fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask; import fr.ifremer.tutti.persistence.ProgressionModel; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -50,9 +51,11 @@ import java.sql.SQLException; import java.sql.Timestamp; import java.util.Date; +import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.ServiceLoader; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -83,6 +86,8 @@ protected Properties dbconnexionProperties; + protected EnumMap<ReferentialSynchroTable, ReferentialSynchroSpecificTableTask> extraTasks; + @Override public Properties getLocalConnectionProperties() { if (dbconnexionProperties == null) { @@ -103,6 +108,20 @@ return localDialect; } + public EnumMap<ReferentialSynchroTable, ReferentialSynchroSpecificTableTask> getExtraTasks() { + if (extraTasks == null) { + + extraTasks = Maps.newEnumMap(ReferentialSynchroTable.class); + + ServiceLoader<ReferentialSynchroSpecificTableTask> loader = ServiceLoader.load(ReferentialSynchroSpecificTableTask.class); + for (ReferentialSynchroSpecificTableTask task : loader) { + extraTasks.put(task.getTable(), task); + } + + } + return extraTasks; + } + @Override public void prepare(Properties remoteConnectionProperties, ReferentialSynchroResult result) { Preconditions.checkNotNull(result); @@ -114,6 +133,7 @@ dbconnexionProperties = null; localDialect = null; + extraTasks = null; Connection localConnection = null; Connection remoteConnection = null; @@ -209,7 +229,7 @@ remoteConnection = createConnection(remoteConnectionProperties); // load metas - ReferentialSynchroDatabaseMetadata remoteMeta = + ReferentialSynchroDatabaseMetadata dbMetas = ReferentialSynchroDatabaseMetadata.loadDatabaseMetadata(remoteConnection, getLocalDialect()); // set total in progression model @@ -229,7 +249,7 @@ progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.synchronize.step1", tableName)); - ReferentialSynchroTableMetadata table = remoteMeta.getTable(tableName); + ReferentialSynchroTableMetadata table = dbMetas.getTable(tableName); if (log.isInfoEnabled()) { log.info("Synchronize table: " + tableName); @@ -238,9 +258,13 @@ if (countToUpdate > 0) { - synchronizeTable(table, + ReferentialSynchroSpecificTableTask extraTask = getExtraTasks().get(tuttiTable); + + synchronizeTable(dbMetas, + table, localConnection, remoteConnection, + extraTask, result); } @@ -346,7 +370,7 @@ ReferentialSynchroTableTool remoteDao = new ReferentialSynchroTableTool(remoteConnection, table); - long countToUpdate = remoteDao.getCountDataToUpdate(updateDate); + long countToUpdate = remoteDao.countDataToUpdate(updateDate); if (log.isInfoEnabled()) { log.info(String.format("%s nb rows to update: %s", tablePrefix, countToUpdate)); @@ -356,9 +380,11 @@ result.addRows(tableName, (int) countToUpdate); } - protected void synchronizeTable(ReferentialSynchroTableMetadata table, + protected void synchronizeTable(ReferentialSynchroDatabaseMetadata dbMetas, + ReferentialSynchroTableMetadata table, Connection localConnection, Connection remoteConnection, + ReferentialSynchroSpecificTableTask extraTask, ReferentialSynchroResult result) throws SQLException { String tableName = table.getName(); @@ -367,6 +393,9 @@ String tablePrefix = table.getTableLogPrefix(); + if (extraTask != null && log.isInfoEnabled()) { + log.info(tablePrefix + " Will use specific task: " + extraTask); + } ReferentialSynchroTableTool localDao = new ReferentialSynchroTableTool(localConnection, table); ReferentialSynchroTableTool remoteDao = new ReferentialSynchroTableTool(remoteConnection, table); @@ -394,16 +423,16 @@ if (bigTable) { // big table update strategy - updateBigTable(localDao, + updateBigTable(dbMetas, + localDao, remoteDao, - table, dataToUpdate, + extraTask, result); } else { // small table update strategy updateTable(localDao, - table, dataToUpdate, result); } @@ -428,16 +457,16 @@ * method instead. * * @param localDao connection on the local db - * @param table table to update * @param incomingData data to update from the remote db * @param result where to store operation results * @throws SQLException if any sql errors */ protected void updateTable(ReferentialSynchroTableTool localDao, - ReferentialSynchroTableMetadata table, ResultSet incomingData, ReferentialSynchroResult result) throws SQLException { + ReferentialSynchroTableMetadata table = localDao.getTable(); + // get existing ids in the local db Set<String> existingIds = localDao.getExistingPrimaryKeys(); @@ -504,20 +533,22 @@ * </ul> * In that way we will only perform some insert queries. * + * @param dbMetas * @param localDao connection on the local db * @param remoteDao connection on the local db - * @param table table to update * @param incomingData data to update from the remote db - * @param result where to store operation results - * @throws SQLException if any sql errors + * @param extraTask + * @param result where to store operation results @throws SQLException if any sql errors */ - protected void updateBigTable(ReferentialSynchroTableTool localDao, + protected void updateBigTable(ReferentialSynchroDatabaseMetadata dbMetas, + ReferentialSynchroTableTool localDao, ReferentialSynchroTableTool remoteDao, - ReferentialSynchroTableMetadata table, ResultSet incomingData, + ReferentialSynchroSpecificTableTask extraTask, ReferentialSynchroResult result) throws SQLException { - String tableName = table.getName(); + ReferentialSynchroTableMetadata table = localDao.getTable(); + String tableName = localDao.table.getName(); result.addTableName(tableName); @@ -539,10 +570,14 @@ existingIds.removeAll(remoteExistingIds); if (log.isDebugEnabled()) { - log.debug(tablePrefix + " local data existingIds not in remote: " + existingIds); + log.debug(tablePrefix + " local data existingIds not in remote: " + existingIds.size()); } + if (log.isTraceEnabled()) { + for (String existingId : existingIds) { + log.trace("- " + existingId); + } + } - // copy extra rows from local Map<List<Object>, Object[]> extraRows = Maps.newLinkedHashMap(); @@ -556,6 +591,20 @@ extraRows.put(pk, extraRow); } + // remove obsolete extra rows + + if (extraTask != null) { + extraRows = extraTask.transformExtraLocalData(dbMetas, + localDao, + remoteDao, + extraRows); + + if (log.isDebugEnabled()) { + log.debug(tablePrefix + " local data existingIds not in remote (after apply task): " + extraRows.size()); + } + } + + // delete table localDao.deleteAll(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-15 12:45:59 UTC (rev 1487) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -24,10 +24,10 @@ * #L% */ -import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -41,10 +41,11 @@ import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.SortedSet; import static org.nuiton.i18n.I18n._; @@ -72,28 +73,20 @@ */ public class ReferentialSynchroTableMetadata { - protected static final String QUERY_SELECT_MAX_UPDATE = "SELECT max(update_date) FROM %s"; + public static final String PK_SEPARATOR = "~~"; - protected static final String QUERY_INSERT = "INSERT INTO %s (%s) VALUES (%s)"; + protected final String selectPrimaryKeysQuery; - protected static final String QUERY_UPDATE = "UPDATE %s SET %s WHERE %s"; + protected final String selectMaxUpdateDateQuery; - protected static final String QUERY_SELECT = "SELECT %s FROM %s WHERE %s"; - - protected static final String QUERY_SELECT_PRIMARY_KEYS = "SELECT %s FROM %s"; - - protected static final String QUERY_SELECT_COUNT = "SELECT count(*) FROM %s"; - - protected final String existingPrimaryKeysQuery; - - protected final String maxUpdateDateQuery; - protected final String countQuery; protected final TableMetadata delegate; protected final Map<String, ColumnMetadata> columns; + protected final List<String> columnNames; + protected final Set<String> pkNames; protected final int[] pkIndexs; @@ -106,16 +99,12 @@ protected final String countDataToUpdateQuery; - protected final String countDataToUpdateQueryWithNull; + protected final String selectDataToUpdateQuery; - protected final String dataToUpdateQuery; + protected final String selectAllQuery; - protected final String dataToUpdateQueryWithNull; - protected final String selectDataQueryFromPk; - protected final boolean simpleKey; - public ReferentialSynchroTableMetadata(TableMetadata delegate, DatabaseMetaData meta) { @@ -125,73 +114,46 @@ try { Field field = TableMetadata.class.getDeclaredField("columns"); field.setAccessible(true); - this.columns = (Map) field.get(delegate); + this.columns = Maps.<String, ColumnMetadata>newLinkedHashMap((Map) field.get(delegate)); this.withUpdateDateColumn = columns.containsKey("update_date"); + this.columnNames = initColumnNames(columns); this.pkNames = initPrimaryKeys(meta); Preconditions.checkNotNull(pkNames); - this.pkIndexs = createPkIndex(); - this.simpleKey = this.pkIndexs.length == 1; - - this.insertQuery = createInsertQuery(); - this.updateQuery = createUpdateQuery(); - this.maxUpdateDateQuery = String.format(QUERY_SELECT_MAX_UPDATE, getName()); - this.existingPrimaryKeysQuery = String.format(QUERY_SELECT_PRIMARY_KEYS, Joiner.on(',').join(pkNames), getName()); - this.countQuery = String.format(QUERY_SELECT_COUNT, getName()); } catch (Exception e) { throw new ApplicationTechnicalException(_("tutti.persistence.tableMetadata.instanciation.error", this), e); } - dataToUpdateQueryWithNull = "SELECT " + createSelectParams() + " FROM " + getName(); - countDataToUpdateQueryWithNull = "SELECT count(*) FROM " + getName(); - - this.selectDataQueryFromPk = createSelectQuery(); - String whereClause; - - if (isWithUpdateDateColumn()) { - - // add a filter - whereClause = " WHERE (update_date IS NULL OR update_date > ?)"; - } else { - whereClause = ""; - } - dataToUpdateQuery = dataToUpdateQueryWithNull + whereClause; - countDataToUpdateQuery = countDataToUpdateQueryWithNull + whereClause; + this.pkIndexs = createPkIndex(); + this.insertQuery = createInsertQuery(); + this.updateQuery = createUpdateQuery(); + this.selectMaxUpdateDateQuery = createSelectMaxUpdateDateQuery(); + this.selectPrimaryKeysQuery = createSelectPrimaryKeysQuery(); + this.selectAllQuery = createSelectAllQuery(); + this.selectDataQueryFromPk = createSelectDataFromPkQuery(); + this.selectDataToUpdateQuery = createSelectDataToUpdateQuery(); + this.countQuery = createCountQuery(); + this.countDataToUpdateQuery = createCountDataToUpdateQuery(); } // for tests purposes ReferentialSynchroTableMetadata() { - existingPrimaryKeysQuery = null; - - maxUpdateDateQuery = null; - - countQuery = null; - delegate = null; - columns = null; - + columnNames = null; pkNames = null; - pkIndexs = null; - + withUpdateDateColumn = false; insertQuery = null; - updateQuery = null; - - withUpdateDateColumn = false; - + countQuery = null; countDataToUpdateQuery = null; - - countDataToUpdateQueryWithNull = null; - - dataToUpdateQuery = null; - - dataToUpdateQueryWithNull = null; - + selectPrimaryKeysQuery = null; + selectMaxUpdateDateQuery = null; + selectDataToUpdateQuery = null; + selectAllQuery = null; selectDataQueryFromPk = null; - simpleKey = false; } public Set<String> getPkNames() { @@ -206,10 +168,15 @@ return columns.size(); } - public SortedSet<String> getColumnNames() { - return Sets.newTreeSet(columns.keySet()); + public Set<String> getColumnNames() { + return ImmutableSet.copyOf(columnNames); } + public int getColumnIndex(String name) { + int result = columnNames.indexOf(name); + return result; + } + public String getName() { return delegate.getName(); } @@ -238,6 +205,10 @@ return delegate.getIndexMetadata(indexName); } + //------------------------------------------------------------------------// + //-- queries methods --// + //------------------------------------------------------------------------// + public String getInsertQuery() { return insertQuery; } @@ -246,44 +217,46 @@ return updateQuery; } - public String getExistingPrimaryKeysQuery() { - return existingPrimaryKeysQuery; + public String getSelectPrimaryKeysQuery() { + return selectPrimaryKeysQuery; } - public String getMaxUpdateDateQuery() { - return maxUpdateDateQuery; + public String getSelectMaxUpdateDateQuery() { + return selectMaxUpdateDateQuery; } - public String getCountQuery() { - return countQuery; - } - public String getSelectDataQueryFromPk() { return selectDataQueryFromPk; } - public int[] getPkIndexs() { - return pkIndexs; + public String getSelectDataToUpdateQuery(Date fromDate) { + String sql = fromDate == null ? + selectAllQuery : + selectDataToUpdateQuery; + return sql; } - public String getDataToUpdateQuery() { - return dataToUpdateQuery; + public String getCountQuery() { + return countQuery; } - public String getDataToUpdateQueryWithNull() { - return dataToUpdateQueryWithNull; + public String getCountDataToUpdateQuery(Date fromDate) { + String sql = fromDate == null ? + countQuery : + countDataToUpdateQuery; + return sql; } - public String getCountDataToUpdateQuery() { - return countDataToUpdateQuery; - } + //------------------------------------------------------------------------// + //-- PK methods --// + //------------------------------------------------------------------------// - public String getCountDataToUpdateQueryWithNull() { - return countDataToUpdateQueryWithNull; + public int[] getPkIndexs() { + return pkIndexs; } public boolean isSimpleKey() { - return simpleKey; + return pkIndexs.length == 1; } public List<Object> getPk(ResultSet incomingData) throws SQLException { @@ -298,27 +271,38 @@ public String toPkStr(List<Object> pkList) { StringBuilder sb = new StringBuilder(); for (Object pk : pkList) { - sb.append("~|").append(pk); + sb.append(PK_SEPARATOR).append(pk); } - return sb.toString(); + return sb.substring(PK_SEPARATOR.length()); } public List<Object> fromPkStr(String pk) { List<Object> pkList = Lists.newArrayList(); - String[] split = pk.split("~\\|"); + String[] split = pk.split(PK_SEPARATOR); for (String s : split) { if ("null".equals(s)) { s = null; } pkList.add(s); } - pkList.remove(0); return pkList; } + //------------------------------------------------------------------------// + //-- Protected methods --// + //------------------------------------------------------------------------// + + protected List<String> initColumnNames(Map<String, ColumnMetadata> columns) { + List<String> result = Lists.newArrayListWithCapacity(columns.size()); + for (String name : columns.keySet()) { + result.add(name); + } + return Collections.unmodifiableList(result); + } + protected Set<String> initPrimaryKeys(DatabaseMetaData meta) throws SQLException { - Set<String> result = Sets.newHashSet(); + Set<String> result = Sets.newLinkedHashSet(); ResultSet rs = meta.getPrimaryKeys(getCatalog(), getSchema(), getName()); try { @@ -343,7 +327,7 @@ int i = 1; int index = -1; - for (String columnName : getColumnNames()) { + for (String columnName : columnNames) { if (pkColumnName.equals(columnName)) { index = i; } else { @@ -355,18 +339,17 @@ return result; } - protected String createInsertQuery() { StringBuilder queryParams = new StringBuilder(); StringBuilder valueParams = new StringBuilder(); - for (String columnName : getColumnNames()) { + for (String columnName : columnNames) { queryParams.append(", ").append(columnName); valueParams.append(", ?"); } - String result = String.format(QUERY_INSERT, + String result = String.format("INSERT INTO %s (%s) VALUES (%s)", getName(), queryParams.substring(2), valueParams.substring(2)); @@ -377,42 +360,89 @@ StringBuilder updateParams = new StringBuilder(); - for (String columnName : getColumnNames()) { + for (String columnName : columnNames) { updateParams.append(", ").append(columnName).append(" = ?"); } - String result = String.format(QUERY_UPDATE, + String result = String.format("UPDATE %s SET %s WHERE %s", getName(), updateParams.substring(2), createPkWhereClause()); return result; } - protected String createSelectQuery() { + protected String createSelectDataFromPkQuery() { - String result = String.format(QUERY_SELECT, + String result = String.format("SELECT %s FROM %s WHERE %s", createSelectParams(), getName(), createPkWhereClause()); return result; } + protected String createSelectPrimaryKeysQuery() { + + String prefix = " || '" + PK_SEPARATOR + "' || "; + StringBuilder pkParams = new StringBuilder(); + for (String columnName : pkNames) { + pkParams.append(prefix).append(columnName); + } + return String.format("SELECT %s FROM %s", + pkParams.substring(prefix.length()), + getName()); + } + + protected String createSelectAllQuery() { + return "SELECT " + createSelectParams() + " FROM " + getName(); + } + + protected String createSelectMaxUpdateDateQuery() { + return String.format("SELECT max(update_date) FROM %s", getName()); + } + + protected String createSelectDataToUpdateQuery() { + String whereClause = createWithUpdateDateWhereClause(); + return "SELECT " + createSelectParams() + " FROM " + getName() + whereClause; + } + + protected String createCountQuery() { + return String.format("SELECT count(*) FROM %s", getName()); + } + + protected String createCountDataToUpdateQuery() { + String whereClause = createWithUpdateDateWhereClause(); + return "SELECT count(*) FROM " + getName() + whereClause; + } + protected String createPkWhereClause() { StringBuilder pkParams = new StringBuilder(); - for (String columnName : getPkNames()) { + for (String columnName : pkNames) { pkParams.append("AND ").append(columnName).append(" = ?"); } return pkParams.substring(4); } + protected String createWithUpdateDateWhereClause() { + String whereClause; + + if (isWithUpdateDateColumn()) { + + // add a filter + whereClause = " WHERE (update_date IS NULL OR update_date > ?)"; + } else { + whereClause = ""; + } + return whereClause; + } + protected String createSelectParams() { StringBuilder queryParams = new StringBuilder(); - for (String columnName : getColumnNames()) { + for (String columnName : columnNames) { queryParams.append(", ").append(columnName); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java 2014-01-15 12:45:59 UTC (rev 1487) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -72,6 +72,11 @@ protected boolean debug; + public ReferentialSynchroTableTool(ReferentialSynchroTableTool tool, + ReferentialSynchroTableMetadata table) throws SQLException { + this(tool.connection, table); + } + public ReferentialSynchroTableTool(Connection connection, ReferentialSynchroTableMetadata table) throws SQLException { this.connection = connection; @@ -123,24 +128,15 @@ public Set<String> getExistingPrimaryKeys() throws SQLException { - Set<String> pkNames = table.getPkNames(); - int pkCount = pkNames.size(); - String sql = table.getExistingPrimaryKeysQuery(); + String sql = table.getSelectPrimaryKeysQuery(); PreparedStatement statement = connection.prepareStatement(sql); Set<String> result = Sets.newHashSet(); try { ResultSet resultSet = statement.executeQuery(); - - while (resultSet.next()) { - List<Object> pkList = Lists.newArrayListWithCapacity(pkNames.size()); - for (int i = 1; i <= pkCount; i++) { - Object pk = resultSet.getObject(i); - pkList.add(pk); - } - String pk = table.toPkStr(pkList); + String pk = resultSet.getString(1); result.add(pk); } statement.close(); @@ -152,9 +148,7 @@ public ResultSet getDataToUpdate(Date fromDate) throws SQLException { - String sql = fromDate == null ? - table.getDataToUpdateQueryWithNull() : - table.getDataToUpdateQuery(); + String sql = table.getSelectDataToUpdateQuery(fromDate); PreparedStatement statement = connection.prepareStatement(sql); if (table.isWithUpdateDateColumn() && @@ -164,8 +158,6 @@ statement.setFetchSize(1000); ResultSet result = statement.executeQuery(); -// // to be able to reward on resultSet -// ((RowSet)result).setType(ResultSet.TYPE_SCROLL_INSENSITIVE); return result; } @@ -291,7 +283,7 @@ if (table.isWithUpdateDateColumn()) { - String sql = table.getMaxUpdateDateQuery(); + String sql = table.getSelectMaxUpdateDateQuery(); PreparedStatement statement = connection.prepareStatement(sql); try { @@ -307,11 +299,9 @@ return result; } - public long getCountDataToUpdate(Date fromDate) throws SQLException { + public long countDataToUpdate(Date fromDate) throws SQLException { - String sql = fromDate == null ? - table.getCountDataToUpdateQueryWithNull() : - table.getCountDataToUpdateQuery(); + String sql = table.getCountDataToUpdateQuery(fromDate); PreparedStatement statement = connection.prepareStatement(sql); if (table.isWithUpdateDateColumn() && @@ -362,4 +352,8 @@ } } } + + public ReferentialSynchroTableMetadata getTable() { + return table; + } } Added: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -0,0 +1,63 @@ +package fr.ifremer.adagio.core.service.technical.synchro.specific; + +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroDatabaseMetadata; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTable; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableTool; + +import java.sql.SQLException; +import java.util.List; +import java.util.Map; + +/** + * Created on 1/15/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public interface ReferentialSynchroSpecificTableTask { + + /** + * @return the table on which the task can be apply. + */ + ReferentialSynchroTable getTable(); + + /** + * Given the extra rows of the local db, transform them to reinject them + * after in the current table. + * + * @param dbMetas + * @param localDao dao of the local db + * @param remoteDao dao of the remote db + * @param extraRows extra rows of the local db to transform + * @return transformed extra rows of the local db + */ + Map<List<Object>, Object[]> transformExtraLocalData(ReferentialSynchroDatabaseMetadata dbMetas, + ReferentialSynchroTableTool localDao, + ReferentialSynchroTableTool remoteDao, + Map<List<Object>, Object[]> extraRows) throws SQLException; + +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -0,0 +1,83 @@ +package fr.ifremer.adagio.core.service.technical.synchro.specific; + +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.Maps; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroDatabaseMetadata; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTable; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableMetadata; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableTool; + +import java.sql.SQLException; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Created on 1/15/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class VesselFeaturesReferentialSynchroSpecificTableTaskImpl implements ReferentialSynchroSpecificTableTask { + @Override + public ReferentialSynchroTable getTable() { + return ReferentialSynchroTable.VESSEL_FEATURES; + } + + @Override + public Map<List<Object>, Object[]> transformExtraLocalData(ReferentialSynchroDatabaseMetadata dbMetas, + ReferentialSynchroTableTool localDao, + ReferentialSynchroTableTool remoteDao, + Map<List<Object>, Object[]> extraRows) throws SQLException { + + // get all vessel codes already existing in remove db + + ReferentialSynchroTableMetadata vesselTable = + dbMetas.getTable(ReferentialSynchroTable.VESSEL.name()); + + ReferentialSynchroTableTool remoteVesselDao = + new ReferentialSynchroTableTool(remoteDao, vesselTable); + + Set<String> existingVesselCodes = remoteVesselDao.getExistingPrimaryKeys(); + + ReferentialSynchroTableMetadata table = localDao.getTable(); + + int columnIndex = table.getColumnIndex("vessel_fk"); + + Map<List<Object>, Object[]> result = Maps.newHashMap(); + + for (Map.Entry<List<Object>, Object[]> entry : extraRows.entrySet()) { + Object[] row = entry.getValue(); + Object vesselCode = row[columnIndex]; + if (!existingVesselCodes.contains(String.valueOf(vesselCode))) { + + // really a features from a the local db (temporary data for example, keep it) + result.put(entry.getKey(), entry.getValue()); + } + } + return result; + } +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -0,0 +1,83 @@ +package fr.ifremer.adagio.core.service.technical.synchro.specific; + +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.Maps; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroDatabaseMetadata; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTable; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableMetadata; +import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroTableTool; + +import java.sql.SQLException; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Created on 1/15/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl implements ReferentialSynchroSpecificTableTask { + @Override + public ReferentialSynchroTable getTable() { + return ReferentialSynchroTable.VESSEL_REGISTRATION_PERIOD; + } + + @Override + public Map<List<Object>, Object[]> transformExtraLocalData(ReferentialSynchroDatabaseMetadata dbMetas, + ReferentialSynchroTableTool localDao, + ReferentialSynchroTableTool remoteDao, + Map<List<Object>, Object[]> extraRows) throws SQLException { + + // get all vessel codes already existing in remove db + + ReferentialSynchroTableMetadata vesselTable = + dbMetas.getTable(ReferentialSynchroTable.VESSEL.name()); + + ReferentialSynchroTableTool remoteVesselDao = + new ReferentialSynchroTableTool(remoteDao, vesselTable); + + Set<String> existingVesselCodes = remoteVesselDao.getExistingPrimaryKeys(); + + ReferentialSynchroTableMetadata table = localDao.getTable(); + + int columnIndex = table.getColumnIndex("vessel_fk"); + + Map<List<Object>, Object[]> result = Maps.newHashMap(); + + for (Map.Entry<List<Object>, Object[]> entry : extraRows.entrySet()) { + Object[] row = entry.getValue(); + Object vesselCode = row[columnIndex]; + if (!existingVesselCodes.contains(String.valueOf(vesselCode))) { + + // really a features from a the local db (temporary data for example, keep it) + result.put(entry.getKey(), entry.getValue()); + } + } + return result; + } +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-01-15 12:45:59 UTC (rev 1487) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -64,6 +64,7 @@ import fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceService; import fr.ifremer.tutti.persistence.service.CatchBatchPersistenceService; import fr.ifremer.tutti.persistence.service.CruisePersistenceService; +import fr.ifremer.tutti.persistence.service.DatabaseCheckPersistenceService; import fr.ifremer.tutti.persistence.service.FishingOperationPersistenceService; import fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceService; import fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceService; @@ -134,6 +135,9 @@ protected AttachmentPersistenceService attachmentService; @Autowired + protected DatabaseCheckPersistenceService databaseCheckPersistenceService; + + @Autowired protected CacheService cacheService; @Autowired @@ -222,10 +226,14 @@ individualObservationBatchService.init(); protocolService.init(); attachmentService.init(); + databaseCheckPersistenceService.init(); TuttiEnumerationFile enumerationFile = getEnumerationFile(); batchVracPredicate = TuttiEntities.newSpeciesAbleBatchCategoryPredicate(enumerationFile.PMFM_ID_SORTED_UNSORTED, enumerationFile.QUALITATIVE_VRAC_ID); + + // check database is sane + databaseCheckPersistenceService.check(); } protected boolean close; @@ -252,6 +260,7 @@ individualObservationBatchService.close(); protocolService.close(); attachmentService.close(); + databaseCheckPersistenceService.close(); TuttiPersistenceServiceLocator.close(); } } Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceService.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceService.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -0,0 +1,44 @@ +package fr.ifremer.tutti.persistence.service; + +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; +import org.springframework.transaction.annotation.Transactional; + +/** + * To fix some errors in db. + * + * Created on 1/15/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0 + */ +@Transactional(readOnly = true) +public interface DatabaseCheckPersistenceService extends TuttiPersistenceServiceImplementor { + + @Transactional(readOnly = false) + public void check(); + +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceServiceImpl.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceServiceImpl.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -0,0 +1,98 @@ +package fr.ifremer.tutti.persistence.service; + +/* + * #%L + * Tutti :: Persistence + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.Lists; +import fr.ifremer.adagio.core.dao.data.vessel.feature.physical.VesselFeaturesImpl; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.FlushMode; +import org.hibernate.Query; +import org.hibernate.classic.Session; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * To fix some errors in db. + * <p/> + * Created on 1/15/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0 + */ +@Service("databaseCheckPersistenceService") +public class DatabaseCheckPersistenceServiceImpl extends AbstractPersistenceService + implements DatabaseCheckPersistenceService { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(DatabaseCheckPersistenceServiceImpl.class); + + @Override + public void check() { + checkVesselFeatures(); + } + + public void checkVesselFeatures() { + + // get all VESSEL_FEATURES with more than one unclosed period + Session currentSession = getCurrentSession(); + + Query query = currentSession.createQuery("SELECT vessel.code FROM " + VesselFeaturesImpl.class.getName() + " WHERE endDateTime IS NULL GROUP BY vessel.code HAVING COUNT(id)>1"); + List<String> vesselCodes = query.list(); + + if (CollectionUtils.isEmpty(vesselCodes)) { + if (log.isInfoEnabled()) { + log.info("vesselFeatures are sane"); + } + return; + } + + for (String vesselCode : vesselCodes) { + + // Get all features having a null endDatetime + Query query1 = currentSession.createQuery("SELECT id FROM " + VesselFeaturesImpl.class.getName() + " WHERE endDateTime IS NULL AND vessel.code = :vesselCode ORDER BY startDateTime DESC"); + query1.setString("vesselCode", vesselCode); + + List<Integer> vesselFeaturesIds = Lists.<Integer>newArrayList(query1.list()); + + // remove first id (this one will stay on db) + vesselFeaturesIds.remove(0); + + // remove all others ids + if (log.isInfoEnabled()) { + log.info("Remove vesselFeature with id: " + vesselFeaturesIds); + } + currentSession.createQuery("DELETE FROM " + VesselFeaturesImpl.class.getName() + " WHERE id in :id"). + setParameterList("id", vesselFeaturesIds).executeUpdate(); + } + + getCurrentSession().setFlushMode(FlushMode.COMMIT); + getCurrentSession().flush(); + } + +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/DatabaseCheckPersistenceServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask =================================================================== --- trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask (rev 0) +++ trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask 2014-01-15 16:34:18 UTC (rev 1488) @@ -0,0 +1,2 @@ +fr.ifremer.adagio.core.service.technical.synchro.specific.VesselFeaturesReferentialSynchroSpecificTableTaskImpl +fr.ifremer.adagio.core.service.technical.synchro.specific.VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl \ No newline at end of file Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java 2014-01-15 12:45:59 UTC (rev 1487) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java 2014-01-15 16:34:18 UTC (rev 1488) @@ -46,7 +46,7 @@ ReferentialSynchroTableMetadata table = new ReferentialSynchroTableMetadata(); String pkStr = table.toPkStr(pk); - Assert.assertEquals("~|a~|null~|3", pkStr); + Assert.assertEquals("a~~null~~3", pkStr); List<Object> fromPkStr = table.fromPkStr(pkStr);

1 0