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

1. Made changes to the coautho/copi link creator utility to first test for short-uri possibility.

Browse source
This commit is contained in:
cdtank 2011-05-09 15:52:05 +00:00
parent eee0c7be27
commit 0a158ae30f
7 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml
View file

@ -79,7 +79,7 @@
-->
<entry key="entity_comparison">
<ref bean="entity_comparison"></ref>
<ref bean="pub_temporal"></ref>
</entry>
<entry key="pub_temporal">
@ -87,7 +87,7 @@
</entry>
<entry key="publication-graph">
<ref bean="entity_comparison"></ref>
<ref bean="pub_temporal"></ref>
</entry>
<entry key="coprincipalinvestigator">
@ -95,7 +95,7 @@
</entry>
<entry key="entity_grant_count">
<ref bean="entity_grant_count"></ref>
<ref bean="grant_temporal"></ref>
</entry>
<entry key="grant_temporal">
@ -103,7 +103,7 @@
</entry>
<entry key="grant-graph">
<ref bean="entity_grant_count"></ref>
<ref bean="grant_temporal"></ref>
</entry>
</map>

14
productMods/js/visualization/entitycomparison/util.js
View file

@ -762,7 +762,21 @@ function getVIVOURL(entityURI){
}
function getTemporalVisURL(entityURI) {
if (vivoDefaultNamespace) {
/*
* This means that the URI of the entity is made up of default namespace so lets make the
* short url, shorter!
* */
if (entityURI.search(vivoDefaultNamespace) === 0) {
return temporalGraphCommonURL + entityURI.substring(vivoDefaultNamespace.length);
}
}
/*
* Default short url template involves using long uri, this in case the entity is not based off
* of default namespace.
* */
return temporalGraphCommonURL + "?uri=" + entityURI ;
}

1
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
View file

@ -107,6 +107,7 @@ var subOrganizationGrantTemporalGraphCommonURL = "${subOrganizationGrantTemporal
var subOrganizationPublicationTemporalGraphCommonURL = "${subOrganizationPublicationTemporalGraphCommonURL}";
var jsonString = '${jsonContent!}';
var vivoDefaultNamespace = '${vivoDefaultNamespace!}';
var organizationLabel = '${organizationLabel}';
var organizationVIVOProfileURL = "${organizationVivoProfileURL}";

1
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
View file

@ -259,6 +259,7 @@ public class EntityPublicationCountRequestHandler implements
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
body.put("organizationLabel", organizationLabel);
return new TemplateResponseValues(standaloneTemplate, body);

1
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java
View file

@ -290,6 +290,7 @@ public class TemporalGrantVisualizationRequestHandler implements
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
body.put("organizationLabel", organizationLabel);
return new TemplateResponseValues(standaloneTemplate, body);

1
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java
View file

@ -282,6 +282,7 @@ public class TemporalPublicationVisualizationRequestHandler implements
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
body.put("organizationLabel", organizationLabel);
return new TemplateResponseValues(standaloneTemplate, body);

1
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java
View file

@ -257,6 +257,7 @@ public class EntityGrantCountRequestHandler implements
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace());
body.put("organizationLabel", organizationLabel);
return new TemplateResponseValues(standaloneTemplate, body);