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-04-28 22:07:43 +00:00
parent 29ca04f648
commit 0aeb7dc8f9
3 changed files with 86 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/js/visualization/personlevel/person-level.js
View file

@ -19,7 +19,7 @@ function getWellFormedURLs(given_uri, type) {
finalURL = $.ajax({
url: contextPath + "/visualizationAjax",
data: ({vis: "utilities", vis_mode: "PERSON_LEVEL_URL", uri: given_uri}),
data: ({vis: "utilities", vis_mode: "COAUTHORSHIP_URL", uri: given_uri}),
dataType: "text",
async: false,
success:function(data){

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

@ -7,6 +7,8 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.openrdf.model.URI;
import org.openrdf.model.impl.URIImpl;
import com.google.gson.Gson;
import com.hp.hpl.jena.iri.IRI;
@ -17,6 +19,7 @@ import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
@ -44,6 +47,24 @@ import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.Visual
*/
public class UtilitiesRequestHandler implements VisualizationRequestHandler {
/**
* TODO: Remove this method once Rebecca creates one. Right now it is the exact copy of the method found in
* BaseIndividualTemplateModel.getRdfUrl
* @return
*/
private boolean isIndividualURIBasedOnDefaultNamespace(String givenURI, VitroRequest vitroRequest) {
URI uri = new URIImpl(givenURI);
String namespace = uri.getNamespace();
// Individuals in the default namespace
// e.g., http://vivo.cornell.edu/individual/n2345/n2345.rdf
// where default namespace = http://vivo.cornell.edu/individual/
// Other individuals: http://some.other.namespace/n2345?format=rdfxml
String defaultNamespace = vitroRequest.getWebappDaoFactory().getDefaultNamespace();
return (defaultNamespace.equals(namespace)) ? true : false;
}
public Object generateAjaxVisualization(VitroRequest vitroRequest,
Log log,
Dataset dataset)
@ -171,17 +192,31 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
} else if (VisualizationFrameworkConstants.COAUTHOR_UTILS_VIS_MODE
.equalsIgnoreCase(visMode)) {
/*
* By default we will be generating profile url else some specific url like
* coAuthorShip vis url for that individual.
* */
if (isIndividualURIBasedOnDefaultNamespace(individualURI, vitroRequest)) {
try {
Individual individual = vitroRequest.getWebappDaoFactory().getIndividualDao().getIndividualByURI(individualURI);
return UrlBuilder.getUrl(VisualizationFrameworkConstants.SHORT_URL_VISUALIZATION_REQUEST_PREFIX)
+ "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL
+ "/" + individual.getLocalName();
} catch(Exception e) {
/*
* In case of exception dont do anything let it create long form urls.
* */
}
}
ParamMap coAuthorProfileURLParams = new ParamMap(
VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
individualURI,
VisualizationFrameworkConstants.VIS_TYPE_KEY,
VisualizationFrameworkConstants.COAUTHORSHIP_VIS,
VisualizationFrameworkConstants.RENDER_MODE_KEY,
VisualizationFrameworkConstants.STANDALONE_RENDER_MODE);
VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
individualURI,
VisualizationFrameworkConstants.VIS_TYPE_KEY,
VisualizationFrameworkConstants.PERSON_LEVEL_VIS,
VisualizationFrameworkConstants.VIS_MODE_KEY,
VisualizationFrameworkConstants.COAUTHOR_VIS_MODE);
return UrlBuilder.getUrl(
VisualizationFrameworkConstants.FREEMARKERIZED_VISUALIZATION_URL_PREFIX,
@ -190,6 +225,24 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
} else if (VisualizationFrameworkConstants.COPI_UTILS_VIS_MODE
.equalsIgnoreCase(visMode)) {
if (isIndividualURIBasedOnDefaultNamespace(individualURI, vitroRequest)) {
try {
Individual individual = vitroRequest.getWebappDaoFactory().getIndividualDao().getIndividualByURI(individualURI);
return UrlBuilder.getUrl(VisualizationFrameworkConstants.SHORT_URL_VISUALIZATION_REQUEST_PREFIX)
+ "/" + VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL
+ "/" + individual.getLocalName();
} catch(Exception e) {
/*
* In case of exception dont do anything let it create long form urls.
* */
}
}
/*
* By default we will be generating profile url else some specific url like
* coPI vis url for that individual.
@ -289,7 +342,8 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
return getHighestLevelOrganizationTemporalGraphVisURL(
highestLevelOrganizationQueryHandler.getQueryResult(),
fieldLabelToOutputFieldLabel);
fieldLabelToOutputFieldLabel,
vitroRequest);
} else {
@ -304,7 +358,8 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
}
private String getHighestLevelOrganizationTemporalGraphVisURL(ResultSet resultSet,
Map<String, String> fieldLabelToOutputFieldLabel) {
Map<String, String> fieldLabelToOutputFieldLabel,
VitroRequest vitroRequest) {
GenericQueryMap queryResult = new GenericQueryMap();
@ -321,6 +376,23 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
queryResult.addEntry(fieldLabelToOutputFieldLabel.get("organization"),
organizationNode.toString());
if (isIndividualURIBasedOnDefaultNamespace(organizationNode.toString(), vitroRequest)) {
try {
Individual individual = vitroRequest.getWebappDaoFactory().getIndividualDao().getIndividualByURI(organizationNode.toString());
return UrlBuilder.getUrl(VisualizationFrameworkConstants.SHORT_URL_VISUALIZATION_REQUEST_PREFIX)
+ "/" + VisualizationFrameworkConstants.PUBLICATION_TEMPORAL_VIS_SHORT_URL
+ "/" + individual.getLocalName();
} catch(Exception e) {
/*
* In case of exception dont do anything let it create long form urls.
* */
}
}
ParamMap highestLevelOrganizationTemporalGraphVisURLParams = new ParamMap(
VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY,
organizationNode.toString(),

2
src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
View file

@ -50,7 +50,6 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
String coauthorVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL + "/";
return getVisUrl(coauthorVisURL);
}
/**
@ -100,7 +99,6 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
String temporalVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.PUBLICATION_TEMPORAL_VIS_SHORT_URL + "/";
return getVisUrl(temporalVisURL);
}
public String getSelfEditingId() {