diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl index f80dd206..0bed3b55 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl @@ -32,7 +32,7 @@ END:VCARD <#local title = qrData.preferredTitle! > <#local phoneNumber = qrData.phoneNumber! > <#local email = qrData.email! > - <#local url = urls.requestedUrl! > + <#local url = qrData.externalUrl! > <#local photo = individual.thumbUrl! > <#local rev = "" > @@ -64,7 +64,9 @@ END:VCARD <#macro qrCodeLink qrCodeWidth> - <#local url = urls.requestedUrl! > + <#local qrData = individual.qrData > + + <#local url = qrData.externalUrl! > <#local qrCodeContent = url?url> <#if url != ""> diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java index 3b5ed661..8046bd92 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java +++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java @@ -73,6 +73,7 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel { return getVisUrl("vis", "entity_comparison"); } + public Map getQrData() { String core = "http://vivoweb.org/ontology/core#"; String foaf = "http://xmlns.com/foaf/0.1/"; @@ -96,6 +97,13 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel { if(emails.size() > 0) 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; } }