Author: tchemit Date: 2013-03-19 09:02:37 +0100 (Tue, 19 Mar 2013) New Revision: 800 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/800 Log: fixes #2089: Pb de mise ?\195?\160 jour des champs du tableau de bord fixes #2070: Les r?\195?\169sultats de type "carte" ne s'affichent pas dans le tableau de bord Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2013-03-19 08:01:36 UTC (rev 799) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2013-03-19 08:02:37 UTC (rev 800) @@ -112,7 +112,7 @@ s0 = TIME_LOG.log(s0, "importDone"); // add result in log book and compute resume to show in result -// String result = computeResultAndLogBookEntry(configuration, user); + String result = computeResultAndLogBookEntry(configuration, user); // do commit commitTransaction("Could not execute import " + @@ -120,8 +120,7 @@ TIME_LOG.log(s0, "importCommited"); -// return result; - return ""; + return result; } catch (EchoBaseTechnicalException e) { throw new ImportException(e.getMessage(), e); } @@ -288,8 +287,6 @@ return message; } - static long s0 =TimeLog.getTime(); - protected final void doFlushTransaction(int rowNumber, InputFile inputFile, M configuration) { @@ -297,13 +294,7 @@ if (rowNumber % 1000 == 0) { // flush each 1000 imported rows String message = getImportMessage(configuration, inputFile); -// long s0 = TimeLog.getTime(); -// flushTransaction("Could not flush transaction " + message); - s0 = TIME_LOG.log(s0, message); - commitTransaction("Could committransaction " + message); - if (log.isInfoEnabled()) { - log.info("Progression, row done: " + rowNumber); - } + flushTransaction("Could not flush transaction " + message); } }