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

IndividualTemplateModel.java: Add externalUrl to getQrData()

Browse source 
individual-qrCodeFoafPerson.ftl: Use externalUrl
This commit is contained in:
mbarbier 2011-04-05 19:37:15 +00:00
parent 3ee4fa10ce
commit edf091372e
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl
View file

@ -32,7 +32,7 @@ END:VCARD
<#local title = qrData.preferredTitle! > <#local title = qrData.preferredTitle! >
<#local phoneNumber = qrData.phoneNumber! > <#local phoneNumber = qrData.phoneNumber! >
<#local email = qrData.email! > <#local email = qrData.email! >
<#local url = urls.requestedUrl! > <#local url = qrData.externalUrl! >
<#local photo = individual.thumbUrl! > <#local photo = individual.thumbUrl! >
<#local rev = "" > <#local rev = "" >
@ -64,7 +64,9 @@ END:VCARD
<#macro qrCodeLink qrCodeWidth> <#macro qrCodeLink qrCodeWidth>
<#local url = urls.requestedUrl! > <#local qrData = individual.qrData >
<#local url = qrData.externalUrl! >
<#local qrCodeContent = url?url> <#local qrCodeContent = url?url>
<#if url != ""> <#if url != "">

8
src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
View file

@ -73,6 +73,7 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
return getVisUrl("vis", "entity_comparison"); return getVisUrl("vis", "entity_comparison");
} }
public Map<String, String> getQrData() { public Map<String, String> getQrData() {
String core = "http://vivoweb.org/ontology/core#"; String core = "http://vivoweb.org/ontology/core#";
String foaf = "http://xmlns.com/foaf/0.1/"; String foaf = "http://xmlns.com/foaf/0.1/";
@ -96,6 +97,13 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
if(emails.size() > 0) if(emails.size() > 0)
qrData.put("email", emails.toArray(new DataPropertyStatement[firstNames.size()])[0].getData()); qrData.put("email", emails.toArray(new DataPropertyStatement[firstNames.size()])[0].getData());
String tempUrl = vreq.getRequestURL().toString();
String prefix = "http://";
tempUrl = tempUrl.substring(0, tempUrl.replace(prefix, "").indexOf("/") + prefix.length());
String profileUrl = getProfileUrl();
String externalUrl = tempUrl + profileUrl;
qrData.put("externalUrl", externalUrl);
return qrData; return qrData;
} }
} }