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

1. More updates to the map of science vis.

Browse source
This commit is contained in:
tankchintan 2011-05-28 00:05:42 +00:00
parent 1c594395aa
commit c79c6cf968
13 changed files with 150 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,6 +125,7 @@ public class VisualizationFrameworkConstants {
public static final String UTILITIES_VIS = "utilities";
public static final String ENTITY_COMPARISON_VIS = "entity_comparison";
public static final String PUBLICATION_TEMPORAL_VIS_SHORT_URL = "publication-graph";
public static final String MAP_OF_SCIENCE_VIS_SHORT_URL = "map-of-science";
public static final String GRANT_TEMPORAL_VIS_SHORT_URL = "grant-graph";
public static final String CO_PI_VIS = "coprincipalinvestigator";

18
src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -121,7 +121,23 @@ public class MapOfScienceVisualizationRequestHandler implements
organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI(
organizationEntity,
organizationWithAssociatedPeople);
}
} /*else {
// This is for just people.
Set<SubEntity> test = new HashSet<SubEntity>();
test.add(new SubEntity(subjectEntityURI));
documentURIForAssociatedPeopleTOVO = SelectOnModelUtilities
.getPublicationsWithJournalForAssociatedPeople(dataset, test);
organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI(
organizationEntity,
organizationWithAssociatedPeople);
}*/
if (allDocumentURIToVOs.isEmpty() && documentURIForAssociatedPeopleTOVO.isEmpty()) {

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

@ -86,6 +86,13 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
return getVisUrl(temporalVisURL);
}
public String getMapOfScienceUrl() {
String mapOfScienceVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.MAP_OF_SCIENCE_VIS_SHORT_URL + "/";
return getVisUrl(mapOfScienceVisURL);
}
public String getSelfEditingId() {
String id = null;
String idMatchingProperty = ConfigurationProperties.getBean(getServletContext()).getProperty("selfEditing.idMatchingProperty");