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}"