branch feature/7648-export-recherche-projets updated (c754357 -> ea841ee)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7648-export-recherche-projets in repository coselmar. See http://git.codelutin.com/coselmar.git discards c754357 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream discards 70d91ea #7774 utilisation de l'export en InputStream de nuiton-csv adds 5555369 refs-10 #7778 Prepare la recherche avancée sur les documents adds 4eca421 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service adds fe40b40 refs-30 #7778 Revue de la couche DAO pour la recherche de documents adds cc162cf refs-90 #7778 Revue avancée de documents adds baed38f refs-90 #7778 Ajout d'un filtre de recherche sur la date de dépot d'un document new 1ffae28 #7774 utilisation de l'export en InputStream de nuiton-csv new ea841ee 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c754357) \ N -- N -- N refs/heads/feature/7648-export-recherche-projets (ea841ee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ea841eeee5e8992a462156fc05ff429803e49919 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 10 10:20:10 2015 +0100 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream commit 1ffae28f2b6334194f059ccf63069e9c12f819b5 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 9 12:04:54 2015 +0100 #7774 utilisation de l'export en InputStream de nuiton-csv Summary of changes: .../coselmar/beans/DocumentSearchExample.java | 69 +++++++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 30 +--- .../fr/ifremer/coselmar/beans/SearchExample.java | 65 +++++++++ .../fr/ifremer/coselmar/persistence/DaoUtils.java | 34 +++++ .../coselmar/persistence/SearchRequestBean.java | 14 +- .../persistence/entity/DocumentTopiaDao.java | 137 +++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 2 +- ...UserSearchBean.java => DocumentSearchBean.java} | 35 ++++- .../coselmar/converter/BeanEntityConverter.java | 60 ++++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../indexation/QuestionsIndexationService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 48 ++++-- .../coselmar/services/v1/UsersWebService.java | 2 +- .../coselmar/services/QuestionsWebServiceTest.java | 14 +- .../indexation/QuestionsIndexationServiceTest.java | 54 +++---- coselmar-ui/src/main/webapp/i18n/en.js | 3 + coselmar-ui/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/coselmar-controllers.js | 36 +++-- .../src/main/webapp/js/coselmar-services.js | 9 +- .../src/main/webapp/views/documents/documents.html | 17 +-- .../main/webapp/views/documents/editDocument.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 162 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 2 +- 24 files changed, 690 insertions(+), 116 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserSearchBean.java => DocumentSearchBean.java} (55%) create mode 100644 coselmar-ui/src/main/webapp/views/documents/toolsPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7648-export-recherche-projets in repository coselmar. See http://git.codelutin.com/coselmar.git commit 1ffae28f2b6334194f059ccf63069e9c12f819b5 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 9 12:04:54 2015 +0100 #7774 utilisation de l'export en InputStream de nuiton-csv --- .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 6 ++++-- pom.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index 75ef937..1a17887 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -834,8 +834,10 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { QuestionExportModel exportModel = new QuestionExportModel(); String exportData; + + InputStream resultStream; try { - exportData = Export.exportToString(exportModel, questions); + resultStream = Export.exportToInputStream(exportModel, questions); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Error during export", e); @@ -843,7 +845,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { throw new CoselmarTechnicalException("Unable to export datas"); } - return renderDownload(IOUtils.toInputStream(exportData), "export-projects", "text/csv"); + return renderDownload(resultStream, "export-projects", "text/csv"); } diff --git a/pom.xml b/pom.xml index 99aef73..ccca94e 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ <nuitonWebVersion>1.17</nuitonWebVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> - <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> + <nuitonCsvVersion>3.0-SNAPSHOT</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <nuitonConvertorVersion>1.0</nuitonConvertorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7648-export-recherche-projets in repository coselmar. See http://git.codelutin.com/coselmar.git commit ea841eeee5e8992a462156fc05ff429803e49919 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 10 10:20:10 2015 +0100 7648 : application du changement d'API de nuiton-csv pour l'export en inputStream --- .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index 1a17887..abd6384 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -28,6 +28,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -66,6 +68,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.lucene.queryparser.classic.ParseException; import org.debux.webmotion.server.render.Render; import org.nuiton.csv.Export; +import org.nuiton.csv.Exporter; import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.TopiaNoResultException; import org.nuiton.util.pagination.PaginationParameter; @@ -837,7 +840,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { InputStream resultStream; try { - resultStream = Export.exportToInputStream(exportModel, questions); + resultStream = Exporter.builder(exportModel).setCellSeparator(";").setCharset(StandardCharsets.UTF_8).build().exportToInputStream(questions); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Error during export", e); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm