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

r741 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com Oct. 24, 2012

Oct. 24, 2012

Author: tchemit Date: 2012-10-24 14:18:10 +0200 (Wed, 24 Oct 2012) New Revision: 741 Url: http://forge.codelutin.com/repositories/revision/echobase/741 Log: add nice method to import test db Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-10-21 18:36:58 UTC (rev 740) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2012-10-24 12:18:10 UTC (rev 741) @@ -30,7 +30,14 @@ import fr.ifremer.echobase.entities.data.DataProcessing; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.io.InputFile; +import fr.ifremer.echobase.services.exportdb.ExportDbConfiguration; +import fr.ifremer.echobase.services.exportdb.ExportDbMode; +import fr.ifremer.echobase.services.exportdb.ExportDbService; import fr.ifremer.echobase.services.importdata.EchoBaseCsvFileImportResult; +import fr.ifremer.echobase.services.importdata.ImportException; +import fr.ifremer.echobase.services.importdb.ImportDbConfiguration; +import fr.ifremer.echobase.services.importdb.ImportDbMode; +import fr.ifremer.echobase.services.importdb.ImportDbService; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -40,6 +47,7 @@ import org.junit.Rule; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; import java.io.File; @@ -225,4 +233,40 @@ Preconditions.checkNotNull(dataProcessing); return dataProcessing.getTopiaId(); } + + protected void importdb(ImportDbMode mode, String path) throws IOException, ImportException { + + ImportDbService service = getService(ImportDbService.class); + + ImportDbConfiguration conf = new ImportDbConfiguration(getLocale()); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setComputeSteps(true); + conf.setCommitAfterEachFile(false); + conf.setImportDbMode(mode); + prepareInputFile(conf.getInput(), path); + + EchoBaseUser user = new EchoBaseUserImpl(); + user.setEmail("testUser(a)fake.fr"); + + service.doImport(conf, user); + } + + protected void exportDb(Voyage voyage, String exportFilename) throws IOException { + + ExportDbService service = getService(ExportDbService.class); + + ExportDbConfiguration conf = new ExportDbConfiguration(); + conf.setVoyageIds(new String[]{voyage.getTopiaId()}); + + File workingDirectory = new File(getTestDir(), "work-dir"); + FileUtil.createDirectoryIfNecessary(workingDirectory); + conf.setWorkingDirectory(workingDirectory); + conf.setFileName(exportFilename); + conf.setComputeSteps(true); + conf.setExportDbMode(ExportDbMode.ALL); + service.doExport(conf); + } }

1 0

r740 - in trunk/echobase-ui/src/main: resources/i18n webapp/WEB-INF/jsp/exportQuery
by tchemit＠users.forge.codelutin.com Oct. 21, 2012

Oct. 21, 2012

Author: tchemit Date: 2012-10-21 20:36:58 +0200 (Sun, 21 Oct 2012) New Revision: 740 Url: http://forge.codelutin.com/repositories/revision/echobase/740 Log: fixes #1528: Am?\195?\169liorer la gestion des requ?\195?\170tes libre-office Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-10-21 18:16:19 UTC (rev 739) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-10-21 18:36:58 UTC (rev 740) @@ -19,10 +19,10 @@ echobase.action.exportTable=Export echobase.action.generateSqlQuery=Generate query echobase.action.import=Import +echobase.action.importLibreOfficeQuery=Import a Libre Office query echobase.action.importTable=Import echobase.action.login=Connect echobase.action.logout=Disconnect -echobase.action.newLibreOfficeQuery=New Libre Office query echobase.action.newQuery=New query echobase.action.newWorkingDbContiguration=New working database configuration echobase.action.reloadSqlQuery=Reload Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-10-21 18:16:19 UTC (rev 739) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-10-21 18:36:58 UTC (rev 740) @@ -19,10 +19,10 @@ echobase.action.exportTable=Exporter echobase.action.generateSqlQuery=Générer la requête echobase.action.import=Importer +echobase.action.importLibreOfficeQuery=Importer une requête Libre Office echobase.action.importTable=Importer echobase.action.login=Connexion echobase.action.logout=Déconnexion -echobase.action.newLibreOfficeQuery=Nouvelle requête Libre Office echobase.action.newQuery=Nouvelle requête echobase.action.newWorkingDbContiguration=Nouvelle configuration de base de travail echobase.action.reloadSqlQuery=Recharger Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-10-21 18:16:19 UTC (rev 739) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-10-21 18:36:58 UTC (rev 740) @@ -59,20 +59,9 @@ function openNewLibreOfficeDialog() { var dialog = $("#newLibreOfficeDialog"); var url = "<s:url action='newLibreOfficeQuery' namespace='/exportQuery' method="input"/>"; + dialog.html(""); dialog.load(url); dialog.dialog('open'); - } - - function newLibreOfficeQuery() { - if (<s:property value="%{queryExists or (!newQuery and !newLibreOfficeQuery)}"/>) { - reloadPage({'newLibreOfficeQuery':true}); - } else { - $('[name="query.topiaId"]').val(''); - $('[name="query.name"]').val(''); - $('[name="query.description"]').val(''); - $('[name="query.sqlQuery"]').val(''); - openNewLibreOfficeDialog(); - } return false; } @@ -95,10 +84,6 @@ <s:submit onclick="return newQuery('newQuery');" theme="simple" key="echobase.action.newQuery"/> </li> - <li> - <s:submit onclick="return newQuery('newLibreOfficeQuery');" theme="simple" - key="echobase.action.newLibreOfficeQuery"/> - </li> </ul> <fieldset> @@ -133,6 +118,10 @@ </s:if> <ul id="dbeditorToolbar" class="toolbar floatRight"> + <li> + <s:submit onclick="return openNewLibreOfficeDialog();" theme="simple" + key="echobase.action.importLibreOfficeQuery"/> + </li> <s:if test="queryExists"> <li> <s:submit onclick="return reloadQuery();" theme="simple"

1 0

r739 - trunk/echobase-ui/src/main/assembly/dist
by tchemit＠users.forge.codelutin.com Oct. 21, 2012

Oct. 21, 2012

Author: tchemit Date: 2012-10-21 20:16:19 +0200 (Sun, 21 Oct 2012) New Revision: 739 Url: http://forge.codelutin.com/repositories/revision/echobase/739 Log: fixes #1596: Faire en sorte que l'application embarqu?\195?\169e se lance bien depuis un r?\195?\169pertoire avec des espaces Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2012-10-18 07:34:38 UTC (rev 738) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2012-10-21 18:16:19 UTC (rev 739) @@ -10,8 +10,7 @@ OLDPWD=`pwd` cd `dirname $0` -CURRENTPWD=`pwd` -ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" +ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=./logs" java $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* cd "$OLDPWD"

1 0

r738 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com Oct. 18, 2012

Oct. 18, 2012

Author: tchemit Date: 2012-10-18 09:34:38 +0200 (Thu, 18 Oct 2012) New Revision: 738 Url: http://forge.codelutin.com/repositories/revision/echobase/738 Log: fixes #1607: Probl?\195?\168mes sur le filtre de recherche 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-10-18 07:27:32 UTC (rev 737) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-10-18 07:34:38 UTC (rev 738) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services; +import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -132,11 +133,12 @@ hql += " WHERE " + filterHql; } + Object[] params = paramsList.toArray(); + if (log.isInfoEnabled()) { - log.info("filterHql = " + hql); + log.info("filterHql = " + hql + "\n" + Joiner.on('\n').join(params)); } - Object[] params = paramsList.toArray(); long count = dao.countByQuery("SELECT COUNT(*) " + hql, params); @@ -367,7 +369,7 @@ data, filterParams); - ruleFilter = propertyName + " IN ( SELECT f FROM " + + ruleFilter = propertyName + " IN ( FROM " + columnMeta.getType().getName() + " " + fName + " WHERE " + subQuery + ")"; } else {

1 0

r737 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com Oct. 18, 2012

Oct. 18, 2012

Author: tchemit Date: 2012-10-18 09:27:32 +0200 (Thu, 18 Oct 2012) New Revision: 737 Url: http://forge.codelutin.com/repositories/revision/echobase/737 Log: only show ui when loaded Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-10-18 06:16:37 UTC (rev 736) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-10-18 07:27:32 UTC (rev 737) @@ -34,7 +34,7 @@ <title> <s:if test="admin"> - <s:text name="echobase.title.dbEditor"/> + <s:text name="echobase.title.dbEditor"/> </s:if> <s:else> <s:text name="echobase.title.dbEditor.read"/> @@ -192,9 +192,9 @@ // FIXME sletellier 20111122 : currently, one month more are displayed.... var month = parseInt(dateSplited[1]) - 1; var year = parseInt(dateSplited[2]); - var hour = parseInt(!!hourSplited[0]?hourSplited[0]:0); - var minute = parseInt(!!hourSplited[1]?hourSplited[1]:0); - var second = parseInt(hourSplited[2]?hourSplited[2]:0); + var hour = parseInt(!!hourSplited[0] ? hourSplited[0] : 0); + var minute = parseInt(!!hourSplited[1] ? hourSplited[1] : 0); + var second = parseInt(hourSplited[2] ? hourSplited[2] : 0); // update date return new Date(year, month, day, hour, minute, second, 0); @@ -299,24 +299,8 @@ <br class="clearBoth"/> - <fieldset id="noRowSelected"> - <legend> - <s:if test="admin"> - <s:text name="echobase.legend.dbeditor.edit"> - <s:param value="%{tableI18nName}"/> - </s:text> - </s:if> - <s:else> - <s:text name="echobase.legend.dbeditor.show"> - <s:param value="%{tableI18nName}"/> - </s:text> - </s:else> - </legend> - <i><s:text name="echobase.message.no.row.selected"/>.</i> - </fieldset> - - <s:form id="editForm" namespace="/dbeditor"> - <fieldset> + <div class="showAtLoad hidden"> + <fieldset id="noRowSelected"> <legend> <s:if test="admin"> <s:text name="echobase.legend.dbeditor.edit"> @@ -329,58 +313,79 @@ </s:text> </s:else> </legend> + <i><s:text name="echobase.message.no.row.selected"/>.</i> + </fieldset> - <s:hidden key="entityType" label=''/> + <s:form id="editForm" namespace="/dbeditor"> + <fieldset> + <legend> + <s:if test="admin"> + <s:text name="echobase.legend.dbeditor.edit"> + <s:param value="%{tableI18nName}"/> + </s:text> + </s:if> + <s:else> + <s:text name="echobase.legend.dbeditor.show"> + <s:param value="%{tableI18nName}"/> + </s:text> + </s:else> + </legend> - <s:textfield id="topiaId" name='topiaId' readonly="true" - label='%{getText("echobase.common.id")}' size="250"/> + <s:hidden key="entityType" label=''/> - <s:iterator value="columnMetas" var="meta" status="status"> - <s:set var="metaName" value='%{#meta.name}'/> - <s:if test="#meta.fK"> - <s:url id="urlName" action="getForeignEntities" namespace="/dbeditor" - escapeAmp="false"> - <s:param name="entityType" value="%{#meta.typeSimpleName}"/> - </s:url> - <sj:select id="%{#metaName}" label="%{#metaName}" readonly="%{!admin}" - href="%{urlName}" list="entities" emptyOption="true"/> - </s:if> - <s:else> - <s:if test='#meta.columnType == "string"'> - <s:textfield id="%{#metaName}" name="%{#metaName}" - label="%{#metaName}" disabled="%{#meta.fK}" - value="" size="250" readonly="%{!admin}"/> + <s:textfield id="topiaId" name='topiaId' readonly="true" + label='%{getText("echobase.common.id")}' size="250"/> + + <s:iterator value="columnMetas" var="meta" status="status"> + <s:set var="metaName" value='%{#meta.name}'/> + <s:if test="#meta.fK"> + <s:url id="urlName" action="getForeignEntities" + namespace="/dbeditor" + escapeAmp="false"> + <s:param name="entityType" value="%{#meta.typeSimpleName}"/> + </s:url> + <sj:select id="%{#metaName}" label="%{#metaName}" + readonly="%{!admin}" + href="%{urlName}" list="entities" emptyOption="true"/> </s:if> - <s:elseif test='#meta.columnType == "boolean"'> - <s:checkbox id="%{#metaName}" name="%{#metaName}" - readonly="%{!admin}" - label="%{#metaName}" value="%{false}"/> - </s:elseif> - <s:elseif test='#meta.columnType == "date"'> - <sj:datepicker id="%{#metaName}" name="%{#metaName}" - label="%{#metaName}" value="%{new java.util.Date()}" - displayFormat="dd/mm/yy" timepicker="true" - timepickerShowSecond="true" readonly="%{!admin}" - timepickerFormat="hh:mm:ss"/> - </s:elseif> - </s:else> - <br/> - </s:iterator> - </fieldset> - <s:if test="admin"> - <div class="toolbar"> - <ul class="toolbar floatRight"> - <li><s:submit name='resetAction' key="echobase.action.reset" - theme="simple" onclick="return false;"/> - </li> - <li><s:submit name="submitAction" key="echobase.action.save" - action="editTableData" theme="simple"/> - </li> - </ul> - </div> - </s:if> - </s:form> + <s:else> + <s:if test='#meta.columnType == "string"'> + <s:textfield id="%{#metaName}" name="%{#metaName}" + label="%{#metaName}" disabled="%{#meta.fK}" + value="" size="250" readonly="%{!admin}"/> + </s:if> + <s:elseif test='#meta.columnType == "boolean"'> + <s:checkbox id="%{#metaName}" name="%{#metaName}" + readonly="%{!admin}" + label="%{#metaName}" value="%{false}"/> + </s:elseif> + <s:elseif test='#meta.columnType == "date"'> + <sj:datepicker id="%{#metaName}" name="%{#metaName}" + label="%{#metaName}" + value="%{new java.util.Date()}" + displayFormat="dd/mm/yy" timepicker="true" + timepickerShowSecond="true" readonly="%{!admin}" + timepickerFormat="hh:mm:ss"/> + </s:elseif> + </s:else> + <br/> + </s:iterator> + </fieldset> + <s:if test="admin"> + <div class="toolbar"> + <ul class="toolbar floatRight"> + <li><s:submit name='resetAction' key="echobase.action.reset" + theme="simple" onclick="return false;"/> + </li> + <li><s:submit name="submitAction" key="echobase.action.save" + action="editTableData" theme="simple"/> + </li> + </ul> + </div> + </s:if> + </s:form> + </div> </s:if> <script type="text/javascript"> @@ -393,5 +398,7 @@ <s:else> $('#tab_exportForm > a').click(); </s:else> + + $('.showAtLoad').removeClass('showAtLoad').removeClass('hidden').show(); }); </script> \ No newline at end of file

1 0

r736 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery
by tchemit＠users.forge.codelutin.com Oct. 18, 2012

Oct. 18, 2012

Author: tchemit Date: 2012-10-18 08:16:37 +0200 (Thu, 18 Oct 2012) New Revision: 736 Url: http://forge.codelutin.com/repositories/revision/echobase/736 Log: fixes #1606: Permettre de changer le nom d'une requ?\195?\170te clon?\195?\169e Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-10-17 18:40:04 UTC (rev 735) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-10-18 06:16:37 UTC (rev 736) @@ -113,7 +113,7 @@ <legend><s:text name="echobase.legend.sqlQuery.configuration"/></legend> <s:textarea key="query.name" required="true" cols="160" rows="1" - readonly="%{queryExists}" + readonly="%{queryExists and !canUpdateQuery}" label="%{getText('echobase.label.query.name')}"/> <s:textarea key="query.description" required="true" cols="160" rows="2"

1 0

r735 - trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda
by tchemit＠users.forge.codelutin.com Oct. 17, 2012

Oct. 17, 2012

Author: tchemit Date: 2012-10-17 20:40:04 +0200 (Wed, 17 Oct 2012) New Revision: 735 Url: http://forge.codelutin.com/repositories/revision/echobase/735 Log: fixes #1601: Il manque des donn?\195?\169es de p?\195?\170che (juste ajouter le depthStratum qui manque) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv.gz Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/baracouda/Operation.csv.gz =================================================================== (Binary files differ)

1 0

r734 - in trunk: echobase-domain/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery
by tchemit＠users.forge.codelutin.com Oct. 17, 2012

Oct. 17, 2012

Author: tchemit Date: 2012-10-17 18:38:04 +0200 (Wed, 17 Oct 2012) New Revision: 734 Url: http://forge.codelutin.com/repositories/revision/echobase/734 Log: fixes #1606: Permettre de changer le nom d'une requ?\195?\170te clon?\195?\169e Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2012-10-17 15:45:14 UTC (rev 733) +++ trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2012-10-17 16:38:04 UTC (rev 734) @@ -51,7 +51,7 @@ fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true -fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.WorkingDbConfiguration.class.tagValue.naturalIdMutable=true Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2012-10-17 15:45:14 UTC (rev 733) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2012-10-17 16:38:04 UTC (rev 734) @@ -37,6 +37,7 @@ import java.util.List; import java.util.Map; +import java.util.regex.Pattern; /** * Service to deal with sql export. @@ -62,6 +63,8 @@ return entityToSave; } + protected static final Pattern NAME_PATTERN = Pattern.compile("[\\d\\w_-]+"); + public ExportQuery createOrUpdate(ExportQuery exportQuery, EchoBaseUser user) throws ExportQueryNameAlreadyExistException, ExportQueryInvalidNameException { try { @@ -75,7 +78,7 @@ String queryName = exportQuery.getName(); - if (!StringUtils.isAlphanumeric(queryName)) { + if (!NAME_PATTERN.matcher(queryName).matches()) { // can not accept a non alpha numeric name throw new ExportQueryInvalidNameException(); @@ -100,7 +103,7 @@ entityToSave = dao.create(exportQuery); } else { entityToSave = dao.findByTopiaId(id); -// entityToSave.setName(queryName); + entityToSave.setName(queryName); entityToSave.setDescription(exportQuery.getDescription()); entityToSave.setSqlQuery(exportQuery.getSqlQuery()); entityToSave.setLastModifiedDate(exportQuery.getLastModifiedDate());

1 0

r733 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com Oct. 17, 2012

Oct. 17, 2012

Author: tchemit Date: 2012-10-17 17:45:14 +0200 (Wed, 17 Oct 2012) New Revision: 733 Url: http://forge.codelutin.com/repositories/revision/echobase/733 Log: fixes #1604: Impossible de rechercher via un op?\195?\169rateur de comparaison de chaine de caract?\195?\168res sur un nombre 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-10-17 15:16:36 UTC (rev 732) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-10-17 15:45:14 UTC (rev 733) @@ -129,12 +129,13 @@ if (pager != null && pager.canFilter()) { String filterHql = getFilterHql(tableMeta, pager, paramsList); - if (log.isInfoEnabled()) { - log.info("filterHql = " + filterHql); - } hql += " WHERE " + filterHql; } + if (log.isInfoEnabled()) { + log.info("filterHql = " + hql); + } + Object[] params = paramsList.toArray(); long count = dao.countByQuery("SELECT COUNT(*) " + hql, params); @@ -341,7 +342,7 @@ Object realData = data; if (columnMeta.isFK()) { - if (op==FilterRuleOperator.nu || op==FilterRuleOperator.nn){ + if (op == FilterRuleOperator.nu || op == FilterRuleOperator.nn) { // is null or is not null is a simple case @@ -378,12 +379,29 @@ } else { if (columnMeta.isNumber()) { - if (columnMeta.getType() == int.class || - columnMeta.getType() == Integer.class) { - realData = Integer.valueOf(data); + + if (op == FilterRuleOperator.cn || + op == FilterRuleOperator.nc || + op == FilterRuleOperator.bw || + op == FilterRuleOperator.bn || + op == FilterRuleOperator.ew || + op == FilterRuleOperator.en) { + + // string operation + +// realData = "'" + realData + "'"; + propertyName = "str(" + propertyName + ")"; } else { - realData = Double.valueOf(data); + // real number operation + + if (columnMeta.getType() == int.class || + columnMeta.getType() == Integer.class) { + realData = Integer.valueOf(data); + } else { + + realData = Double.valueOf(data); + } } } else if (columnMeta.isDate()) { propertyName = "str(" + propertyName + ")";

1 0

r732 - trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new
by tchemit＠users.forge.codelutin.com Oct. 17, 2012

Oct. 17, 2012

Author: tchemit Date: 2012-10-17 17:16:36 +0200 (Wed, 17 Oct 2012) New Revision: 732 Url: http://forge.codelutin.com/repositories/revision/echobase/732 Log: refs #1601: Il manque des donn?\195?\169es de p?\195?\170che (ajout SizeCategory H) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv.gz Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/SizeCategory.csv.gz =================================================================== (Binary files differ)

1 0