From 322e87e5eb8a74bb7ecd511d0b5606d79b350bf7 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Mon, 9 Sep 2024 08:04:18 +0200 Subject: [PATCH 1/2] VIVO-4000 Removed text from csv export template. Added date and site name to export csv file. --- .../webapp/search/controller/PagedSearchController.java | 7 ++++++- .../templates/freemarker/body/search/search-csvResults.ftl | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index 9596ed4838..94d282577b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -3,6 +3,8 @@ package edu.cornell.mannlib.vitro.webapp.search.controller; import java.io.IOException; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; @@ -124,7 +126,10 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro response.setCharacterEncoding("UTF-8"); response.setContentType("text/csv;charset=UTF-8"); - response.setHeader("Content-Disposition", "attachment; filename=search.csv"); + String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss")); + String applicationName = vreq.getAppBean().getApplicationName(); + String fileName = date + "_" + applicationName + "_searchterm.csv"; + response.setHeader("Content-Disposition", "attachment; filename=" + fileName); writeTemplate(rvalues.getTemplateName(), rvalues.getMap(), request, response); } catch (Exception e) { log.error(e, e); diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl index 6bcc3173b8..2d1b977909 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-csvResults.ftl @@ -1,8 +1,4 @@ <#-- $This file is distributed under the terms of the license in LICENSE$ --> -<#assign today = .now > -<#assign todayDate = today?date> -Results from ${siteName} for ${querytext} on ${todayDate} - Name, URI, URL <#list individuals as individual> "${individual.name}","${individual.uri}","${individual.profileUrl}" From d9d19ad2dbdf992bc10598fdc41802baa3f5d8a6 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 26 Sep 2024 16:35:51 +0200 Subject: [PATCH 2/2] fixes for file name --- .../webapp/search/controller/PagedSearchController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index 94d282577b..ce4ff9a277 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -115,7 +115,10 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro response.setCharacterEncoding("UTF-8"); response.setContentType("text/xml;charset=UTF-8"); - response.setHeader("Content-Disposition", "attachment; filename=search.xml"); + String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss")); + String applicationName = vreq.getAppBean().getApplicationName(); + String fileName = date + "_" + applicationName + "_searchresults.xml"; + response.setHeader("Content-Disposition", "attachment; filename=" + fileName); writeTemplate(rvalues.getTemplateName(), rvalues.getMap(), request, response); } catch (Exception e) { log.error(e, e); @@ -128,7 +131,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro response.setContentType("text/csv;charset=UTF-8"); String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss")); String applicationName = vreq.getAppBean().getApplicationName(); - String fileName = date + "_" + applicationName + "_searchterm.csv"; + String fileName = date + "_" + applicationName + "_searchresults.csv"; response.setHeader("Content-Disposition", "attachment; filename=" + fileName); writeTemplate(rvalues.getTemplateName(), rvalues.getMap(), request, response); } catch (Exception e) {