Author: tchemit Date: 2012-09-22 14:28:11 +0200 (Sat, 22 Sep 2012) New Revision: 685 Url: http://forge.codelutin.com/repositories/revision/echobase/685 Log: improve remove import logs Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 12:27:48 UTC (rev 684) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 12:28:11 UTC (rev 685) @@ -190,15 +190,8 @@ String importType = getImportLabel(configuration); - StringBuilder buffer = new StringBuilder(); + String result = importLog.getImportText(); - buffer.append(importType); - buffer.append('\n').append(importLog.getImportText()); - - String result = buffer.toString(); - - importLog.setImportText(result); - create(getDAO(EntityModificationLog.class), EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import", EntityModificationLog.PROPERTY_ENTITY_ID, importType, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2012-09-22 12:27:48 UTC (rev 684) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2012-09-22 12:28:11 UTC (rev 685) @@ -280,7 +280,7 @@ } create(getDAO(EntityModificationLog.class), EntityModificationLog.PROPERTY_ENTITY_TYPE, "Removed Import", - EntityModificationLog.PROPERTY_ENTITY_ID, decorator.toString(importLog), + EntityModificationLog.PROPERTY_ENTITY_ID, importLog.getTopiaId(), EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, result