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

Fixed the bug related to "loading up Co-Author/Co-PI" visualizations and their dependency on the domain name.

Browse source
This commit is contained in:
bkoniden 2010-11-23 23:02:39 +00:00
parent dec86a43fa
commit 4bb68f332e
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,9 +310,25 @@ function nodeClickedJS(json){
} }
function encodeURL(url){ /*
var domainURL = 'http://vivo-vis-bkoniden.slis.indiana.edu/'; * Inside both of these functions, '&' are replaced with '%26' because we are externally
return domainURL + url.replace(/&/g,'%26'); * passing two parameters to the flash code using flashvars (see renderCoAuthorshipVisualization())
* and they are delimited using '&' too.
*/
function getEncodedCoAuthorURL(){
var queryString = "uri="+ egoURI + "&vis=coauthorship&render_mode=data";
// console.log('domainParam is '+ domainParam);
// console.log('CoAuthorURL is ' + domainParam + '?' + queryString.replace(/&/g, '%26'));
return domainParam + '?' + queryString.replace(/&/g, '%26');
}
function getEncodedCoPIURL(){
var queryString = "uri="+ egoURI+ "&vis=coprincipalinvestigator&render_mode=data";
// console.log('CoPIURL is ' + domainParam + '?' + queryString.replace(/&/g, '%26') );
return domainParam + '?' + queryString.replace(/&/g, '%26');
} }
function renderCoAuthorshipVisualization() { function renderCoAuthorshipVisualization() {
@ -353,7 +369,8 @@ function renderCoAuthorshipVisualization() {
//coAuthorUrl=/vivo1/visualization?vis=coauthorship%26render_mode=data%26uri=http%3A%2F%2Fvivo.iu.edu%2Findividual%2FBrnerKaty&labelField=label&coPIUrl=/vivo1/visualization?vis=coprincipalinvestigator%26render_mode=data%26uri=http%3A%2F%2Fvivo.iu.edu%2Findividual%2FBrnerKaty&labelField=label //coAuthorUrl=/vivo1/visualization?vis=coauthorship%26render_mode=data%26uri=http%3A%2F%2Fvivo.iu.edu%2Findividual%2FBrnerKaty&labelField=label&coPIUrl=/vivo1/visualization?vis=coprincipalinvestigator%26render_mode=data%26uri=http%3A%2F%2Fvivo.iu.edu%2Findividual%2FBrnerKaty&labelField=label
AC_FL_RunContent( AC_FL_RunContent(
"src", swfLink, "src", swfLink,
"flashVars", 'coAuthorUrl='+ encodeURL(egoCoAuthorshipDataFeederURL) + '&coPIUrl=' + encodeURL(egoCoPIDataFeederURL) , // "flashVars", 'coAuthorUrl='+ encodeURL(egoCoAuthorshipDataFeederURL) + '&coPIUrl=' + encodeURL(egoCoPIDataFeederURL) ,
"flashVars", 'coAuthorUrl='+ getEncodedCoAuthorURL() + '&coPIUrl=' + getEncodedCoPIURL() ,
"width", "800", "width", "800",
"height", "850", "height", "850",
"align", "top", "align", "top",

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

@ -18,8 +18,6 @@
<c:set var='numOfAuthors' value='${requestScope.numOfAuthors}' /> <c:set var='numOfAuthors' value='${requestScope.numOfAuthors}' />
<c:set var='numOfCoAuthorShips' value='${requestScope.numOfCoAuthorShips}' /> <c:set var='numOfCoAuthorShips' value='${requestScope.numOfCoAuthorShips}' />
<c:set var='completeURL' value='${requestScope.completeURL}' />
<c:url var="egoVivoProfileURL" value="/individual"> <c:url var="egoVivoProfileURL" value="/individual">
<c:param name="uri" value="${requestScope.egoURIParam}" /> <c:param name="uri" value="${requestScope.egoURIParam}" />
</c:url> </c:url>
@ -38,11 +36,12 @@
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
<c:if test='${numOfCoAuthorShips > 0}'> <c:if test='${numOfCoAuthorShips > 0}'>
$("#coauth_table_container").empty().html('<img id="loadingData" with="auto" src="${loadingImageLink}" />'); $("#coauth_table_container").empty().html('<img id="loadingData" with="auto" src="${loadingImageLink}" />');
</c:if> </c:if>
processProfileInformation("ego_label", processProfileInformation("ego_label",
"ego_moniker", "ego_moniker",
"ego_profile_image", "ego_profile_image",
@ -61,7 +60,6 @@ $(document).ready(function(){
<div id="body"> <div id="body">
<div>complete URL = '${completeURL} '</div>
<!--[if IE]> <!--[if IE]>
<style type="text/css"> <style type="text/css">

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

@ -58,6 +58,7 @@ var egoCoAuthorshipDataFeederURL = "${egoCoAuthorshipDataFeederURL}";
var egoCoAuthorsListDataFileURL = "${egoCoAuthorsListDataFileURL}"; var egoCoAuthorsListDataFileURL = "${egoCoAuthorsListDataFileURL}";
var egoCoPIDataFeederURL = "${egoCoPIDataFeederURL}"; var egoCoPIDataFeederURL = "${egoCoPIDataFeederURL}";
var contextPath = "${contextPath}"; var contextPath = "${contextPath}";
var domainParam = "${requestScope.completeURL}";
// --> // -->
</script> </script>

6
src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
View file

@ -374,11 +374,13 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
private String getCompleteURL(HttpServletRequest request) throws MalformedURLException { private String getCompleteURL(HttpServletRequest request) throws MalformedURLException {
String file = request.getRequestURI(); String file = request.getRequestURI();
System.out.println("getRequestURI() = "+ file + "getQueryString() ="+request.getQueryString()+ "getScheme() = "+ request.getScheme()); // System.out.println("\ngetRequestURI() --> "+ file + "\ngetQueryString() --> "+request.getQueryString()+ "\ngetScheme() --> "+ request.getScheme());
System.out.println("getServerName() = "+ request.getServerName() + "getServerPort() ="+request.getServerPort()); // System.out.println("\ngetServerName() --> "+ request.getServerName() + "\ngetServerPort() --> "+request.getServerPort());
URL reconstructedURL = new URL(request.getScheme(), request.getServerName(), request.getServerPort(), file); URL reconstructedURL = new URL(request.getScheme(), request.getServerName(), request.getServerPort(), file);
// System.out.println("\nReconstructed URL is --> " + reconstructedURL);
return reconstructedURL.toString(); return reconstructedURL.toString();
} }