- Echobase-commits - mailman.cloud.codelutin.com

r701 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com Sept. 23, 2012

Sept. 23, 2012

Author: tchemit Date: 2012-09-23 14:06:48 +0200 (Sun, 23 Sep 2012) New Revision: 701 Url: http://forge.codelutin.com/repositories/revision/echobase/701 Log: fix build Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) @@ -113,7 +113,7 @@ this.progressModel = progressModel; } - public abstract long computeNbSteps(Voyage voyage, ImportLog importLog); + public abstract long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException; protected abstract void removeImportData(Voyage voyage, String id) throws TopiaException; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) { + public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { long result = importLog.sizeImportId(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -import java.util.List; import java.util.Set; /** @@ -56,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) { + public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { long result = importLog.sizeImportId();

1 0

r700 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com Sept. 23, 2012

Sept. 23, 2012

Author: tchemit Date: 2012-09-23 14:03:21 +0200 (Sun, 23 Sep 2012) New Revision: 700 Url: http://forge.codelutin.com/repositories/revision/echobase/700 Log: refs #1437: Suppression des imports (suppression des Category li?\195?\169es aux echotypes) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 10:41:45 UTC (rev 699) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) @@ -128,7 +128,6 @@ for (String importId : importLog.getImportId()) { - try { removeImportData(voyage, importId); } catch (TopiaException e) { @@ -161,6 +160,27 @@ " from service " + this); } + protected void removeVoyage(Voyage entity) throws TopiaException { + + // get categories to remove after + List<Category> categories = getCategoryUsingEchotype(entity); + + // dettach obsolete categories from their echotypes + for (Category category : categories) { + category.setEchotype(null); + } + + // delete it + delete(voyageDao, entity); + + // remove obsolete categories + for (Category category : categories) { + + categoryDAO.delete(category); + incrementOp("Remove orphan category " + category.getTopiaId()); + } + } + protected void removeLengthWeightKey(Voyage entity, LengthWeightKey lengthWeightKey) throws TopiaException { @@ -187,7 +207,6 @@ incrementOp("Remove lengthAgeKey " + lengthAgeKey.getTopiaId()); } - protected void removeEchotype(Voyage entity, Echotype echotype) throws TopiaException { @@ -374,6 +393,21 @@ } } + private List<Category> getCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + String hql = "SELECT DISTINCT c FROM VoyageImpl v, CategoryImpl c WHERE " + + "v = :voyage AND c.echotype in elements(v.echotype)"; + List<Category> result = categoryDAO.findAllByQuery(hql, "voyage", voyage); + return result; + } + + + protected long countCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + + "v = :voyage AND c.echotype in elements(v.echotype)"; + long result = categoryDAO.countByQuery(hql, "voyage", voyage); + return result; + } + public void incrementOp(String message) { opIndex++; if (opIndex % 1000 == 0) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 10:41:45 UTC (rev 699) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) @@ -59,6 +59,9 @@ long result = importLog.sizeImportId(); + // add all categories to be removed after + result += countCategoryUsingEchotype(voyage); + // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -73,7 +76,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - delete(voyageDao, entity); + removeVoyage(entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 10:41:45 UTC (rev 699) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) @@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; +import java.util.List; import java.util.Set; /** @@ -59,6 +60,9 @@ long result = importLog.sizeImportId(); + // add all categories to be removed after + result += countCategoryUsingEchotype(voyage); + // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -73,7 +77,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - delete(voyageDao, entity); + removeVoyage(entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed");

1 0

r699 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy
by tchemit＠users.forge.codelutin.com Sept. 23, 2012

Sept. 23, 2012

Author: tchemit Date: 2012-09-23 12:41:45 +0200 (Sun, 23 Sep 2012) New Revision: 699 Url: http://forge.codelutin.com/repositories/revision/echobase/699 Log: fix api Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2012-09-23 10:34:51 UTC (rev 698) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2012-09-23 10:41:45 UTC (rev 699) @@ -23,11 +23,13 @@ * #L% */ +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceHelper; @@ -60,4 +62,12 @@ return (TopiaDAO<E>) getDAO(tx, type.getContract()); } + public final void flushTransaction(TopiaContext tx, String errorMessage) { + try { + ((TopiaContextImplementor) tx).getHibernate().flush(); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(errorMessage, e); + } + } + } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 10:34:51 UTC (rev 698) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 10:41:45 UTC (rev 699) @@ -121,11 +121,11 @@ } } - public static <T extends TopiaEntityEnum, E extends TopiaEntity> void importAllEntitiesIfNotExisting(TopiaDAO<E> dao, - TableMeta<T> meta, - Import<E> importer, - CsvImportResult<T> csvResult, - int nbRowBuffer) throws TopiaException { + public <T extends TopiaEntityEnum, E extends TopiaEntity> void importAllEntitiesIfNotExisting(TopiaDAO<E> dao, + TableMeta<T> meta, + Import<E> importer, + CsvImportResult<T> csvResult, + int nbRowBuffer) throws TopiaException { TopiaContextImplementor context = dao.getContext(); @@ -145,7 +145,8 @@ compt++; if (compt % nbRowBuffer == 0) { // flush it - context.getHibernate().flush(); + persistenceHelper.flushTransaction( + context, "could not flush transaction"); } }

1 0

r698 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services: importdata importdb/strategy
by tchemit＠users.forge.codelutin.com Sept. 23, 2012

Sept. 23, 2012

Author: tchemit Date: 2012-09-23 12:34:51 +0200 (Sun, 23 Sep 2012) New Revision: 698 Url: http://forge.codelutin.com/repositories/revision/echobase/698 Log: check if strategy exist before import it (special dirty case...) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-09-23 09:48:45 UTC (rev 697) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-09-23 10:34:51 UTC (rev 698) @@ -116,7 +116,7 @@ Map<String, Cell> esduCellMap = Maps.uniqueIndex( dataProcessing.getCell(), EchoBaseFunctions.CELL_BY_NAME); - // index all echotypes of thi voyage + // index all echotypes of this voyage Map<String, Echotype> echotypeMap = Maps.uniqueIndex( voyage.getEchotype(), EchoBaseFunctions.ECHOTYPE_NAME); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-23 09:48:45 UTC (rev 697) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-23 10:34:51 UTC (rev 698) @@ -70,7 +70,6 @@ "In data import, can not accept " + "referential type, but found some referential files: " + badTableTypes); } - } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 09:48:45 UTC (rev 697) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 10:34:51 UTC (rev 698) @@ -27,8 +27,11 @@ import fr.ifremer.echobase.persistence.EchoBasePersistenceHelper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.persistence.csv.CsvProgressModel; import org.nuiton.topia.persistence.csv.in.CsvImportResult; import org.nuiton.topia.persistence.csv.in.ImportModelFactory; import org.nuiton.topia.persistence.csv.in.ImportStrategy; @@ -38,6 +41,8 @@ import org.nuiton.util.csv.Import; import org.nuiton.util.csv.ImportToMap; +import java.util.Map; + /** * How to import csv files. * @@ -74,7 +79,14 @@ CsvImportResult<EchoBaseEntityEnum> csvResult) throws TopiaException { TopiaDAO<E> dao = persistenceHelper.getDAO(tx, meta.getSource()); - TopiaCsvImports.importAllEntities(dao, meta, importer, csvResult, nbRowBuffer); + if (meta.getSource() == EchoBaseEntityEnum.Category) { + + // special case, test if exists before to add it, otherwise skip it + importAllEntitiesIfNotExisting(dao, meta, importer, csvResult, nbRowBuffer); + + } else { + TopiaCsvImports.importAllEntities(dao, meta, importer, csvResult, nbRowBuffer); + } } @Override @@ -107,6 +119,43 @@ csvResult, nbRowBuffer); } + } + public static <T extends TopiaEntityEnum, E extends TopiaEntity> void importAllEntitiesIfNotExisting(TopiaDAO<E> dao, + TableMeta<T> meta, + Import<E> importer, + CsvImportResult<T> csvResult, + int nbRowBuffer) throws TopiaException { + + TopiaContextImplementor context = dao.getContext(); + + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); + + int compt = 0; + for (E entity : importer) { + + if (!dao.existByTopiaId(entity.getTopiaId())) { + + Map<String, Object> properties = meta.prepareCreate( + entity, entity.getTopiaId()); + E entityToSave = dao.create(properties); + + meta.copy(entity, entityToSave); + compt++; + if (compt % nbRowBuffer == 0) { + // flush it + context.getHibernate().flush(); + } + } + + if (csvResult != null) { + csvResult.incrementsNumberUpdated(); + if (progressModel != null) { + progressModel.incrementsProgress(); + } + } + + } } }

1 0

r697 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com Sept. 23, 2012

Sept. 23, 2012

Author: tchemit Date: 2012-09-23 11:48:45 +0200 (Sun, 23 Sep 2012) New Revision: 697 Url: http://forge.codelutin.com/repositories/revision/echobase/697 Log: fix dbeditor search for is null or is not null case for fk Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-23 09:26:40 UTC (rev 696) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-23 09:48:45 UTC (rev 697) @@ -341,29 +341,38 @@ Object realData = data; if (columnMeta.isFK()) { - // must do a select in using the decoration pattern + if (op==FilterRuleOperator.nu || op==FilterRuleOperator.nn){ - JXPathDecorator<?> decorator = - (JXPathDecorator<?>) getDecorator(columnMeta.getType()); + // is null or is not null is a simple case - if (decorator.getNbToken() == 1) { + ruleFilter = op.toHql(propertyName, + propertyName, + data, + filterParams); + } else { + // must do a select in using the decoration pattern + JXPathDecorator<?> decorator = + (JXPathDecorator<?>) getDecorator(columnMeta.getType()); - String fName = "f_" + timestamp + (index++); + if (decorator.getNbToken() == 1) { - // simple case one token - String token = fName + "." + decorator.getProperty(0); + String fName = "f_" + timestamp + (index++); - String subQuery = op.toHql(paramName, - token, - data, - filterParams); + // simple case one token + String token = fName + "." + decorator.getProperty(0); - ruleFilter = propertyName + " IN ( SELECT f FROM " + - columnMeta.getType().getName() + " " + - fName + " WHERE " + subQuery + ")"; - } else { + String subQuery = op.toHql(paramName, + token, + data, + filterParams); - throw new UnsupportedOperationException(); + ruleFilter = propertyName + " IN ( SELECT f FROM " + + columnMeta.getType().getName() + " " + + fName + " WHERE " + subQuery + ")"; + } else { + + throw new UnsupportedOperationException(); + } } } else {

1 0

r696 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com Sept. 23, 2012

Sept. 23, 2012

Author: tchemit Date: 2012-09-23 11:26:40 +0200 (Sun, 23 Sep 2012) New Revision: 696 Url: http://forge.codelutin.com/repositories/revision/echobase/696 Log: fix count model Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2012-09-22 16:25:23 UTC (rev 695) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2012-09-23 09:26:40 UTC (rev 696) @@ -61,9 +61,6 @@ // add all postCell result += voyage.sizePostCell(); - - // add all orphan cells - result += countVoyageOrphanCells(voyage); return result; }

1 0

r695 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com Sept. 22, 2012

Sept. 22, 2012

Author: tchemit Date: 2012-09-22 18:25:23 +0200 (Sat, 22 Sep 2012) New Revision: 695 Url: http://forge.codelutin.com/repositories/revision/echobase/695 Log: fix typo Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-09-22 16:12:24 UTC (rev 694) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-09-22 16:25:23 UTC (rev 695) @@ -260,7 +260,7 @@ InputFile inputFile = configuration.getRegionResultFile(); if (log.isInfoEnabled()) { - log.info("Starts import of Map cell results from file " + + log.info("Starts import of Region cell results from file " + inputFile.getFileName()); }

1 0

r694 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com Sept. 22, 2012

Sept. 22, 2012

Author: tchemit Date: 2012-09-22 18:12:24 +0200 (Sat, 22 Sep 2012) New Revision: 694 Url: http://forge.codelutin.com/repositories/revision/echobase/694 Log: fix import log 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 2012-09-22 16:00:01 UTC (rev 693) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 16:12:24 UTC (rev 694) @@ -165,9 +165,9 @@ description.append("]"); } } - buffer.append(description.toString()); + buffer.append(description.toString()).append('\n'); } - String importText = buffer.toString(); + String importText = buffer.toString().trim(); ImportLog importLog = create(getDAO(ImportLog.class), ImportLog.PROPERTY_VOYAGE_ID, configuration.getVoyageId(),

1 0

r693 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/importdb src/site src/site/rst
by tchemit＠users.forge.codelutin.com Sept. 22, 2012

Sept. 22, 2012

Author: tchemit Date: 2012-09-22 18:00:01 +0200 (Sat, 22 Sep 2012) New Revision: 693 Url: http://forge.codelutin.com/repositories/revision/echobase/693 Log: fix echotype import + site Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java trunk/src/site/rst/db.rst trunk/src/site/rst/usage.rst trunk/src/site/site_fr.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2012-09-22 15:29:02 UTC (rev 692) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2012-09-22 16:00:01 UTC (rev 693) @@ -104,8 +104,7 @@ EchoBaseEntityEnum source = meta.getSource(); EchoBaseEntityEnum target = meta.getTarget(); boolean result = false; - if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Echotype || - source == EchoBaseEntityEnum.Echotype && target == EchoBaseEntityEnum.Species || + if (source == EchoBaseEntityEnum.Echotype && target == EchoBaseEntityEnum.Species || source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Strata) { result = true; } Modified: trunk/src/site/rst/db.rst =================================================================== --- trunk/src/site/rst/db.rst 2012-09-22 15:29:02 UTC (rev 692) +++ trunk/src/site/rst/db.rst 2012-09-22 16:00:01 UTC (rev 693) @@ -52,6 +52,7 @@ en spécifiant une url sous ce format : :: + jdbc:h2:file:/cheminVersLaBase/nomDeLaBase Vous pouvez ensuite utiliser cette base qui va être crée automatiquement à @@ -63,6 +64,7 @@ Par convention, nous utilisons les identifiants suivants : :: + login: sa password: sa @@ -79,6 +81,7 @@ base de travail dans *EchoBase* de type *Postgresql* avec une url sous ce format : :: + jdbc:postgresql://adresseDuServeur/nomDeLaBase Les identifiants vous sont fournit par l'administrateur qui a installé la base Modified: trunk/src/site/rst/usage.rst =================================================================== --- trunk/src/site/rst/usage.rst 2012-09-22 15:29:02 UTC (rev 692) +++ trunk/src/site/rst/usage.rst 2012-09-22 16:00:01 UTC (rev 693) @@ -21,9 +21,9 @@ .. * #L% .. - -====================== -EchoBase - Utilisation -====================== +==================== +Première utilisation +==================== Comment utiliser EchoBase ------------------------- @@ -34,9 +34,6 @@ - une version en *mode serveur* qui nécessite l'installation d'*EchoBase* dans un serveur web de type *tomcat* ou *jetty*. -Nous détaillons dans les sections suivantes comment utiliser les différentes -versions. - Utiliser la version mode portable ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -103,6 +100,7 @@ L'application va démarrer et est accessible à l'adresse suivante: :: + http://localhost:8888 Procédure détaillée (sous windows) @@ -114,11 +112,13 @@ - Se placer dans le répertoire où a été dézippée l'archive :: + cd Chemin vers l'archive dézippée - Enfin lancer le script :: + startEchobase.bat - Dans la console on doit voir l'application démarré et produire des logs @@ -133,16 +133,19 @@ - Se placer dans le répertoire où a été dézippée l'archive :: + cd Chemin vers l'archive dézippée - Rendre le script de démarrage exécutable :: + chmod +x startEchobase.sh - Enfin lancer le script :: + ./startEchobase.sh - Dans la console on doit voir l'application démarré et produire des logs Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-22 15:29:02 UTC (rev 692) +++ trunk/src/site/site_fr.xml 2012-09-22 16:00:01 UTC (rev 693) @@ -108,7 +108,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Utilisation" href="usage.html"/> + <item name="Démarrage" href="usage.html"/> <item name="Bases de travail" href="db.html"/> <item name="Import/Export Base" href="#">

1 0

r692 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com Sept. 22, 2012

Sept. 22, 2012

Author: tchemit Date: 2012-09-22 17:29:02 +0200 (Sat, 22 Sep 2012) New Revision: 692 Url: http://forge.codelutin.com/repositories/revision/echobase/692 Log: fix doc links Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-22 15:25:32 UTC (rev 691) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-22 15:29:02 UTC (rev 692) @@ -53,7 +53,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','acoustic')}" target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-22 15:25:32 UTC (rev 691) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-22 15:29:02 UTC (rev 692) @@ -46,8 +46,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','totalsample-subsample-biometrysample')}" - target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-22 15:25:32 UTC (rev 691) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-22 15:29:02 UTC (rev 692) @@ -61,8 +61,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','voyage-transit-transect')}" - target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> @@ -130,8 +129,7 @@ <s:hidden key="model.importType" value="COMMON_TRANSECT" label=''/> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','voyage-transit-transect')}" - target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-22 15:25:32 UTC (rev 691) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-22 15:29:02 UTC (rev 692) @@ -40,8 +40,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','operation-operationmetadatavalue-gearmetadatavalue')}" - target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-22 15:25:32 UTC (rev 691) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-22 15:29:02 UTC (rev 692) @@ -69,8 +69,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','r-sultats-voyag')}" - target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> @@ -110,8 +109,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','r-sultats-esdu')}" - target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> @@ -161,7 +159,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','region')}" target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> @@ -201,7 +199,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('imports.html','map')}" target="doc"> + <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div>

1 0