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

1. Made changes so that visualizations url prefix is less vague (refer NIHVIVO-967)

Browse source
This commit is contained in:
cdtank 2010-07-29 22:17:13 +00:00
parent 636ab2bf65
commit d7e39e2953
14 changed files with 75 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/WEB-INF/web.xml
View file

@ -1139,7 +1139,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>VisualizationController</servlet-name> <servlet-name>VisualizationController</servlet-name>
<url-pattern>/admin/visQuery</url-pattern> <url-pattern>/visualization</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>

8
productMods/js/visualization/coauthorship/co_authorship.js
View file

@ -12,7 +12,7 @@ function getWellFormedURLs(given_uri, type) {
if (type == "coauthorship") { if (type == "coauthorship") {
var finalURL = $.ajax({ var finalURL = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "COAUTHORSHIP_URL", uri: given_uri}), data: ({vis: "utilities", vis_mode: "COAUTHORSHIP_URL", uri: given_uri}),
dataType: "text", dataType: "text",
async: false, async: false,
@ -27,7 +27,7 @@ function getWellFormedURLs(given_uri, type) {
} else if (type == "profile") { } else if (type == "profile") {
var finalURL = $.ajax({ var finalURL = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "PROFILE_URL", uri: given_uri}), data: ({vis: "utilities", vis_mode: "PROFILE_URL", uri: given_uri}),
dataType: "text", dataType: "text",
async: false, async: false,
@ -40,7 +40,7 @@ function getWellFormedURLs(given_uri, type) {
} else if (type == "image") { } else if (type == "image") {
var finalURL = $.ajax({ var finalURL = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "IMAGE_URL", uri: given_uri}), data: ({vis: "utilities", vis_mode: "IMAGE_URL", uri: given_uri}),
dataType: "text", dataType: "text",
async: false, async: false,
@ -53,7 +53,7 @@ function getWellFormedURLs(given_uri, type) {
} else if (type == "profile_info") { } else if (type == "profile_info") {
var profileInfoJSON = $.ajax({ var profileInfoJSON = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "PROFILE_INFO", uri: given_uri}), data: ({vis: "utilities", vis_mode: "PROFILE_INFO", uri: given_uri}),
dataType: "json", dataType: "json",
async: false, async: false,

8
productMods/js/visualization/personlevel/person_level.js
View file

@ -14,7 +14,7 @@ function getWellFormedURLs(given_uri, type) {
if (type == "coauthorship") { if (type == "coauthorship") {
finalURL = $.ajax({ finalURL = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "PERSON_LEVEL_URL", uri: given_uri}), data: ({vis: "utilities", vis_mode: "PERSON_LEVEL_URL", uri: given_uri}),
dataType: "text", dataType: "text",
async: false, async: false,
@ -28,7 +28,7 @@ function getWellFormedURLs(given_uri, type) {
} else if (type == "profile") { } else if (type == "profile") {
finalURL = $.ajax({ finalURL = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "PROFILE_URL", uri: given_uri}), data: ({vis: "utilities", vis_mode: "PROFILE_URL", uri: given_uri}),
dataType: "text", dataType: "text",
async: false, async: false,
@ -41,7 +41,7 @@ function getWellFormedURLs(given_uri, type) {
} else if (type == "image") { } else if (type == "image") {
finalURL = $.ajax({ finalURL = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "IMAGE_URL", uri: given_uri}), data: ({vis: "utilities", vis_mode: "IMAGE_URL", uri: given_uri}),
dataType: "text", dataType: "text",
async: false, async: false,
@ -54,7 +54,7 @@ function getWellFormedURLs(given_uri, type) {
} else if (type == "profile_info") { } else if (type == "profile_info") {
var profileInfoJSON = $.ajax({ var profileInfoJSON = $.ajax({
url: contextPath + "/admin/visQuery", url: contextPath + "/visualization",
data: ({vis: "utilities", vis_mode: "PROFILE_INFO", uri: given_uri}), data: ({vis: "utilities", vis_mode: "PROFILE_INFO", uri: given_uri}),
dataType: "json", dataType: "json",
async: false, async: false,

4
productMods/templates/entity/sparklineVisualization.jsp
View file

@ -54,7 +54,7 @@
<c:url var="loadingImageLink" value="/${themeDir}site_icons/visualization/ajax-loader.gif"></c:url> <c:url var="loadingImageLink" value="/${themeDir}site_icons/visualization/ajax-loader.gif"></c:url>
<!-- START Visualization Code --> <!-- START Visualization Code -->
<c:url var="visualizationURL" value="/admin/visQuery"> <c:url var="visualizationURL" value="/visualization">
<c:param name="render_mode" value="dynamic"/> <c:param name="render_mode" value="dynamic"/>
<c:param name="container" value="vis_container"/> <c:param name="container" value="vis_container"/>
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
@ -66,7 +66,7 @@
For now we have disabled this. For now we have disabled this.
<c:url var="pdfURL" value="/admin/visQuery"> <c:url var="pdfURL" value="/visualization">
<c:param name="render_mode" value="pdf"/> <c:param name="render_mode" value="pdf"/>
<c:param name="container" value="vis_container"/> <c:param name="container" value="vis_container"/>
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>

8
productMods/templates/visualization/co_authorship.jsp
View file

@ -12,7 +12,7 @@
<c:out value="${pageContext.request.contextPath}" /> <c:out value="${pageContext.request.contextPath}" />
</c:set> </c:set>
<c:url var="egoCoAuthorshipDataURL" value="/admin/visQuery"> <c:url var="egoCoAuthorshipDataURL" value="/visualization">
<c:param name="vis" value="coauthorship" /> <c:param name="vis" value="coauthorship" />
<c:param name="render_mode" value="data" /> <c:param name="render_mode" value="data" />
<c:param name="uri" value="${requestScope.egoURIParam}" /> <c:param name="uri" value="${requestScope.egoURIParam}" />
@ -20,7 +20,7 @@
</c:url> </c:url>
<c:url var="egoSparklineVisURL" value="/admin/visQuery"> <c:url var="egoSparklineVisURL" value="/visualization">
<c:param name="render_mode" value="dynamic"/> <c:param name="render_mode" value="dynamic"/>
<c:param name="container" value="ego_sparkline"/> <c:param name="container" value="ego_sparkline"/>
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
@ -178,7 +178,7 @@ renderCoAuthorshipVisualization();
</div> </div>
Download co-authorship newtwork as <a href="/vivo1/admin/visQuery?uri=http%3A%2F%2Fvivo.library.cornell.edu%2Fns%2F0.1%23individual5748&amp;vis=person_pub_count&amp;render_mode=data">.graphml</a> file. Download co-authorship newtwork as <a href="/vivo1/visualization?uri=http%3A%2F%2Fvivo.library.cornell.edu%2Fns%2F0.1%23individual5748&amp;vis=person_pub_count&amp;render_mode=data">.graphml</a> file.
<div id="bottomShadow"></div> <div id="bottomShadow"></div>
@ -214,7 +214,7 @@ Download co-authorship newtwork as <a href="/vivo1/admin/visQuery?uri=http%3A%2F
</tbody> </tbody>
</table> </table>
Download data as <a href="/vivo1/admin/visQuery?uri=http%3A%2F%2Fvivo.library.cornell.edu%2Fns%2F0.1%23individual5748&amp;vis=person_pub_count&amp;render_mode=data">.csv</a> file. Download data as <a href="/vivo1/visualization?uri=http%3A%2F%2Fvivo.library.cornell.edu%2Fns%2F0.1%23individual5748&amp;vis=person_pub_count&amp;render_mode=data">.csv</a> file.
<table id="coauthorships_data_table"> <table id="coauthorships_data_table">
<caption>Co - Authorhips</caption> <caption>Co - Authorhips</caption>

66
productMods/templates/visualization/dummy_vis_client.jsp
View file

@ -6,20 +6,20 @@
<c:set var="portal" value="${requestScope.portalBean}"/> <c:set var="portal" value="${requestScope.portalBean}"/>
<c:set var="themeDir"><c:out value="${portal.themeDir}" /></c:set> <c:set var="themeDir"><c:out value="${portal.themeDir}" /></c:set>
<c:url var="staticHref" value="/admin/visQuery"> <c:url var="staticHref" value="/visualization">
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="vis_mode" value="wth"/> <c:param name="vis_mode" value="wth"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/>
</c:url> </c:url>
<c:url var="staticHref2" value="/admin/visQuery"> <c:url var="staticHref2" value="/visualization">
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
<c:param name="vis_mode" value="short"/> <c:param name="vis_mode" value="short"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/>
</c:url> </c:url>
<c:url var="staticHref_d" value="/admin/visQuery"> <c:url var="staticHref_d" value="/visualization">
<c:param name="render_mode" value="dynamic"/> <c:param name="render_mode" value="dynamic"/>
<c:param name="container" value="ajax_recipient"/> <c:param name="container" value="ajax_recipient"/>
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
@ -27,7 +27,7 @@
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/>
</c:url> </c:url>
<c:url var="staticHref2_d" value="/admin/visQuery"> <c:url var="staticHref2_d" value="/visualization">
<c:param name="render_mode" value="dynamic"/> <c:param name="render_mode" value="dynamic"/>
<c:param name="container" value="ajax_recipient"/> <c:param name="container" value="ajax_recipient"/>
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
@ -36,14 +36,14 @@
</c:url> </c:url>
<c:url var="staticHref3" value="/admin/visQuery"> <c:url var="staticHref3" value="/visualization">
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
<c:param name="vis_mode" value="short"/> <c:param name="vis_mode" value="short"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/>
</c:url> </c:url>
<c:url var="staticHref3_d" value="/admin/visQuery"> <c:url var="staticHref3_d" value="/visualization">
<c:param name="render_mode" value="dynamic"/> <c:param name="render_mode" value="dynamic"/>
<c:param name="vis" value="person_pub_count"/> <c:param name="vis" value="person_pub_count"/>
<c:param name="container" value="ajax_recipient"/> <c:param name="container" value="ajax_recipient"/>
@ -52,14 +52,14 @@
<c:url var="collegeCSV" value="/admin/visQuery"> <c:url var="collegeCSV" value="/visualization">
<c:param name="vis" value="college_pub_count"/> <c:param name="vis" value="college_pub_count"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="vis_mode" value="wth"/> <c:param name="vis_mode" value="wth"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5249"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5249"/>
</c:url> </c:url>
<c:url var="collegeCSV2" value="/admin/visQuery"> <c:url var="collegeCSV2" value="/visualization">
<c:param name="vis" value="college_pub_count"/> <c:param name="vis" value="college_pub_count"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="vis_mode" value="wth"/> <c:param name="vis_mode" value="wth"/>
@ -67,7 +67,7 @@
</c:url> </c:url>
<c:url var="collegeCSV3" value="/admin/visQuery"> <c:url var="collegeCSV3" value="/visualization">
<c:param name="vis" value="college_pub_count"/> <c:param name="vis" value="college_pub_count"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="vis_mode" value="wth"/> <c:param name="vis_mode" value="wth"/>
@ -75,152 +75,152 @@
</c:url> </c:url>
<c:url var="collegeCSV4" value="/admin/visQuery"> <c:url var="collegeCSV4" value="/visualization">
<c:param name="vis" value="college_pub_count"/> <c:param name="vis" value="college_pub_count"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="vis_mode" value="wth"/> <c:param name="vis_mode" value="wth"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual250"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual250"/>
</c:url> </c:url>
<c:url var="collegeCSV5" value="/admin/visQuery"> <c:url var="collegeCSV5" value="/visualization">
<c:param name="vis" value="college_pub_count"/> <c:param name="vis" value="college_pub_count"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="vis_mode" value="wth"/> <c:param name="vis_mode" value="wth"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual192"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual192"/>
</c:url> </c:url>
<c:url var="coAuthorship1Data" value="/admin/visQuery"> <c:url var="coAuthorship1Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/>
</c:url> </c:url>
<c:url var="coAuthorship2Data" value="/admin/visQuery"> <c:url var="coAuthorship2Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/>
</c:url> </c:url>
<c:url var="coAuthorship3Data" value="/admin/visQuery"> <c:url var="coAuthorship3Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/>
</c:url> </c:url>
<c:url var="coAuthorship4Data" value="/admin/visQuery"> <c:url var="coAuthorship4Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5412"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5412"/>
</c:url> </c:url>
<c:url var="coAuthorship1" value="/admin/visQuery"> <c:url var="coAuthorship1" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/>
</c:url> </c:url>
<c:url var="coAuthorship2" value="/admin/visQuery"> <c:url var="coAuthorship2" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5156"/>
</c:url> </c:url>
<c:url var="coAuthorship3" value="/admin/visQuery"> <c:url var="coAuthorship3" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/>
</c:url> </c:url>
<c:url var="coAuthorship4" value="/admin/visQuery"> <c:url var="coAuthorship4" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5412"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5412"/>
</c:url> </c:url>
<c:url var="coAuthorship5" value="/admin/visQuery"> <c:url var="coAuthorship5" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5714"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5714"/>
</c:url> </c:url>
<c:url var="coAuthorship5Data" value="/admin/visQuery"> <c:url var="coAuthorship5Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5714"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5714"/>
</c:url> </c:url>
<c:url var="coAuthorship6" value="/admin/visQuery"> <c:url var="coAuthorship6" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual240"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual240"/>
</c:url> </c:url>
<c:url var="coAuthorship6Data" value="/admin/visQuery"> <c:url var="coAuthorship6Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual240"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual240"/>
</c:url> </c:url>
<c:url var="coAuthorship7" value="/admin/visQuery"> <c:url var="coAuthorship7" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual37"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual37"/>
</c:url> </c:url>
<c:url var="coAuthorship7Data" value="/admin/visQuery"> <c:url var="coAuthorship7Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual37"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual37"/>
</c:url> </c:url>
<c:url var="coAuthorship8" value="/admin/visQuery"> <c:url var="coAuthorship8" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5355"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5355"/>
</c:url> </c:url>
<c:url var="coAuthorship8Data" value="/admin/visQuery"> <c:url var="coAuthorship8Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5355"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5355"/>
</c:url> </c:url>
<c:url var="coAuthorship9" value="/admin/visQuery"> <c:url var="coAuthorship9" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5734"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5734"/>
</c:url> </c:url>
<c:url var="coAuthorship9Data" value="/admin/visQuery"> <c:url var="coAuthorship9Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5734"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5734"/>
</c:url> </c:url>
<c:url var="coAuthorship10" value="/admin/visQuery"> <c:url var="coAuthorship10" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual12053"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual12053"/>
</c:url> </c:url>
<c:url var="coAuthorship10Data" value="/admin/visQuery"> <c:url var="coAuthorship10Data" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual12053"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual12053"/>
</c:url> </c:url>
<c:url var="coAuthorshipSparklineData" value="/admin/visQuery"> <c:url var="coAuthorshipSparklineData" value="/visualization">
<c:param name="vis" value="coauthorship"/> <c:param name="vis" value="coauthorship"/>
<c:param name="vis_mode" value="sparkline"/> <c:param name="vis_mode" value="sparkline"/>
<c:param name="render_mode" value="data"/> <c:param name="render_mode" value="data"/>
<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/> <c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5748"/>
</c:url> </c:url>
<c:url var="personLevel1" value="/admin/visQuery"> <c:url var="personLevel1" value="/visualization">
<c:param name="vis" value="person_level"/> <c:param name="vis" value="person_level"/>
<c:param name="render_mode" value="standalone"/> <c:param name="render_mode" value="standalone"/>
<c:param name="container" value="ego_sparkline"/> <c:param name="container" value="ego_sparkline"/>

4
productMods/templates/visualization/person_level.jsp
View file

@ -22,13 +22,13 @@
<c:param name="uri" value="${requestScope.egoURIParam}" /> <c:param name="uri" value="${requestScope.egoURIParam}" />
</c:url> </c:url>
<c:url var="egoSparklineDataURL" value="/admin/visQuery"> <c:url var="egoSparklineDataURL" value="/visualization">
<c:param name="render_mode" value="data" /> <c:param name="render_mode" value="data" />
<c:param name="vis" value="person_pub_count" /> <c:param name="vis" value="person_pub_count" />
<c:param name="uri" value="${requestScope.egoURIParam}" /> <c:param name="uri" value="${requestScope.egoURIParam}" />
</c:url> </c:url>
<c:url var="coAuthorshipDownloadFile" value="/admin/visQuery"> <c:url var="coAuthorshipDownloadFile" value="/visualization">
<c:param name="vis" value="person_level" /> <c:param name="vis" value="person_level" />
<c:param name="render_mode" value="data" /> <c:param name="render_mode" value="data" />
<c:param name="uri" value="${requestScope.egoURIParam}" /> <c:param name="uri" value="${requestScope.egoURIParam}" />

4
productMods/templates/visualization/person_level_inject_head.jsp
View file

@ -6,14 +6,14 @@
<c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set> <c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set>
<c:set var="contextPath"><c:out value="${pageContext.request.contextPath}" /></c:set> <c:set var="contextPath"><c:out value="${pageContext.request.contextPath}" /></c:set>
<c:url var="egoCoAuthorshipDataFeederURL" value="/admin/visQuery"> <c:url var="egoCoAuthorshipDataFeederURL" value="/visualization">
<c:param name="vis" value="coauthorship" /> <c:param name="vis" value="coauthorship" />
<c:param name="render_mode" value="data" /> <c:param name="render_mode" value="data" />
<c:param name="uri" value="${requestScope.egoURIParam}" /> <c:param name="uri" value="${requestScope.egoURIParam}" />
<c:param name="labelField" value="label" /> <c:param name="labelField" value="label" />
</c:url> </c:url>
<c:url var="egoCoAuthorsListDataFileURL" value="/admin/visQuery"> <c:url var="egoCoAuthorsListDataFileURL" value="/visualization">
<c:param name="vis" value="person_level" /> <c:param name="vis" value="person_level" />
<c:param name="render_mode" value="data" /> <c:param name="render_mode" value="data" />
<c:param name="vis_mode" value="coauthors" /> <c:param name="vis_mode" value="coauthors" />

3
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationController.java
View file

@ -129,7 +129,6 @@ public class VisualizationController extends BaseEditController {
this.doGet(request, response); this.doGet(request, response);
} }
//TODO: Set it up so visualizations register themselves with this object. Don't tie this class to each visualization.
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException { throws ServletException, IOException {
@ -166,8 +165,6 @@ public class VisualizationController extends BaseEditController {
* */ * */
visRequestHandler.generateVisualization(vreq, request, response, log, dataSource); visRequestHandler.generateVisualization(vreq, request, response, log, dataSource);
System.out.println(" VIS ID TO CLASS " + visualizationIDsToClass);
} else { } else {
String errorMessage = "Data Model Empty &/or Inappropriate " String errorMessage = "Data Model Empty &/or Inappropriate "

7
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
View file

@ -4,14 +4,14 @@ package edu.cornell.mannlib.vitro.webapp.controller.visualization;
public class VisualizationFrameworkConstants { public class VisualizationFrameworkConstants {
public static final String VISUALIZATION_URL_PREFIX = "/visualization";
public static final String VIS_TYPE_URL_HANDLE = "vis"; public static final String VIS_TYPE_URL_HANDLE = "vis";
public static final String VIS_CONTAINER_URL_HANDLE = "container"; public static final String VIS_CONTAINER_URL_HANDLE = "container";
public static final String INDIVIDUAL_URI_URL_HANDLE = "uri"; public static final String INDIVIDUAL_URI_URL_HANDLE = "uri";
public static final String VIS_MODE_URL_HANDLE = "vis_mode"; public static final String VIS_MODE_URL_HANDLE = "vis_mode";
public static final String RENDER_MODE_URL_HANDLE = "render_mode"; public static final String RENDER_MODE_URL_HANDLE = "render_mode";
public static final String STANDALONE_RENDER_MODE_URL_VALUE = "standalone"; public static final String STANDALONE_RENDER_MODE_URL_VALUE = "standalone";
public static final String DYNAMIC_RENDER_MODE_URL_VALUE = "dynamic"; public static final String DYNAMIC_RENDER_MODE_URL_VALUE = "dynamic";
public static final String DATA_RENDER_MODE_URL_VALUE = "data"; public static final String DATA_RENDER_MODE_URL_VALUE = "data";
@ -25,4 +25,7 @@ public class VisualizationFrameworkConstants {
public static final String PERSON_LEVEL_UTILS_VIS_MODE = "PERSON_LEVEL_URL"; public static final String PERSON_LEVEL_UTILS_VIS_MODE = "PERSON_LEVEL_URL";
public static final String IMAGE_UTILS_VIS_MODE = "IMAGE_URL"; public static final String IMAGE_UTILS_VIS_MODE = "IMAGE_URL";
} }

9
src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryHandler.java
View file

@ -44,6 +44,8 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator
*/ */
public class CoAuthorshipQueryHandler implements QueryHandler<CoAuthorshipVOContainer> { public class CoAuthorshipQueryHandler implements QueryHandler<CoAuthorshipVOContainer> {
private static final int MAX_AUTHORS_PER_PAPER_ALLOWED = 101;
protected static final Syntax SYNTAX = Syntax.syntaxARQ; protected static final Syntax SYNTAX = Syntax.syntaxARQ;
private String egoURLParam; private String egoURLParam;
@ -222,8 +224,13 @@ public class CoAuthorshipQueryHandler implements QueryHandler<CoAuthorshipVOCont
/* /*
* If there was only one co-author (other than ego) then we dont have to create any * If there was only one co-author (other than ego) then we dont have to create any
* edges. so the below condition will take care of that. * edges. so the below condition will take care of that.
*
* We are restricting edges between co-author if a particular document has more than
* 100 co-authors. Our conjecture is that such edges do not provide any good insight
* & causes unnecessary computations causing the server to time-out.
* */ * */
if (currentBiboDocumentEntry.getValue().size() > 1) { if (currentBiboDocumentEntry.getValue().size() > 1
&& currentBiboDocumentEntry.getValue().size() < MAX_AUTHORS_PER_PAPER_ALLOWED) {
Set<Edge> newlyAddedEdges = new HashSet<Edge>(); Set<Edge> newlyAddedEdges = new HashSet<Edge>();

8
src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
View file

@ -510,8 +510,8 @@ public class CoAuthorshipVisCodeGenerator {
if (yearToUniqueCoauthors.size() > 0) { if (yearToUniqueCoauthors.size() > 0) {
String secondaryContextPath = ""; String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) { if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = "/admin/visQuery"; secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
} }
@ -548,8 +548,8 @@ public class CoAuthorshipVisCodeGenerator {
if (yearToUniqueCoauthors.size() > 0) { if (yearToUniqueCoauthors.size() > 0) {
String secondaryContextPath = ""; String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) { if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = "/admin/visQuery"; secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
} }
String fullTimelineNetworkURL = contextPath String fullTimelineNetworkURL = contextPath

8
src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
View file

@ -522,8 +522,8 @@ public class PersonPublicationCountVisCodeGenerator {
if (yearToPublicationCount.size() > 0) { if (yearToPublicationCount.size() > 0) {
String secondaryContextPath = ""; String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) { if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = "/admin/visQuery"; secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
} }
@ -560,8 +560,8 @@ public class PersonPublicationCountVisCodeGenerator {
if (yearToPublicationCount.size() > 0) { if (yearToPublicationCount.size() > 0) {
String secondaryContextPath = ""; String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) { if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = "/admin/visQuery"; secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
} }
String fullTimelineNetworkURL = contextPath String fullTimelineNetworkURL = contextPath

4
src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
View file

@ -159,7 +159,7 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
* */ * */
preparedURL += request.getContextPath() preparedURL += request.getContextPath()
+ "/admin/visQuery" + VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX
+ "?" + "?"
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
+ "=" + URLEncoder.encode(individualURIParam, + "=" + URLEncoder.encode(individualURIParam,
@ -187,7 +187,7 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
* */ * */
preparedURL += request.getContextPath() preparedURL += request.getContextPath()
+ "/admin/visQuery" + VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX
+ "?" + "?"
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
+ "=" + URLEncoder.encode(individualURIParam, + "=" + URLEncoder.encode(individualURIParam,