diff --git a/productMods/js/visualization/personlevel/person_level.js b/productMods/js/visualization/personlevel/person_level.js index baa74a45..de2b7e30 100644 --- a/productMods/js/visualization/personlevel/person_level.js +++ b/productMods/js/visualization/personlevel/person_level.js @@ -310,9 +310,25 @@ function nodeClickedJS(json){ } -function encodeURL(url){ - var domainURL = 'http://vivo-vis-bkoniden.slis.indiana.edu/'; - return domainURL + url.replace(/&/g,'%26'); +/* + * Inside both of these functions, '&' are replaced with '%26' because we are externally + * 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() { @@ -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 AC_FL_RunContent( "src", swfLink, - "flashVars", 'coAuthorUrl='+ encodeURL(egoCoAuthorshipDataFeederURL) + '&coPIUrl=' + encodeURL(egoCoPIDataFeederURL) , +// "flashVars", 'coAuthorUrl='+ encodeURL(egoCoAuthorshipDataFeederURL) + '&coPIUrl=' + encodeURL(egoCoPIDataFeederURL) , + "flashVars", 'coAuthorUrl='+ getEncodedCoAuthorURL() + '&coPIUrl=' + getEncodedCoPIURL() , "width", "800", "height", "850", "align", "top", diff --git a/productMods/templates/visualization/person_level.jsp b/productMods/templates/visualization/person_level.jsp index 05ffaa85..5ec4b950 100644 --- a/productMods/templates/visualization/person_level.jsp +++ b/productMods/templates/visualization/person_level.jsp @@ -18,8 +18,6 @@ - - @@ -38,11 +36,12 @@ diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index 0b01bcfd..4e752374 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -374,11 +374,13 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { private String getCompleteURL(HttpServletRequest request) throws MalformedURLException { String file = request.getRequestURI(); - System.out.println("getRequestURI() = "+ file + "getQueryString() ="+request.getQueryString()+ "getScheme() = "+ request.getScheme()); - System.out.println("getServerName() = "+ request.getServerName() + "getServerPort() ="+request.getServerPort()); +// System.out.println("\ngetRequestURI() --> "+ file + "\ngetQueryString() --> "+request.getQueryString()+ "\ngetScheme() --> "+ request.getScheme()); +// System.out.println("\ngetServerName() --> "+ request.getServerName() + "\ngetServerPort() --> "+request.getServerPort()); URL reconstructedURL = new URL(request.getScheme(), request.getServerName(), request.getServerPort(), file); +// System.out.println("\nReconstructed URL is --> " + reconstructedURL); + return reconstructedURL.toString(); }