Author: sletellier Date: 2010-12-24 11:21:27 +0100 (Fri, 24 Dec 2010) New Revision: 659 Url: http://nuiton.org/repositories/revision/wikitty/659 Log: Prevent wikitty is obselete on import csv Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java 2010-12-24 09:46:08 UTC (rev 658) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java 2010-12-24 10:21:27 UTC (rev 659) @@ -74,7 +74,9 @@ log.info("Import in (ms)" + time); } // don't forget to commit :) - tx.commit(securityToken); + // FIXME sletellier 24/12/10 : provoque an wikitty is obselete +// tx.commit(securityToken); + tx.commit(securityToken, true); } catch (Exception eee) { tx.rollback(securityToken); throw new WikittyException("Error during import task", eee); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-12-24 09:46:08 UTC (rev 658) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-12-24 10:21:27 UTC (rev 659) @@ -103,6 +103,12 @@ events.clear(); } + public void commit(String securityToken, boolean force) { + ws.replay(securityToken, events, force); + this.tx.clear(null); + events.clear(); + } + public void rollback(String securityToken) { this.tx.clear(null); events.clear(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2010-12-24 09:46:08 UTC (rev 658) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2010-12-24 10:21:27 UTC (rev 659) @@ -36,6 +36,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.WikittyConfig; @@ -217,5 +218,16 @@ Assert.assertEquals(1, pagedResult4.getNumFound()); WikittyTreeNode mySubNode = pagedResult4.getFirst(); Assert.assertEquals("MySubNode", mySubNode.getName()); + + // test wikitty is obselete exception + try { + for (String importFile : importFiles) { + URL importFileURL = ImportExportCSVTest.class.getResource(importFile); + wsImport.syncImportFromUri(WikittyImportExportService.FORMAT.CSV, + importFileURL.toExternalForm()); + } + } catch (WikittyException eee) { + Assert.fail(); + } } }