From 06ca8945463b88dec32c495ce82a502f8950c505 Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Fri, 31 May 2013 09:09:33 -0600 Subject: [PATCH 1/2] Added a new field email to IndividualSearchResults and a modification of the csv-results for VIVO that includes email and preferred title where available --- productMods/images/individual/download-icon.png | Bin 0 -> 953 bytes .../freemarker/body/search/search-csvResults.ftl | 9 +++++++++ .../searchresult/IndividualSearchResult.java | 9 ++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 productMods/images/individual/download-icon.png create mode 100644 productMods/templates/freemarker/body/search/search-csvResults.ftl diff --git a/productMods/images/individual/download-icon.png b/productMods/images/individual/download-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f23201dfa290be9c4142cd9d1aa74398b5c1e616 GIT binary patch literal 953 zcmV;q14jIbP)WFU8GbZ8()Nlj27Z*CxAAWdOomE>Pr0009NNkl28g*J1G^;j(l;wID-)BokDMdd|hZ3L4QQ$4>P7&#iaeI5aJH60OH}7`$Qtu1%W_RZK%slhVJkJou z7=wj0T}NC@At5F4Be@J|amDa|e^mwQD$CK}t-;{~b#QPTc#eV)0zyb$o5T#9&M1h+ z;&?GVhhlWR^$;S#0QT;2gXbtHrS`$Ggox4SQ`nArA|ZsD>fz*ha2z!U>x|*itM{1t z{0%#yHot)GNCODWKVm@GLsAtgbjrInI{e=hw3{gGVWwjowze=)TTS}Y{*h5sLuCFic* zDLCQ5zSE$T=2BZesNtU1b;AVBu2EA<10xSW2!SliP!t84rkO$&MalIug8~2*YAa1U z^bL-|;dFuLd2k$Ox&>urWuTN=dZyk}1?sJ?u-uP<;c@7U8C;pSa7d>CLeW1oZraaV zT@D%$Jhp;?=XulURaF%n@4&^8`TGXbtHS``L|aqgX#J-oTU}j+s;V0msHQ>FG+e&<*cLbv z3~U@Hx66sMU13`TuiSb9LMc>Lg|6#h04@yMb8&B17;cx-c#hlr0>UkgwhZ(Sj)4#g zP1BH76x$_l&@be_KzcetXgTP$2Ok;(q12X(TN`}njvTcvZy!$1;N9H9j%1>6OCx$Z zLWUsS^@6^)D{OG@u0LTq+nW&y26BN^GuT!EM}=5V355<<;B_yrIAzFP2{ bb+-KjE2mQ_q%Jj600000NkvXXu0mjfJ=30n literal 0 HcmV?d00001 diff --git a/productMods/templates/freemarker/body/search/search-csvResults.ftl b/productMods/templates/freemarker/body/search/search-csvResults.ftl new file mode 100644 index 00000000..4fce9d6a --- /dev/null +++ b/productMods/templates/freemarker/body/search/search-csvResults.ftl @@ -0,0 +1,9 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#assign today = .now > +<#assign todayDate = today?date> +Results from ${siteName} for ${querytext} on ${todayDate} + +URI, Name, Title, Email, VIVO Profile URL +<#list individuals as individual> +"${individual.uri}","${individual.name}",<#if individual.preferredTitle?has_content>"${individual.preferredTitle}",<#if individual.email?has_content>"${individual.email}","${individual.profileUrl}" + diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java index 0d73c1d3..780f95a2 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java +++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java @@ -15,13 +15,20 @@ public class IndividualSearchResult extends BaseIndividualSearchResult { private static final String CORE = "http://vivoweb.org/ontology/core#"; public IndividualSearchResult(Individual individual, VitroRequest vreq) { - super(individual, vreq); + super(individual, vreq); + log.info("Called Individual Search Result"); } /* Access methods for templates */ public String getPreferredTitle() { + log.info("Called get Title"); return individual.getDataValue(CORE + "preferredTitle"); } + + public String getEmail() { + log.info("Called get Email"); + return individual.getDataValue(CORE + "email"); + } } \ No newline at end of file From 1bae4ff67770de1ec54c93504c8b25af16c6e57c Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Fri, 31 May 2013 12:21:02 -0600 Subject: [PATCH 2/2] changed order to have name first in csv and added the xmlResults from vitro with VIVO specific items --- .../body/search/search-csvResults.ftl | 4 +-- .../body/search/search-xmlResults.ftl | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 productMods/templates/freemarker/body/search/search-xmlResults.ftl diff --git a/productMods/templates/freemarker/body/search/search-csvResults.ftl b/productMods/templates/freemarker/body/search/search-csvResults.ftl index 4fce9d6a..688d37ca 100644 --- a/productMods/templates/freemarker/body/search/search-csvResults.ftl +++ b/productMods/templates/freemarker/body/search/search-csvResults.ftl @@ -3,7 +3,7 @@ <#assign todayDate = today?date> Results from ${siteName} for ${querytext} on ${todayDate} -URI, Name, Title, Email, VIVO Profile URL +Name, Title, Email, URI, VIVO Profile URL <#list individuals as individual> -"${individual.uri}","${individual.name}",<#if individual.preferredTitle?has_content>"${individual.preferredTitle}",<#if individual.email?has_content>"${individual.email}","${individual.profileUrl}" +"${individual.name}",<#if individual.preferredTitle?has_content>"${individual.preferredTitle}",<#if individual.email?has_content>"${individual.email}","${individual.uri}","${individual.profileUrl}" diff --git a/productMods/templates/freemarker/body/search/search-xmlResults.ftl b/productMods/templates/freemarker/body/search/search-xmlResults.ftl new file mode 100644 index 00000000..5a47d369 --- /dev/null +++ b/productMods/templates/freemarker/body/search/search-xmlResults.ftl @@ -0,0 +1,28 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + + + + + ${querytext?xml} + <#if nextPage??> + ${nextPage?xml} + + + + + <#list individuals as individual> + + ${individual.uri?xml} + ${individual.name?xml} + <#if individual.preferredTitle?has_content> + ${individual.preferredTitle?xml} + + <#if individual.email?has_content> + "${individual.email}" + + ${individual.profileUrl?xml}" + + + + + \ No newline at end of file