litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from vivo-project/feature/search-download

Browse source 
Added a new field email to IndividualSearchResults and a modification of...
This commit is contained in:
Jim Blake 2013-06-28 12:16:01 -07:00
commit cb757d82da
4 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
productMods/images/individual/download-icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 953 B

9
productMods/templates/freemarker/body/search/search-csvResults.ftl Normal file
View file

@ -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}
Name, Title, Email, URI, VIVO Profile URL
<#list individuals as individual>
"${individual.name}",<#if individual.preferredTitle?has_content>"${individual.preferredTitle}"</#if>,<#if individual.email?has_content>"${individual.email}"</#if>,"${individual.uri}","${individual.profileUrl}"
</#list>

28
productMods/templates/freemarker/body/search/search-xmlResults.ftl Normal file
View file

@ -0,0 +1,28 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<?xml version="1.0" encoding="UTF-8"?>
<response>
<lst name="responseHeader">
<str name="q">${querytext?xml}</str>
<#if nextPage??>
<str name="nextPage">${nextPage?xml}</str>
</#if>
</lst>
<result name="response" numFound="${hitCount}" start="${startIndex}" >
<#list individuals as individual>
<doc>
<str name="uri">${individual.uri?xml}</str>
<str name="name">${individual.name?xml}</str>
<#if individual.preferredTitle?has_content>
<str name="title">${individual.preferredTitle?xml}</str>
</#if>
<#if individual.email?has_content>
<str name="email">"${individual.email}"</str>
</#if>
<str name="vivo-url">${individual.profileUrl?xml}"</str>
</doc>
</#list>
</result>
</response>

9
src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
View file

@ -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");
}
}