Author: tchemit Date: 2014-04-19 15:24:36 +0200 (Sat, 19 Apr 2014) New Revision: 1710 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1710 Log: refs-90 #4977 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/ReferentialSynchroTable.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-04-18 15:37:53 UTC (rev 1709) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-04-19 13:24:36 UTC (rev 1710) @@ -294,6 +294,9 @@ } catch (SQLException e1) { // ignore the rolback error + if (log.isErrorEnabled()) { + log.error(e1); + } } result.setError(e); } finally { @@ -533,11 +536,11 @@ * </ul> * In that way we will only perform some insert queries. * - * @param dbMetas + * @param dbMetas metas of the db to synch * @param localDao connection on the local db * @param remoteDao connection on the local db * @param incomingData data to update from the remote db - * @param extraTask + * @param extraTask extra task to perform while synchronizing the table * @param result where to store operation results @throws SQLException if any sql errors */ protected void updateBigTable(ReferentialSynchroDatabaseMetadata dbMetas, Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-18 15:37:53 UTC (rev 1709) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-19 13:24:36 UTC (rev 1710) @@ -112,6 +112,27 @@ //ORDER ORDER_ITEM, + //PROGRAM (since 3.3.5) + PROGRAM, + PROGRAM2LOCATION, + PROGRAM2LOCATION_CLASSIF, + + //STRATEGY (since 3.5) + ACQUISITION_LEVEL, + PROGRAM_PRIVILEGE, + PROGRAM2DEPARTMENT, + PROGRAM2PERSON_EXCEPTION, + PROGRAM2PERSON, + STRATEGY, + STRATEGY2MANAGER_PERSON, + PMFM_APPLIED_STRATEGY, + APPLIED_STRATEGY, + PMFM_STRATEGY, + REFERENCE_TAXON_STRATEGY, + STRATEGY2GEAR, + //FIXME-tchemit-2014-04-19 This table fails to update +// APPLIED_PERIOD, + //OTHER PRECISION_TYPE, NUMERICAL_PRECISION,