From 1e0c2195e117fb35b3e91ac36bfeace3a4d12e07 Mon Sep 17 00:00:00 2001 From: manolobevia Date: Wed, 11 May 2011 17:15:09 +0000 Subject: [PATCH 01/16] NIHVIVO-2280: Worked on pagination, accounts per page, sorting columns for accounts display, and select all email addresses. Work in progress, nothing final. --- themes/wilma/css/wilma.css | 11 +++++++++-- themes/wilma/images/sort-asc.gif | Bin 0 -> 290 bytes themes/wilma/images/sort-desc.gif | Bin 0 -> 293 bytes 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 themes/wilma/images/sort-asc.gif create mode 100644 themes/wilma/images/sort-desc.gif diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 17116019..f50b1de8 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1502,12 +1502,19 @@ table#account td { padding-top: 0; border-bottom: 1px solid #c1bfbf; padding-bottom: 0; + width: 100%; } .delete-account { float: left; - margin-top: 16px; - margin-right: 18px; + border: 2px solid red; } .display-tools { float: left; + font-size: .875em; +} +.hide { + display: none; +} +.accounts-per-page-form { + display: inline-block; } \ No newline at end of file diff --git a/themes/wilma/images/sort-asc.gif b/themes/wilma/images/sort-asc.gif new file mode 100644 index 0000000000000000000000000000000000000000..ede1261998bacf9f705946f711b9296f86f18676 GIT binary patch literal 290 zcmZ?wbhEHbzbP4l9T`c|Ia`hp!k!8k%2*pK?h_!$WIJx_6`#RW<&(E zc_^}rXw^(|Vl);}vYE)lR{B~-X<4)uqtYsuZH?XRZ#T54EAb|D3wnwyJbuBzo~K1x M(vw%V-jTr?08RU5&;S4c literal 0 HcmV?d00001 diff --git a/themes/wilma/images/sort-desc.gif b/themes/wilma/images/sort-desc.gif new file mode 100644 index 0000000000000000000000000000000000000000..cf69164be1918145981610f3671dd71fa59050ca GIT binary patch literal 293 zcmZ?wbhEHbzbP4l9T`c|Ia`hp!k!8k%2*pK?h_!$WIJxP7W6rTo#b* zo!MJhz`@9K+}%S_FwrTZ!Oi4gl5Sta^ Date: Wed, 11 May 2011 20:51:54 +0000 Subject: [PATCH 02/16] 1. refactored code in preparation for adding code structure for map of science vis --- .../mapOfScience/mapOfScienceSetup.ftl | 26 ++ .../mapOfScience/mapOfScienceStandalone.ftl | 38 ++ .../visualization/constants/VisConstants.java | 4 + .../EntityPublicationCountRequestHandler.java | 10 +- ...java => OrganizationUtilityFunctions.java} | 6 +- .../cached/EntityComparisonConstants.java | 11 - ...poralGrantVisualizationRequestHandler.java | 25 +- ...ublicationVisualizationRequestHandler.java | 25 +- .../EntityGrantCountRequestHandler.java | 12 +- ...pOfScienceVisualizationRequestHandler.java | 373 ++++++++++++++++++ 10 files changed, 481 insertions(+), 49 deletions(-) create mode 100644 productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl create mode 100644 productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl rename src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/{EntityComparisonUtilityFunctions.java => OrganizationUtilityFunctions.java} (97%) delete mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/EntityComparisonConstants.java create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl new file mode 100644 index 00000000..b33450af --- /dev/null +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl @@ -0,0 +1,26 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#assign standardVisualizationURLRoot ="/visualization"> +<#assign ajaxVisualizationURLRoot ="/visualizationAjax"> +<#assign dataVisualizationURLRoot ="/visualizationData"> +<#assign shortVisualizationURLRoot ="/vis"> + +<#assign organizationURI ="${organizationURI?url}"> +<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI}"> + +<#assign subOrganizationVivoProfileURL = "${urls.base}/individual?"> + +<#assign subOrganizationMapOfScienceCommonURL = "${urls.base}${shortVisualizationURLRoot}/map-of-science/"> + + +<#if organizationLocalName?has_content > + + <#assign organizationMapOfScienceURL = "${urls.base}${shortVisualizationURLRoot}/map-of-science/${organizationLocalName}"> + +<#else> + + <#assign organizationMapOfScienceURL = '${urls.base}${shortVisualizationURLRoot}/map-of-science/?uri=${organizationURI}'> + + + +<#assign organizationMapOfScienceDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=map-of-science&uri=${organizationURI}&vis_mode=json"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl new file mode 100644 index 00000000..a806e67b --- /dev/null +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -0,0 +1,38 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- The Order of each element in this file is very important. Do not make any changes to it unless making +corresponding changes in the included Templates. --> + + +<#include "scienceMapSetup.ftl"> + + \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java index 8b6f07d4..e792b969 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java @@ -14,4 +14,8 @@ public class VisConstants { public static final String RESULT_FORMAT_PARAM = "RS_TEXT"; public static final String RDF_RESULT_FORMAT_PARAM = "RDF/XML-ABBREV"; + public static enum DataVisMode { + CSV, JSON + }; + } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index a2715c21..6b528bfb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -53,7 +53,7 @@ public class EntityPublicationCountRequestHandler implements if (StringUtils.isBlank(entityURI)) { - entityURI = EntityComparisonUtilityFunctions + entityURI = OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, @@ -120,7 +120,7 @@ public class EntityPublicationCountRequestHandler implements throws MalformedQueryParametersException { Map> subOrganizationTypesResult = - EntityComparisonUtilityFunctions.getSubEntityTypes( + OrganizationUtilityFunctions.getSubEntityTypes( log, dataset, subjectEntityURI); return prepareStandaloneDataResponse(vitroRequest, entity, entity.getSubEntities(), @@ -155,7 +155,7 @@ public class EntityPublicationCountRequestHandler implements vitroRequest, log, dataset, - EntityComparisonUtilityFunctions + OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, @@ -178,7 +178,7 @@ public class EntityPublicationCountRequestHandler implements Entity entity = queryManager.getQueryResult(); Map> subOrganizationTypesResult = - EntityComparisonUtilityFunctions.getSubEntityTypes( + OrganizationUtilityFunctions.getSubEntityTypes( log, dataset, entityURI); return prepareDataResponse(entity, entity.getSubEntities(), subOrganizationTypesResult); @@ -251,7 +251,7 @@ public class EntityPublicationCountRequestHandler implements String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl"; - String organizationLabel = EntityComparisonUtilityFunctions + String organizationLabel = OrganizationUtilityFunctions .getEntityLabelFromDAO(vreq, entityURI); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java index 129d6a90..f2b94577 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityComparisonUtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java @@ -28,7 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.Generi import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -public class EntityComparisonUtilityFunctions { +public class OrganizationUtilityFunctions { public static String getHighestLevelOrganizationURI(ResultSet resultSet, Map fieldLabelToOutputFieldLabel) { @@ -94,7 +94,7 @@ public class EntityComparisonUtilityFunctions { fieldLabelToOutputFieldLabel, aggregationRules, whereClause, groupOrderClause, dataset, log); - String highestLevelOrgURI = EntityComparisonUtilityFunctions + String highestLevelOrgURI = OrganizationUtilityFunctions .getHighestLevelOrganizationURI( highestLevelOrganizationQueryHandler.getQueryResult(), fieldLabelToOutputFieldLabel); @@ -165,7 +165,7 @@ public class EntityComparisonUtilityFunctions { /* * If the provided value was not proper compute it yourself. * */ - return EntityComparisonUtilityFunctions.getHighestLevelOrganizationURI(log, dataset); + return OrganizationUtilityFunctions.getHighestLevelOrganizationURI(log, dataset); } public static Entity mergeEntityIfShareSameURI(Entity entityA, Entity entityB) { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/EntityComparisonConstants.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/EntityComparisonConstants.java deleted file mode 100644 index 2776907a..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/EntityComparisonConstants.java +++ /dev/null @@ -1,11 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.cached; - -public class EntityComparisonConstants { - - public static enum DataVisMode { - CSV, JSON - }; - -} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java index ce59b51a..9b26c7a6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java @@ -22,8 +22,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntityComparisonUtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; @@ -55,7 +56,7 @@ public class TemporalGrantVisualizationRequestHandler implements String entityURI) throws MalformedQueryParametersException { if (StringUtils.isBlank(entityURI)) { - entityURI = EntityComparisonUtilityFunctions + entityURI = OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, @@ -105,19 +106,19 @@ public class TemporalGrantVisualizationRequestHandler implements log, dataset, entityURI, - EntityComparisonConstants.DataVisMode.JSON); + VisConstants.DataVisMode.JSON); } else { return getSubjectEntityAndGenerateDataResponse( vitroRequest, log, dataset, - EntityComparisonUtilityFunctions + OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, vitroRequest), - EntityComparisonConstants.DataVisMode.JSON); + VisConstants.DataVisMode.JSON); } } else { @@ -129,7 +130,7 @@ public class TemporalGrantVisualizationRequestHandler implements log, dataset, entityURI, - EntityComparisonConstants.DataVisMode.CSV); + VisConstants.DataVisMode.CSV); } } @@ -157,7 +158,7 @@ public class TemporalGrantVisualizationRequestHandler implements private Map getSubjectEntityAndGenerateDataResponse( VitroRequest vitroRequest, Log log, Dataset dataset, - String subjectEntityURI, EntityComparisonConstants.DataVisMode visMode) + String subjectEntityURI, VisConstants.DataVisMode visMode) throws MalformedQueryParametersException { Entity organizationEntity = SelectOnModelUtilities @@ -165,7 +166,7 @@ public class TemporalGrantVisualizationRequestHandler implements if (organizationEntity.getSubEntities() == null) { - if (EntityComparisonConstants.DataVisMode.JSON.equals(visMode)) { + if (VisConstants.DataVisMode.JSON.equals(visMode)) { return prepareStandaloneDataErrorResponse(); } else { return prepareDataErrorResponse(); @@ -194,14 +195,14 @@ public class TemporalGrantVisualizationRequestHandler implements grantURIForAssociatedPeopleToVO = SelectOnModelUtilities .getGrantsForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities()); - organizationEntity = EntityComparisonUtilityFunctions.mergeEntityIfShareSameURI( + organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI( organizationEntity, organizationWithAssociatedPeople); } if (allGrantURIToVO.isEmpty() && grantURIForAssociatedPeopleToVO.isEmpty()) { - if (EntityComparisonConstants.DataVisMode.JSON.equals(visMode)) { + if (VisConstants.DataVisMode.JSON.equals(visMode)) { return prepareStandaloneDataErrorResponse(); } else { return prepareDataErrorResponse(); @@ -209,7 +210,7 @@ public class TemporalGrantVisualizationRequestHandler implements } else { - if (EntityComparisonConstants.DataVisMode.JSON.equals(visMode)) { + if (VisConstants.DataVisMode.JSON.equals(visMode)) { return prepareStandaloneDataResponse(vitroRequest, organizationEntity); } else { return prepareDataResponse(organizationEntity); @@ -283,7 +284,7 @@ public class TemporalGrantVisualizationRequestHandler implements String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl"; - String organizationLabel = EntityComparisonUtilityFunctions.getEntityLabelFromDAO(vreq, + String organizationLabel = OrganizationUtilityFunctions.getEntityLabelFromDAO(vreq, entityURI); Map body = new HashMap(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java index 4583d4d8..bbd94a9d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java @@ -22,8 +22,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntityComparisonUtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; @@ -66,7 +67,7 @@ public class TemporalPublicationVisualizationRequestHandler implements if (StringUtils.isBlank(entityURI)) { - entityURI = EntityComparisonUtilityFunctions + entityURI = OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, @@ -85,7 +86,7 @@ public class TemporalPublicationVisualizationRequestHandler implements private Map getSubjectEntityAndGenerateDataResponse( VitroRequest vitroRequest, Log log, Dataset dataset, - String subjectEntityURI, EntityComparisonConstants.DataVisMode visMode) + String subjectEntityURI, VisConstants.DataVisMode visMode) throws MalformedQueryParametersException { Entity organizationEntity = SelectOnModelUtilities @@ -93,7 +94,7 @@ public class TemporalPublicationVisualizationRequestHandler implements if (organizationEntity.getSubEntities() == null) { - if (EntityComparisonConstants.DataVisMode.JSON.equals(visMode)) { + if (VisConstants.DataVisMode.JSON.equals(visMode)) { return prepareStandaloneDataErrorResponse(); } else { return prepareDataErrorResponse(); @@ -113,14 +114,14 @@ public class TemporalPublicationVisualizationRequestHandler implements documentURIForAssociatedPeopleTOVO = SelectOnModelUtilities .getPublicationsForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities()); - organizationEntity = EntityComparisonUtilityFunctions.mergeEntityIfShareSameURI( + organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI( organizationEntity, organizationWithAssociatedPeople); } if (allDocumentURIToVOs.isEmpty() && documentURIForAssociatedPeopleTOVO.isEmpty()) { - if (EntityComparisonConstants.DataVisMode.JSON.equals(visMode)) { + if (VisConstants.DataVisMode.JSON.equals(visMode)) { return prepareStandaloneDataErrorResponse(); } else { return prepareDataErrorResponse(); @@ -128,7 +129,7 @@ public class TemporalPublicationVisualizationRequestHandler implements } else { - if (EntityComparisonConstants.DataVisMode.JSON.equals(visMode)) { + if (VisConstants.DataVisMode.JSON.equals(visMode)) { return prepareStandaloneDataResponse(vitroRequest, organizationEntity); } else { return prepareDataResponse(organizationEntity); @@ -217,19 +218,19 @@ public class TemporalPublicationVisualizationRequestHandler implements log, dataset, entityURI, - EntityComparisonConstants.DataVisMode.JSON); + VisConstants.DataVisMode.JSON); } else { return getSubjectEntityAndGenerateDataResponse( vitroRequest, log, dataset, - EntityComparisonUtilityFunctions + OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, vitroRequest), - EntityComparisonConstants.DataVisMode.JSON); + VisConstants.DataVisMode.JSON); } } else { @@ -242,7 +243,7 @@ public class TemporalPublicationVisualizationRequestHandler implements log, dataset, entityURI, - EntityComparisonConstants.DataVisMode.CSV); + VisConstants.DataVisMode.CSV); } @@ -274,7 +275,7 @@ public class TemporalPublicationVisualizationRequestHandler implements String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl"; - String organizationLabel = EntityComparisonUtilityFunctions + String organizationLabel = OrganizationUtilityFunctions .getEntityLabelFromDAO(vreq, entityURI); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index 380cafd6..1666563e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntityComparisonUtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; @@ -54,7 +54,7 @@ public class EntityGrantCountRequestHandler implements String entityURI) throws MalformedQueryParametersException { if (StringUtils.isBlank(entityURI)) { - entityURI = EntityComparisonUtilityFunctions + entityURI = OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, @@ -102,7 +102,7 @@ public class EntityGrantCountRequestHandler implements vitroRequest, log, dataset, - EntityComparisonUtilityFunctions + OrganizationUtilityFunctions .getStaffProvidedOrComputedHighestLevelOrganization( log, dataset, @@ -125,7 +125,7 @@ public class EntityGrantCountRequestHandler implements Map> subOrganizationTypesResult = - EntityComparisonUtilityFunctions.getSubEntityTypes( + OrganizationUtilityFunctions.getSubEntityTypes( log, dataset, entityURI); return prepareDataResponse(entity, entity.getSubEntities(), subOrganizationTypesResult); @@ -173,7 +173,7 @@ public class EntityGrantCountRequestHandler implements throws MalformedQueryParametersException { Map> subOrganizationTypesResult = - EntityComparisonUtilityFunctions.getSubEntityTypes( + OrganizationUtilityFunctions.getSubEntityTypes( log, dataset, subjectOrganization); return prepareStandaloneDataResponse(vitroRequest, entity, subOrganizationTypesResult); @@ -250,7 +250,7 @@ public class EntityGrantCountRequestHandler implements String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl"; - String organizationLabel = EntityComparisonUtilityFunctions.getEntityLabelFromDAO(vreq, + String organizationLabel = OrganizationUtilityFunctions.getEntityLabelFromDAO(vreq, entityURI); Map body = new HashMap(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java new file mode 100644 index 00000000..4b2bd1e8 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -0,0 +1,373 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.mapofscience; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; + +import com.google.gson.Gson; +import com.hp.hpl.jena.query.Dataset; + +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; + +public class MapOfScienceVisualizationRequestHandler implements + VisualizationRequestHandler { + + @Override + public ResponseValues generateStandardVisualization( + VitroRequest vitroRequest, Log log, Dataset dataset) + throws MalformedQueryParametersException { + + + String entityURI = vitroRequest + .getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); + + return generateStandardVisualizationForScienceMapVis( + vitroRequest, log, dataset, entityURI); + } + + @Override + public ResponseValues generateVisualizationForShortURLRequests( + Map parameters, VitroRequest vitroRequest, Log log, + Dataset dataset) throws MalformedQueryParametersException { + + + return generateStandardVisualizationForScienceMapVis( + vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY)); + + } + + private ResponseValues generateStandardVisualizationForScienceMapVis( + VitroRequest vitroRequest, Log log, Dataset dataset, + String entityURI) throws MalformedQueryParametersException { + + if (StringUtils.isBlank(entityURI)) { + + entityURI = OrganizationUtilityFunctions + .getStaffProvidedOrComputedHighestLevelOrganization( + log, + dataset, + vitroRequest); + + } + + +// System.out.println("current models in the system are"); +// for (Map.Entry entry : ConstructedModelTracker.getAllModels().entrySet()) { +// System.out.println(entry.getKey() + " -> " + entry.getValue().size()); +// } +// + return prepareStandaloneMarkupResponse(vitroRequest, entityURI); + } + + private Map getSubjectEntityAndGenerateDataResponse( + VitroRequest vitroRequest, Log log, Dataset dataset, + String subjectEntityURI, VisConstants.DataVisMode visMode) + throws MalformedQueryParametersException { + + Entity organizationEntity = SelectOnModelUtilities + .getSubjectOrganizationHierarchy(dataset, subjectEntityURI); + + if (organizationEntity.getSubEntities() == null) { + + if (VisConstants.DataVisMode.JSON.equals(visMode)) { + return prepareStandaloneDataErrorResponse(); + } else { + return prepareDataErrorResponse(); + } + } + + Map documentURIForAssociatedPeopleTOVO = new HashMap(); + Map allDocumentURIToVOs = new HashMap(); + + allDocumentURIToVOs = SelectOnModelUtilities.getPublicationsForAllSubOrganizations(dataset, organizationEntity); + + Entity organizationWithAssociatedPeople = SelectOnModelUtilities + .getSubjectOrganizationAssociatedPeople(dataset, subjectEntityURI); + + if (organizationWithAssociatedPeople.getSubEntities() != null) { + + documentURIForAssociatedPeopleTOVO = SelectOnModelUtilities + .getPublicationsForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities()); + + organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI( + organizationEntity, + organizationWithAssociatedPeople); + } + + if (allDocumentURIToVOs.isEmpty() && documentURIForAssociatedPeopleTOVO.isEmpty()) { + + if (VisConstants.DataVisMode.JSON.equals(visMode)) { + return prepareStandaloneDataErrorResponse(); + } else { + return prepareDataErrorResponse(); + } + + } else { + + if (VisConstants.DataVisMode.JSON.equals(visMode)) { + return prepareStandaloneDataResponse(vitroRequest, organizationEntity); + } else { + return prepareDataResponse(organizationEntity); + } + } + } + + /** + * Provides response when json file containing the publication count over the + * years is requested. + * + * @param entity + * @param subentities + * @param subOrganizationTypesResult + */ + private Map prepareDataResponse(Entity entity) { + + String entityLabel = entity.getEntityLabel(); + + /* + * To make sure that null/empty records for entity names do not cause any mischief. + * */ + if (StringUtils.isBlank(entityLabel)) { + entityLabel = "no-organization"; + } + + String outputFileName = UtilityFunctions.slugify(entityLabel) + + "_publications-per-year" + ".csv"; + + + Map fileData = new HashMap(); + + fileData.put(DataVisualizationController.FILE_NAME_KEY, + outputFileName); + fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, + "application/octet-stream"); + fileData.put(DataVisualizationController.FILE_CONTENT_KEY, + getEntityPublicationsPerYearCSVContent(entity)); + return fileData; + } + + private Map prepareDataErrorResponse() { + + String outputFileName = "no-organization_publications-per-year.csv"; + + Map fileData = new HashMap(); + + fileData.put(DataVisualizationController.FILE_NAME_KEY, + outputFileName); + fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, + "application/octet-stream"); + fileData.put(DataVisualizationController.FILE_CONTENT_KEY, ""); + return fileData; + } + + private Map prepareStandaloneDataErrorResponse() { + + Map fileData = new HashMap(); + + fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, + "application/octet-stream"); + fileData.put(DataVisualizationController.FILE_CONTENT_KEY, + "{\"error\" : \"No Publications for this Organization found in VIVO.\"}"); + return fileData; + } + + @Override + public Map generateDataVisualization( + VitroRequest vitroRequest, Log log, Dataset dataset) + throws MalformedQueryParametersException { + + String entityURI = vitroRequest + .getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); + + /* + * This will provide the data in json format mainly used for standalone tmeporal vis. + * */ + if (VisualizationFrameworkConstants.TEMPORAL_GRAPH_JSON_DATA_VIS_MODE + .equalsIgnoreCase(vitroRequest.getParameter( + VisualizationFrameworkConstants.VIS_MODE_KEY))) { + + if (StringUtils.isNotBlank(entityURI)) { + + return getSubjectEntityAndGenerateDataResponse( + vitroRequest, + log, + dataset, + entityURI, + VisConstants.DataVisMode.JSON); + } else { + + return getSubjectEntityAndGenerateDataResponse( + vitroRequest, + log, + dataset, + OrganizationUtilityFunctions + .getStaffProvidedOrComputedHighestLevelOrganization( + log, + dataset, + vitroRequest), + VisConstants.DataVisMode.JSON); + } + + } else { + /* + * This provides csv download files for the content in the tables. + * */ + + return getSubjectEntityAndGenerateDataResponse( + vitroRequest, + log, + dataset, + entityURI, + VisConstants.DataVisMode.CSV); + + } + + } + + + @Override + public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, + Dataset dataset) throws MalformedQueryParametersException { + throw new UnsupportedOperationException("Entity Pub Count does not provide Ajax Response."); + } + + private Map prepareStandaloneDataResponse( + VitroRequest vitroRequest, + Entity entity) { + + Map fileData = new HashMap(); + + fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, + "application/octet-stream"); + fileData.put(DataVisualizationController.FILE_CONTENT_KEY, + writePublicationsOverTimeJSON(vitroRequest, + entity)); + return fileData; + } + + private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq, + String entityURI) { + + String standaloneTemplate = "mapOfScienceStandalone.ftl"; + + String organizationLabel = OrganizationUtilityFunctions + .getEntityLabelFromDAO(vreq, + entityURI); + + Map body = new HashMap(); + body.put("title", organizationLabel + " - Map of Science Visualization"); + body.put("organizationURI", entityURI); + body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq)); + body.put("vivoDefaultNamespace", vreq.getWebappDaoFactory().getDefaultNamespace()); + body.put("organizationLabel", organizationLabel); + + return new TemplateResponseValues(standaloneTemplate, body); + } + + /** + * Function to generate a json file for year <-> publication count mapping. + * @param vreq + * @param subentities + * @param subOrganizationTypesResult + */ + private String writePublicationsOverTimeJSON(VitroRequest vreq, + Entity subjectEntity) { + + Gson json = new Gson(); + Set subEntitiesJson = new HashSet(); + + for (SubEntity subentity : subjectEntity.getSubEntities()) { + + JsonObject entityJson = new JsonObject( + subentity.getIndividualLabel()); + + List> yearPubCount = new ArrayList>(); + + for (Map.Entry pubEntry : UtilityFunctions + .getYearToActivityCount(subentity.getActivities()) + .entrySet()) { + + List currentPubYear = new ArrayList(); + if (pubEntry.getKey().equals(VOConstants.DEFAULT_PUBLICATION_YEAR)) { + currentPubYear.add(-1); + } else { + currentPubYear.add(Integer.parseInt(pubEntry.getKey())); + } + + currentPubYear.add(pubEntry.getValue()); + yearPubCount.add(currentPubYear); + } + + entityJson.setYearToActivityCount(yearPubCount); + + entityJson.setOrganizationTypes(subentity.getEntityTypeLabels()); + + entityJson.setEntityURI(subentity.getIndividualURI()); + + entityJson.setLastCachedAtDateTime(subentity.getLastCachedAtDateTime()); + + if (subentity.getEntityClass().equals(VOConstants.EntityClassType.PERSON)) { + entityJson.setVisMode("PERSON"); + } else if (subentity.getEntityClass().equals(VOConstants.EntityClassType.ORGANIZATION)) { + entityJson.setVisMode("ORGANIZATION"); + } + + subEntitiesJson.add(entityJson); + } + + SubjectEntityJSON subjectEntityJSON = new SubjectEntityJSON(subjectEntity.getEntityLabel(), + subjectEntity.getEntityURI(), + subjectEntity.getParents()); + + subEntitiesJson.add(subjectEntityJSON); + + return json.toJson(subEntitiesJson); + } + + private String getEntityPublicationsPerYearCSVContent(Entity entity) { + + StringBuilder csvFileContent = new StringBuilder(); + + csvFileContent.append("Entity Name, Publication Count, Entity Type\n"); + + for (SubEntity subEntity : entity.getSubEntities()) { + + csvFileContent.append(StringEscapeUtils.escapeCsv(subEntity.getIndividualLabel())); + csvFileContent.append(", "); + csvFileContent.append(subEntity.getActivities().size()); + csvFileContent.append(", "); + + String allTypes = StringUtils.join(subEntity.getEntityTypeLabels(), "; "); + + csvFileContent.append(StringEscapeUtils.escapeCsv(allTypes)); + csvFileContent.append("\n"); + } + return csvFileContent.toString(); + } + +} \ No newline at end of file From 380d7bca962c847506befd526d3f5c475ddc5cfb Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 11 May 2011 21:35:43 +0000 Subject: [PATCH 03/16] 1. Refactored the package naming, removed the "freemarker" from the package structure for visualziations, since now only freemarkerised visualizations exist. --- .../visualizations-beans-injection-fm.xml | 20 +++++------ .../AjaxVisualizationController.java | 4 +-- .../DataVisualizationController.java | 4 +-- .../ShortURLVisualizationController.java | 4 +-- .../StandardVisualizationController.java | 4 +-- .../freemarker/VisualizationInjector.java | 2 +- .../VisualizationsDependencyInjector.java | 2 +- .../CoAuthorshipGraphMLWriter.java | 12 +++---- .../coauthorship/CoAuthorshipQueryRunner.java | 18 +++++----- .../CoAuthorshipRequestHandler.java | 12 +++---- .../CoAuthorshipVisCodeGenerator.java | 10 +++--- .../collaborationutils/CoAuthorshipData.java | 6 ++-- .../CoInvestigationData.java | 6 ++-- .../CollaborationComparator.java | 4 +-- .../collaborationutils/CollaborationData.java | 6 ++-- .../CollaboratorComparator.java | 4 +-- .../CoPIGrantCountConstructQueryRunner.java | 4 +-- .../CoPIGrantCountQueryRunner.java | 18 +++++----- .../CoPIGrantCountRequestHandler.java | 14 ++++---- .../CoPIGraphMLWriter.java | 12 +++---- .../CoPIVisCodeGenerator.java | 10 +++--- ...yPublicationCountConstructQueryRunner.java | 4 +-- .../EntityPublicationCountQueryRunner.java | 10 +++--- .../EntityPublicationCountRequestHandler.java | 16 ++++----- ...OrganizationTypesConstructQueryRunner.java | 4 +-- ...EntitySubOrganizationTypesQueryRunner.java | 4 +-- .../OrganizationUtilityFunctions.java | 12 +++---- ...poralGrantVisualizationRequestHandler.java | 20 +++++------ ...ublicationVisualizationRequestHandler.java | 20 +++++------ .../EntityGrantCountConstructQueryRunner.java | 4 +-- .../EntityGrantCountQueryRunner.java | 10 +++--- .../EntityGrantCountRequestHandler.java | 18 +++++----- ...pOfScienceVisualizationRequestHandler.java | 20 +++++------ .../ModelConstructorUtilities.java | 22 ++++++------ ...ciatedPeopleModelWithTypesConstructor.java | 4 +-- ...OrganizationModelWithTypesConstructor.java | 4 +-- ...tsForSubOrganizationsModelConstructor.java | 4 +-- ...nsForSubOrganizationsModelConstructor.java | 4 +-- .../PeopleToGrantsModelConstructor.java | 4 +-- .../PeopleToPublicationsModelConstructor.java | 4 +-- .../PersonToGrantsModelConstructor.java | 4 +-- .../PersonToPublicationsModelConstructor.java | 4 +-- ...SubOrganizationWithinModelConstructor.java | 4 +-- .../factory/ModelFactoryInterface.java | 2 +- ...AssociatedPeopleModelWithTypesFactory.java | 8 ++--- .../OrganizationModelWithTypesFactory.java | 8 ++--- ...ionToGrantsForSubOrganizationsFactory.java | 8 ++--- ...ublicationsForSubOrganizationsFactory.java | 8 ++--- .../factory/PeopleToGrantsFactory.java | 8 ++--- .../factory/PeopleToPublicationsFactory.java | 8 ++--- .../factory/PersonToGrantsFactory.java | 8 ++--- .../factory/PersonToPublicationsFactory.java | 8 ++--- .../SubOrganizationWithinModelFactory.java | 8 ++--- .../PersonGrantCountQueryRunner.java | 8 ++--- .../PersonGrantCountRequestHandler.java | 14 ++++---- .../PersonGrantCountVisCodeGenerator.java | 8 ++--- .../PersonLevelRequestHandler.java | 34 +++++++++---------- .../PersonPublicationCountQueryRunner.java | 8 ++--- .../PersonPublicationCountRequestHandler.java | 14 ++++---- ...ersonPublicationCountVisCodeGenerator.java | 8 ++--- .../utilities/UtilitiesRequestHandler.java | 14 ++++---- .../valueobjects/Activity.java | 4 +-- .../valueobjects/Collaboration.java | 6 ++-- .../valueobjects/Collaborator.java | 6 ++-- .../valueobjects/ConstructedModelTracker.java | 2 +- .../{freemarker => }/valueobjects/Entity.java | 2 +- .../valueobjects/GenericQueryMap.java | 2 +- .../valueobjects/Individual.java | 2 +- .../valueobjects/JsonObject.java | 2 +- .../valueobjects/SparklineData.java | 2 +- .../valueobjects/SubEntity.java | 2 +- .../valueobjects/SubjectEntityJSON.java | 2 +- .../YearToEntityCountDataElement.java | 2 +- .../visutils/AllPropertiesQueryRunner.java | 4 +-- .../visutils/CachedModelConstructor.java | 2 +- .../visutils/GenericQueryRunner.java | 2 +- .../visutils/GenericQueryRunnerOnModel.java | 2 +- .../visutils/ModelConstructor.java | 2 +- .../visutils/PDFDocument.java | 2 +- .../visutils/QueryRunner.java | 2 +- .../visutils/SelectOnModelUtilities.java | 26 +++++++------- .../visutils/UniqueIDGenerator.java | 2 +- .../visutils/UtilityFunctions.java | 12 +++---- .../visutils/VisualizationRequestHandler.java | 2 +- 84 files changed, 325 insertions(+), 325 deletions(-) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipGraphMLWriter.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipQueryRunner.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipRequestHandler.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipVisCodeGenerator.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CoAuthorshipData.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CoInvestigationData.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CollaborationComparator.java (69%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CollaborationData.java (80%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CollaboratorComparator.java (68%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGrantCountQueryRunner.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGrantCountRequestHandler.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGraphMLWriter.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIVisCodeGenerator.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntityPublicationCountConstructQueryRunner.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntityPublicationCountQueryRunner.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntityPublicationCountRequestHandler.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntitySubOrganizationTypesQueryRunner.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/OrganizationUtilityFunctions.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitygrantcount/EntityGrantCountConstructQueryRunner.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitygrantcount/EntityGrantCountQueryRunner.java (96%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitygrantcount/EntityGrantCountRequestHandler.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/mapofscience/MapOfScienceVisualizationRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/ModelConstructorUtilities.java (55%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationModelWithTypesConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PeopleToGrantsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PeopleToPublicationsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PersonToGrantsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PersonToPublicationsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/SubOrganizationWithinModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/ModelFactoryInterface.java (81%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationModelWithTypesFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java (74%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PeopleToGrantsFactory.java (71%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PeopleToPublicationsFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PersonToGrantsFactory.java (71%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PersonToPublicationsFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/SubOrganizationWithinModelFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/persongrantcount/PersonGrantCountQueryRunner.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/persongrantcount/PersonGrantCountRequestHandler.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/persongrantcount/PersonGrantCountVisCodeGenerator.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personlevel/PersonLevelRequestHandler.java (85%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personpubcount/PersonPublicationCountQueryRunner.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personpubcount/PersonPublicationCountRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personpubcount/PersonPublicationCountVisCodeGenerator.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/utilities/UtilitiesRequestHandler.java (96%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Activity.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Collaboration.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Collaborator.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/ConstructedModelTracker.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Entity.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/GenericQueryMap.java (87%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Individual.java (85%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/JsonObject.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/SparklineData.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/SubEntity.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/SubjectEntityJSON.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/YearToEntityCountDataElement.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/AllPropertiesQueryRunner.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/CachedModelConstructor.java (83%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/GenericQueryRunner.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/GenericQueryRunnerOnModel.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/ModelConstructor.java (81%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/PDFDocument.java (99%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/QueryRunner.java (78%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/SelectOnModelUtilities.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/UniqueIDGenerator.java (75%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/UtilityFunctions.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/VisualizationRequestHandler.java (93%) diff --git a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml index 7fd32b8b..6e3e9b5f 100644 --- a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml +++ b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml @@ -11,34 +11,34 @@ + class="edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.utilities.UtilitiesRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.personlevel.PersonLevelRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.EntityPublicationCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached.TemporalPublicationVisualizationRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount.EntityGrantCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached.TemporalGrantVisualizationRequestHandler" /> diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java index 08f9e9b9..d9499c48 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java @@ -21,8 +21,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.TemplateProcessingHelper.TemplateProcessingException; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; import freemarker.template.Configuration; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java index 88cc9bf2..534536b4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java @@ -20,8 +20,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * Services a visualization request. This will return a simple error message and a 501 if diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java index 3b5b8b93..20652bac 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java @@ -23,8 +23,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * Services a standard visualization request, which involves templates. This will return a simple diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java index aeaf4c23..4eeed864 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java @@ -16,8 +16,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * Services a standard visualization request, which involves templates. This will return a simple diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java index 31f86e17..19dd2423 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java @@ -3,7 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; import java.util.Map; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class VisualizationInjector { private Map visualizationIDToClass; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java index e06afff0..9fe4388f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class VisualizationsDependencyInjector { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipGraphMLWriter.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 066d1f0b..8dc3166c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.ArrayList; import java.util.Collections; @@ -11,11 +11,11 @@ import java.util.Set; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public class CoAuthorshipGraphMLWriter { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java index 79f0ca69..9c108c6a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.ArrayList; import java.util.Collections; @@ -26,17 +26,17 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.RDFNode; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CoAuthorshipData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; /** * This query runner is used to execute a sparql query to get all the publications diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java index ddf1b389..e497d1fd 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.HashMap; import java.util.Map; @@ -18,12 +18,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * This request handler is used when information related to co-authorship network diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java index 220cbfb9..27006e03 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.ArrayList; import java.util.Calendar; @@ -17,10 +17,10 @@ import org.apache.commons.logging.Log; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; public class CoAuthorshipVisCodeGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoAuthorshipData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoAuthorshipData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java index 2c08a59b..31cab024 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoAuthorshipData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public class CoAuthorshipData extends CollaborationData { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoInvestigationData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoInvestigationData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java index 3f844b7c..12cd67f7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoInvestigationData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public class CoInvestigationData extends CollaborationData { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java similarity index 69% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationComparator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java index 8fe49e88..9b71a140 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationComparator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java @@ -1,10 +1,10 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.Comparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java similarity index 80% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java index 8a958b76..a28f8073 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.Map; import java.util.Set; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public abstract class CollaborationData { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaboratorComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java similarity index 68% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaboratorComparator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java index f3c3aa7e..178e9f89 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaboratorComparator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java @@ -1,10 +1,10 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.Comparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java index 8f3b9025..256e1b29 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.HashSet; import java.util.Set; @@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class CoPIGrantCountConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java index c85d4dc8..4f6924c0 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; import java.util.Collections; @@ -27,17 +27,17 @@ import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.RDFNode; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CoInvestigationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; /** * @author bkoniden * Deepak Konidena diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index 2ecb135e..79714a18 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.HashMap; import java.util.Map; @@ -17,13 +17,13 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGraphMLWriter.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java index 98a5d922..666c9337 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; import java.util.Collections; @@ -11,11 +11,11 @@ import java.util.Set; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; /** * @author bkoniden * Deepak Konidena diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java index a3a3a51c..10370ad1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; import java.util.Calendar; @@ -17,10 +17,10 @@ import org.apache.commons.logging.Log; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * This class contains code for rendering sparklines and displaying tables for diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountConstructQueryRunner.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountConstructQueryRunner.java index 02b9a88e..c9cf3838 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountConstructQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.LinkedHashSet; import java.util.Set; @@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class EntityPublicationCountConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountQueryRunner.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountQueryRunner.java index c742a204..b7b28467 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; import java.util.Map; @@ -26,10 +26,10 @@ import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java index 6b528bfb..276bda1f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.ArrayList; import java.util.HashMap; @@ -24,13 +24,13 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class EntityPublicationCountRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java index f7aa55b6..48cee0e1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.LinkedHashSet; import java.util.Set; @@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class EntitySubOrganizationTypesConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java index 2ba8f8d4..b9a62279 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; import java.util.HashSet; @@ -26,7 +26,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/OrganizationUtilityFunctions.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/OrganizationUtilityFunctions.java index f2b94577..ddc92f4b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/OrganizationUtilityFunctions.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; import java.util.Map; @@ -22,11 +22,11 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.GenericQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.GenericQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; public class OrganizationUtilityFunctions { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java index 9b26c7a6..f51e5ef8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.cached; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class TemporalGrantVisualizationRequestHandler implements diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java index bbd94a9d..36cf0d1c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.cached; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class TemporalPublicationVisualizationRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountConstructQueryRunner.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountConstructQueryRunner.java index 13aec8a3..40bd5a8d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountConstructQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount; import java.util.LinkedHashSet; import java.util.Set; @@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class EntityGrantCountConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountQueryRunner.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountQueryRunner.java index 44257d21..58310d80 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount; import java.util.HashMap; import java.util.Map; @@ -25,10 +25,10 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** * This query runner is used to execute a sparql query that will fetch all the diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java index 1666563e..ad2d4005 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount; import java.util.ArrayList; import java.util.HashMap; @@ -23,15 +23,15 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class EntityGrantCountRequestHandler implements diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index 4b2bd1e8..454c465b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.mapofscience; +package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class MapOfScienceVisualizationRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/ModelConstructorUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java similarity index 55% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/ModelConstructorUtilities.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java index 39669842..f4d857a7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/ModelConstructorUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashMap; import java.util.Map; @@ -8,16 +8,16 @@ import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.ModelFactoryInterface; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationAssociatedPeopleModelWithTypesFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationModelWithTypesFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationToGrantsForSubOrganizationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationToPublicationsForSubOrganizationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PeopleToGrantsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PeopleToPublicationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PersonToGrantsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PersonToPublicationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.SubOrganizationWithinModelFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.ModelFactoryInterface; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationAssociatedPeopleModelWithTypesFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationModelWithTypesFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationToGrantsForSubOrganizationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationToPublicationsForSubOrganizationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PeopleToGrantsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PeopleToPublicationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PersonToGrantsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PersonToPublicationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.SubOrganizationWithinModelFactory; public class ModelConstructorUtilities { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java index 034d0e80..3d55858f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationAssociatedPeopleModelWithTypesConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationModelWithTypesConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationModelWithTypesConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java index df624e90..57571e9f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationModelWithTypesConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationModelWithTypesConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java index 3c9abdcf..a8936ffb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToGrantsForSubOrganizationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java index 60be6462..25344e72 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToPublicationsForSubOrganizationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToGrantsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToGrantsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java index 83c6d2be..7a43b1a9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToGrantsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToGrantsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToPublicationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java index b24beed6..bf87900b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToPublicationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToGrantsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToGrantsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java index f2603fc8..cd3f0261 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToGrantsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToGrantsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToPublicationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java index 62ceea22..19818ee1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToPublicationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/SubOrganizationWithinModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/SubOrganizationWithinModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java index e4905874..f5e099c7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/SubOrganizationWithinModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class SubOrganizationWithinModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/ModelFactoryInterface.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java similarity index 81% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/ModelFactoryInterface.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java index f1c29b41..a3aa7f55 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/ModelFactoryInterface.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java index 7346008b..789e97e3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationAssociatedPeopleModelWithTypesFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationModelWithTypesFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationModelWithTypesFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java index 45b2127f..f1cd50ea 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationModelWithTypesFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationModelWithTypesFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java index b3b93b28..92d469c9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToGrantsForSubOrganizationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java similarity index 74% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java index 9257d8e8..6ad5c18b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToPublicationsForSubOrganizationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToGrantsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java similarity index 71% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToGrantsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java index cb4e5e62..3523268f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToGrantsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToGrantsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToGrantsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToGrantsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToPublicationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToPublicationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java index 5a63cecb..4cb11cc0 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToPublicationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToPublicationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToPublicationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToPublicationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToGrantsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java similarity index 71% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToGrantsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java index d674b895..27d0ac08 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToGrantsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PersonToGrantsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PersonToGrantsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToGrantsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToPublicationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToPublicationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java index 65a36d17..503d15c3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToPublicationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PersonToPublicationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PersonToPublicationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToPublicationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/SubOrganizationWithinModelFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/SubOrganizationWithinModelFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java index e1e07979..ea9c2d15 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/SubOrganizationWithinModelFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.SubOrganizationWithinModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.SubOrganizationWithinModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class SubOrganizationWithinModelFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java index ad95526c..f90c34a6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; import java.util.HashSet; import java.util.Set; @@ -24,9 +24,9 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java index 7ebcaffe..15cd9b8b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; import java.util.HashMap; import java.util.Map; @@ -19,12 +19,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java index bc05ef0e..4d4ed129 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; import java.util.ArrayList; import java.util.Calendar; @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; public class PersonGrantCountVisCodeGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java similarity index 85% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index b6c6e27d..c12417be 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personlevel; +package edu.cornell.mannlib.vitro.webapp.visualization.personlevel; import java.util.HashMap; import java.util.Map; @@ -16,23 +16,23 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountConstructQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIVisCodeGenerator; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship.CoAuthorshipQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship.CoAuthorshipVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIGrantCountConstructQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIGrantCountQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount.PersonGrantCountQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount.PersonGrantCountVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount.PersonPublicationCountQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount.PersonPublicationCountVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * This request handler is used to serve content rendered on the person level vis page diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java index 692b65fa..1631cc2c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount; +package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.HashSet; import java.util.Set; @@ -24,9 +24,9 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java index ec8a7b07..ed75910b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount; +package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.HashMap; import java.util.Map; @@ -19,12 +19,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java index 760b16ed..bc1d70f5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount; +package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.ArrayList; import java.util.Calendar; @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; public class PersonPublicationCountVisCodeGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java index 7d64d4f8..9c2da768 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.utilities; +package edu.cornell.mannlib.vitro.webapp.visualization.utilities; import java.util.HashMap; import java.util.Map; @@ -26,12 +26,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Visu import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.AllPropertiesQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.GenericQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.AllPropertiesQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.GenericQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * This request handler is used when you need helpful information to add more context diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Activity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Activity.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java index cf3307bb..cf015d8a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Activity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java @@ -1,8 +1,8 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * This interface will make sure that VOs conveying any person's academic output like publications, diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaboration.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaboration.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java index ccd1caa7..daf960d2 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaboration.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collections; import java.util.HashMap; @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaborator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaborator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java index dbf4592c..66025f66 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaborator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collections; import java.util.HashMap; @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/ConstructedModelTracker.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/ConstructedModelTracker.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java index d5d66295..ca018ffe 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/ConstructedModelTracker.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java index 08ce73d9..08449938 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/GenericQueryMap.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java similarity index 87% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/GenericQueryMap.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java index f9b13d5f..2c01d34d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/GenericQueryMap.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; import java.util.HashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Individual.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java similarity index 85% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Individual.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java index e3d3872f..89c6ddd5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Individual.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; public class Individual { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/JsonObject.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/JsonObject.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java index c97761fb..017dabe6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/JsonObject.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java index 89830407..0e48cb61 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.List; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java index 7cd3438d..87b341b6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collection; import java.util.HashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubjectEntityJSON.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubjectEntityJSON.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java index 58f94a52..e3bcd6fb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubjectEntityJSON.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java index 96d6577b..0c7408f5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; /** * This object is used to store information about the yearToEntityCount Map in the format diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/AllPropertiesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/AllPropertiesQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java index 85d45c83..1f3d0aef 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/AllPropertiesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -21,7 +21,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/CachedModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java similarity index 83% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/CachedModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java index 23aadc6c..f48f33b9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/CachedModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import com.hp.hpl.jena.rdf.model.Model; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java index 08e9c9ed..25ac9a57 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunnerOnModel.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunnerOnModel.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java index ca90c6f6..2a6ff9f7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunnerOnModel.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/ModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java similarity index 81% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/ModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java index 5306ca78..05f382c8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/ModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import com.hp.hpl.jena.rdf.model.Model; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/PDFDocument.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/PDFDocument.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java index 9a687849..d6a737cf 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/PDFDocument.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.awt.BasicStroke; import java.awt.Color; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/QueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java similarity index 78% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/QueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java index 4c01a7f4..58a572ae 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/QueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/SelectOnModelUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/SelectOnModelUtilities.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java index c86954c6..53501679 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/SelectOnModelUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Collection; import java.util.HashMap; @@ -18,18 +18,18 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.ModelConstructorUtilities; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToGrantsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToPublicationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.SubOrganizationWithinModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.ModelConstructorUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToGrantsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToPublicationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.SubOrganizationWithinModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; public class SelectOnModelUtilities { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UniqueIDGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java similarity index 75% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UniqueIDGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java index b41995b6..ddfa0b27 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UniqueIDGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; public class UniqueIDGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java index ece95482..00df4df7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.io.IOException; import java.util.HashMap; @@ -25,13 +25,13 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; public class UtilityFunctions { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/VisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/VisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java index 99dd685c..c0f446d1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/VisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map; From 8cfd4e1f84f1cc4a4db8e99a89672233ae03adf6 Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 11 May 2011 21:55:21 +0000 Subject: [PATCH 04/16] 1. Removing blank vis packages. From a165660e01d06a5404003d582038012d0c86b174 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 12 May 2011 14:04:23 +0000 Subject: [PATCH 05/16] 1. Removing blank vis packages. From b14311e04803ca5e4bb6114e8b33c98852431765 Mon Sep 17 00:00:00 2001 From: briancaruso Date: Thu, 12 May 2011 16:04:28 +0000 Subject: [PATCH 06/16] Refactoring the N3 editing to reorganize packages --- productMods/edit/forms/addAuthorsToInformationResource.jsp | 2 +- productMods/edit/forms/addGrantRoleToPerson.jsp | 6 +++--- productMods/edit/forms/addPublicationToPerson.jsp | 2 +- productMods/edit/forms/addRoleToPersonTwoStage.jsp | 6 +++--- productMods/edit/forms/newIndividualForm.jsp | 4 ++-- productMods/edit/forms/organizationHasPositionHistory.jsp | 6 +++--- productMods/edit/forms/personHasEducationalTraining.jsp | 6 +++--- productMods/edit/forms/personHasPositionHistory.jsp | 6 +++--- .../edit/n3editing/PersonHasPublicationValidator.java | 4 ++++ .../edit/n3editing/PublicationHasAuthorValidator.java | 4 ++++ 10 files changed, 27 insertions(+), 19 deletions(-) diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp index 7b5c336d..25cd3f4c 100644 --- a/productMods/edit/forms/addAuthorsToInformationResource.jsp +++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp @@ -32,7 +32,7 @@ core:authorInAuthorship (Person : Authorship) - inverse of linkedAuthor <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.PublicationHasAuthorValidator" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp index 9b5e1075..bc22728a 100644 --- a/productMods/edit/forms/addGrantRoleToPerson.jsp +++ b/productMods/edit/forms/addGrantRoleToPerson.jsp @@ -19,7 +19,7 @@ This is intended to create a set of statements like: <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils" %> @@ -48,9 +48,9 @@ This is intended to create a set of statements like: ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri ); if( op != null && op.getURIInverse() != null ){ %> -<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%> <%@page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> -<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%><%=op.getURIInverse()%> <% +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%><%=op.getURIInverse()%> <% }else{ %> <% } diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp index 09fb8f1f..b3c9ba84 100644 --- a/productMods/edit/forms/addPublicationToPerson.jsp +++ b/productMods/edit/forms/addPublicationToPerson.jsp @@ -26,7 +26,7 @@ core:informationResourceInAuthorship (InformationResource : Authorship) - invers <%@page import="edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.PersonHasPublicationValidator" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index b5b0a54c..ca722aa4 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -38,7 +38,7 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils" %> @@ -56,9 +56,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%> <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%> <%! public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.addRoleToPersonTwoStage.jsp"); diff --git a/productMods/edit/forms/newIndividualForm.jsp b/productMods/edit/forms/newIndividualForm.jsp index f534778f..25797273 100644 --- a/productMods/edit/forms/newIndividualForm.jsp +++ b/productMods/edit/forms/newIndividualForm.jsp @@ -23,11 +23,11 @@ parameter set up by editRequestDispatch. <%@page import="edu.cornell.mannlib.vitro.webapp.beans.VClass"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> -<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.FoafNameToRdfsLabelPreprocessor"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor"%> <%@ page import="org.apache.commons.logging.Log" %> <%@ page import="org.apache.commons.logging.LogFactory" %> diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp index a4feb2ae..293196e1 100644 --- a/productMods/edit/forms/organizationHasPositionHistory.jsp +++ b/productMods/edit/forms/organizationHasPositionHistory.jsp @@ -10,15 +10,15 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> -<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%> <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %> diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp index f5229a31..4341ed0a 100644 --- a/productMods/edit/forms/personHasEducationalTraining.jsp +++ b/productMods/edit/forms/personHasEducationalTraining.jsp @@ -44,7 +44,7 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.Precision"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> @@ -52,9 +52,9 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) <%@ page import="org.apache.commons.logging.LogFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> -<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode"%> diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp index 652ef589..96d13e4c 100644 --- a/productMods/edit/forms/personHasPositionHistory.jsp +++ b/productMods/edit/forms/personHasPositionHistory.jsp @@ -10,20 +10,20 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode"%> <%@ page import="org.apache.commons.logging.Log" %> <%@ page import="org.apache.commons.logging.LogFactory" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%> <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %> diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java index 261660ee..b106db0b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java @@ -9,6 +9,10 @@ import org.apache.commons.lang.StringUtils; import com.hp.hpl.jena.rdf.model.Literal; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.N3Validator; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.EditSubmission; + public class PersonHasPublicationValidator implements N3Validator { private static String MISSING_PUB_TYPE_ERROR = "Must specify a publication type."; diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java index 40cf365c..ab1235d9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java @@ -7,6 +7,10 @@ import java.util.Map; import com.hp.hpl.jena.rdf.model.Literal; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.N3Validator; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.EditSubmission; + public class PublicationHasAuthorValidator implements N3Validator { private static String MISSING_FIRST_NAME_ERROR = "Must specify the author's first name."; From 8713552eb57bcd93b4dddb473fc9b06d25c2217a Mon Sep 17 00:00:00 2001 From: cappadona Date: Thu, 12 May 2011 20:07:34 +0000 Subject: [PATCH 07/16] Updates to QR codes for individual page: * Now a single include in indidvidual--foaf-person.ftl * Added QR icon and moved to tools area under individual image * Removed inline styles and refactored markup throughout --- productMods/css/individual/individual-qr.css | 23 ++++ productMods/images/individual/qr_icon.png | Bin 0 -> 194 bytes .../body/foaf-person--exportQrCode.ftl | 38 +++--- .../individual/individual--foaf-person.ftl | 14 +- .../individual-qrCodeFoafPerson.ftl | 124 +----------------- .../individual/individual-qrCodeGenerator.ftl | 119 +++++++++++++++++ 6 files changed, 164 insertions(+), 154 deletions(-) create mode 100644 productMods/css/individual/individual-qr.css create mode 100644 productMods/images/individual/qr_icon.png create mode 100644 productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl diff --git a/productMods/css/individual/individual-qr.css b/productMods/css/individual/individual-qr.css new file mode 100644 index 00000000..0cc45308 --- /dev/null +++ b/productMods/css/individual/individual-qr.css @@ -0,0 +1,23 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +.qrCode { + float: left; +} +img.qrCode { + margin-bottom: 2em; +} +.vcard { + clear: left; +} +h2 em { + font-style: normal; + font-size: .7em; +} +section h4 { + margin-top: 2em; + padding-bottom: 0; +} +section textarea { + width: 600px; + height: 120px; +} \ No newline at end of file diff --git a/productMods/images/individual/qr_icon.png b/productMods/images/individual/qr_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..79af01b06d54a6848dfa725548eca0a5c618c202 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn3?z9rZ$AN~BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%u?6^qxB}__|Nk$&IsYz@73AsS7*cU7rH_&CfB^^7&j0mQ zd7>rKSC2^uEMa~nd1uA_$xr5WUi)x&gIQqpuga~L18wI_dE*m*v`esC(e(JlNd-r8 n^5bTD=FM@^F6;}5W#VD*oXgPg@uSmqpy>>ru6{1-oD!M -<#include "individual-qrCodeFoafPerson.ftl"> +<#include "individual-qrCodeGenerator.ftl"> <#assign qrCodeWidth = "150"> -

Export QR Code

-
-
- <#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" > - -
-
-

${individual.nameStatement.value}

-
-
-
+

Export QR Code (What is this?)

-
-

VCard

+<#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" > + + +

${individual.nameStatement.value}

+ +
+

VCard

<@qrCodeVCard qrCodeWidth="150" /> - <#t> -
+ -
-

Hyperlink

+
+

Hyperlink

<@qrCodeLink qrCodeWidth="150" /> - <#t> -
- - + +${stylesheets.add('')} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 3c2b575d..82d48d4b 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -4,8 +4,6 @@ <#include "individual-setup.ftl"> -<#include "individual-qrCodeFoafPerson.ftl"> -
@@ -34,6 +32,8 @@ <#if rdfUrl??>
  • RDF
    • + + <#include "individual-qrCodeFoafPerson.ftl"> @@ -41,16 +41,6 @@ <#-- Links --> <@p.vitroLinks propertyGroups namespaces editable "individual-urls-people" /> - - <#-- QR Codes --> - <#if hasValidVCard()> - -
    diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl index a84023c3..467c52d4 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl @@ -1,123 +1,7 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#-- QR code --> - -<#macro qrCodeVCard qrCodeWidth> - - <#local qrCodeUrl = getQrCodeUrlForVCard(qrCodeWidth)> - - <#if qrCodeUrl != ""> - - - - -<#macro qrCodeLink qrCodeWidth> - - <#local qrCodeUrl = getQrCodeUrlForLink(qrCodeWidth)> - - <#if qrCodeUrl != ""> - - - - - - -<#function getQrCodeUrlForVCard qrCodeWidth> - - <#local qrData = individual.qrData > - - <#local core = "http://vivoweb.org/ontology/core#"> - <#local foaf = "http://xmlns.com/foaf/0.1/"> - <#local rdfs = "http://www.w3.org/2000/01/rdf-schema#"> - - <#local firstName = qrData.firstName! > - <#local lastName = qrData.lastName! > - <#local org = "" > - <#local title = qrData.preferredTitle! > - <#local phoneNumber = qrData.phoneNumber! > - <#local email = qrData.email! > - <#local url = qrData.externalUrl! > - <#local photo = individual.thumbUrl! > - <#local rev = "" > - - <#local qrCodeUrl = ""> - <#if firstName != "" && lastName != ""> - <#local vCard><#t> - BEGIN:VCARD<#lt> - VERSION:3.0<#lt> - N:${lastName};${firstName}<#lt> - FN:${firstName} ${lastName}<#lt> - <#if org != ""> ORG:${org}<#lt> - <#if title != "">TITLE:${title}<#lt> - <#if phoneNumber != "">TEL;TYPE=WORK,VOICE:${phoneNumber}<#lt> - <#if email != "">EMAIL;TYPE=PREF,INTERNET:${email}<#lt> - <#if url != "">URL:${url}<#lt> - <#if photo != "">PHOTO;VALUE=URL;TYPE=JPG:${photo}<#lt> - <#if rev != "">REV:${rev}<#lt> - END:VCARD<#t> - <#t> - - <#local vCard = (removeBlankLines(vCard))?url> - - <#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&chs=${qrCodeWidth}x${qrCodeWidth}&chl=${vCard}&choe=UTF-8" > - - - <#return qrCodeUrl> - - - - -<#function getQrCodeUrlForLink qrCodeWidth> - - <#local qrData = individual.qrData > - - <#local url = qrData.externalUrl! > - - <#local qrCodeUrl = ""> - <#if url != ""> - <#local qrCodeContent = url?url> - <#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&chs=${qrCodeWidth}x${qrCodeWidth}&chl=${qrCodeContent}&choe=UTF-8" > - - - <#return qrCodeUrl> - - - - -<#function removeBlankLines input> - - <#local test = "\n\n"> - <#local replacement = "\n"> - - <#local output = input> - - <#local maxLoop = 50> - <#list 1..maxLoop as i> - <#if output?contains(test)> - <#local output = output?replace(test, replacement)> - <#else> - <#break> - - - - <#return output> - - -<#function hasValidVCard> - - <#local qrData = individual.qrData > - - <#local firstName = qrData.firstName! > - <#local lastName = qrData.lastName! > - - <#local validVCard = false> - <#if firstName != "" && lastName != ""> - <#local validVCard = true> - - - <#return validVCard> - - - - +<#include "individual-qrCodeGenerator.ftl"> +<#if hasValidVCard()> +
  • qr icon
    • + \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl new file mode 100644 index 00000000..21e72246 --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl @@ -0,0 +1,119 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- QR code --> + +<#macro qrCodeVCard qrCodeWidth> + + <#local qrCodeUrl = getQrCodeUrlForVCard(qrCodeWidth)> + + <#if qrCodeUrl != ""> + + + + +<#macro qrCodeLink qrCodeWidth> + + <#local qrCodeUrl = getQrCodeUrlForLink(qrCodeWidth)> + + <#if qrCodeUrl != ""> + + + + + + +<#function getQrCodeUrlForVCard qrCodeWidth> + + <#local qrData = individual.qrData > + + <#local core = "http://vivoweb.org/ontology/core#"> + <#local foaf = "http://xmlns.com/foaf/0.1/"> + <#local rdfs = "http://www.w3.org/2000/01/rdf-schema#"> + + <#local firstName = qrData.firstName! > + <#local lastName = qrData.lastName! > + <#local org = "" > + <#local title = qrData.preferredTitle! > + <#local phoneNumber = qrData.phoneNumber! > + <#local email = qrData.email! > + <#local url = qrData.externalUrl! > + <#local photo = individual.thumbUrl! > + <#local rev = "" > + + <#local qrCodeUrl = ""> + <#if firstName != "" && lastName != ""> + <#local vCard><#t> + BEGIN:VCARD<#lt> + VERSION:3.0<#lt> + N:${lastName};${firstName}<#lt> + FN:${firstName} ${lastName}<#lt> + <#if org != ""> ORG:${org}<#lt> + <#if title != "">TITLE:${title}<#lt> + <#if phoneNumber != "">TEL;TYPE=WORK,VOICE:${phoneNumber}<#lt> + <#if email != "">EMAIL;TYPE=PREF,INTERNET:${email}<#lt> + <#if url != "">URL:${url}<#lt> + <#if photo != "">PHOTO;VALUE=URL;TYPE=JPG:${photo}<#lt> + <#if rev != "">REV:${rev}<#lt> + END:VCARD<#t> + <#t> + + <#local vCard = (removeBlankLines(vCard))?url> + + <#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&chs=${qrCodeWidth}x${qrCodeWidth}&chl=${vCard}&choe=UTF-8" > + + + <#return qrCodeUrl> + + + + +<#function getQrCodeUrlForLink qrCodeWidth> + + <#local qrData = individual.qrData > + + <#local url = qrData.externalUrl! > + + <#local qrCodeUrl = ""> + <#if url != ""> + <#local qrCodeContent = url?url> + <#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&chs=${qrCodeWidth}x${qrCodeWidth}&chl=${qrCodeContent}&choe=UTF-8" > + + + <#return qrCodeUrl> + + + + +<#function removeBlankLines input> + + <#local test = "\n\n"> + <#local replacement = "\n"> + + <#local output = input> + + <#local maxLoop = 50> + <#list 1..maxLoop as i> + <#if output?contains(test)> + <#local output = output?replace(test, replacement)> + <#else> + <#break> + + + + <#return output> + + +<#function hasValidVCard> + + <#local qrData = individual.qrData > + + <#local firstName = qrData.firstName! > + <#local lastName = qrData.lastName! > + + <#local validVCard = false> + <#if firstName != "" && lastName != ""> + <#local validVCard = true> + + + <#return validVCard> + \ No newline at end of file From 5f8e6e41722ccc1365e181da7d1aa7f93a408326 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 12 May 2011 20:51:47 +0000 Subject: [PATCH 08/16] 1. Refactored package structure for the java files to remove the work "freemarker". 2. Did more work for setting up the backend for the science map visualziation. --- .../visualizations-beans-injection-fm.xml | 9 +- productMods/WEB-INF/web.xml | 8 +- .../AjaxVisualizationController.java | 2 +- .../DataVisualizationController.java | 2 +- .../ShortURLVisualizationController.java | 2 +- .../StandardVisualizationController.java | 2 +- .../VisualizationFrameworkConstants.java | 2 +- .../VisualizationInjector.java | 2 +- .../VisualizationsDependencyInjector.java | 2 +- .../CoAuthorshipGraphMLWriter.java | 2 +- .../CoAuthorshipRequestHandler.java | 4 +- .../CoAuthorshipVisCodeGenerator.java | 2 +- .../constants/QueryFieldLabels.java | 2 + .../CoPIGrantCountRequestHandler.java | 4 +- .../CoPIGraphMLWriter.java | 2 +- .../CoPIVisCodeGenerator.java | 2 +- .../EntityPublicationCountRequestHandler.java | 6 +- ...poralGrantVisualizationRequestHandler.java | 8 +- ...ublicationVisualizationRequestHandler.java | 8 +- .../EntityGrantCountRequestHandler.java | 6 +- ...pOfScienceVisualizationRequestHandler.java | 81 +++++----- ...nsForSubOrganizationsModelConstructor.java | 7 + .../PeopleToPublicationsModelConstructor.java | 7 + .../PersonToPublicationsModelConstructor.java | 7 + .../PersonGrantCountRequestHandler.java | 4 +- .../PersonGrantCountVisCodeGenerator.java | 2 +- .../PersonLevelRequestHandler.java | 2 +- .../PersonPublicationCountRequestHandler.java | 4 +- ...ersonPublicationCountVisCodeGenerator.java | 2 +- .../utilities/UtilitiesRequestHandler.java | 2 +- .../valueobjects/MapOfScienceActivity.java | 19 +++ .../valueobjects/{ => json}/JsonObject.java | 2 +- .../valueobjects/json/MapOfScience.java | 66 ++++++++ .../{ => json}/SubjectEntityJSON.java | 4 +- .../visutils/SelectOnModelUtilities.java | 153 ++++++++++++++++++ .../visutils/UtilityFunctions.java | 2 +- .../individual/IndividualTemplateModel.java | 2 +- 37 files changed, 355 insertions(+), 88 deletions(-) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/AjaxVisualizationController.java (99%) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/DataVisualizationController.java (99%) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/ShortURLVisualizationController.java (99%) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/StandardVisualizationController.java (99%) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/VisualizationFrameworkConstants.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/VisualizationInjector.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/controller/visualization/{freemarker => }/VisualizationsDependencyInjector.java (99%) create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java rename src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/{ => json}/JsonObject.java (99%) create mode 100644 src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java rename src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/{ => json}/SubjectEntityJSON.java (93%) diff --git a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml index 6e3e9b5f..4f275f63 100644 --- a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml +++ b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml @@ -40,8 +40,11 @@ + + + class="edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationInjector"> @@ -106,6 +109,10 @@ + + + + diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index 6e8c325e..bfb2f9ce 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -1235,12 +1235,12 @@ StandardVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.StandardVisualizationController + edu.cornell.mannlib.vitro.webapp.controller.visualization.StandardVisualizationController ShortURLVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.ShortURLVisualizationController + edu.cornell.mannlib.vitro.webapp.controller.visualization.ShortURLVisualizationController @@ -1263,7 +1263,7 @@ AjaxVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.AjaxVisualizationController + edu.cornell.mannlib.vitro.webapp.controller.visualization.AjaxVisualizationController @@ -1273,7 +1273,7 @@ DataVisualizationController - edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController + edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java index d9499c48..cfc9e7c2 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/AjaxVisualizationController.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.io.IOException; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java index 534536b4..b032528b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/DataVisualizationController.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.io.IOException; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java index 20652bac..204c0b9d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java index 4eeed864..d01a9e38 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/StandardVisualizationController.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import javax.servlet.ServletContext; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java index f1f69366..8289d4be 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationFrameworkConstants.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.regex.Pattern; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java index 19dd2423..afc7a557 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationInjector.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java rename to src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java index 9fe4388f..d358e196 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationsDependencyInjector.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; +package edu.cornell.mannlib.vitro.webapp.controller.visualization; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 8dc3166c..0051fb69 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -10,7 +10,7 @@ import java.util.Set; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java index e497d1fd..5030b1d8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java @@ -16,8 +16,8 @@ import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java index 27006e03..28423d1e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -14,7 +14,7 @@ import java.util.Set; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java index 9b98a9f0..c4de5630 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java @@ -27,6 +27,8 @@ public class QueryFieldLabels { public static final String DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY = "publicationYearOldLit"; public static final String DOCUMENT_PUBLICATION_YEAR_MONTH = "publicationYearMonthLit"; public static final String DOCUMENT_PUBLICATION_DATE = "publicationDateLit"; + public static final String DOCUMENT_JOURNAL_LABEL = "journalLabelLit"; + /* * Image related field labels diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index 79714a18..dfa8f7d5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -15,8 +15,8 @@ import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java index 666c9337..00d5c890 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java @@ -10,7 +10,7 @@ import java.util.Set; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java index 10370ad1..73c38f47 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -14,7 +14,7 @@ import java.util.Set; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java index 276bda1f..2acf7fe5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java @@ -20,13 +20,13 @@ import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java index f51e5ef8..cd0c2078 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java @@ -19,17 +19,17 @@ import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java index 36cf0d1c..25cb695a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java @@ -19,17 +19,17 @@ import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java index ad2d4005..9006c401 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java @@ -20,14 +20,14 @@ import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index 454c465b..b4b2a00c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -19,17 +19,19 @@ import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.MapOfScienceActivity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; @@ -265,7 +267,7 @@ public class MapOfScienceVisualizationRequestHandler implements fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream"); fileData.put(DataVisualizationController.FILE_CONTENT_KEY, - writePublicationsOverTimeJSON(vitroRequest, + writeMapOfScienceDataJSON(vitroRequest, entity)); return fileData; } @@ -295,58 +297,53 @@ public class MapOfScienceVisualizationRequestHandler implements * @param subentities * @param subOrganizationTypesResult */ - private String writePublicationsOverTimeJSON(VitroRequest vreq, - Entity subjectEntity) { + private String writeMapOfScienceDataJSON(VitroRequest vreq, + Entity subjectEntity) { Gson json = new Gson(); - Set subEntitiesJson = new HashSet(); + Set jsonContent = new HashSet(); for (SubEntity subentity : subjectEntity.getSubEntities()) { - JsonObject entityJson = new JsonObject( - subentity.getIndividualLabel()); - - List> yearPubCount = new ArrayList>(); - - for (Map.Entry pubEntry : UtilityFunctions - .getYearToActivityCount(subentity.getActivities()) - .entrySet()) { - - List currentPubYear = new ArrayList(); - if (pubEntry.getKey().equals(VOConstants.DEFAULT_PUBLICATION_YEAR)) { - currentPubYear.add(-1); - } else { - currentPubYear.add(Integer.parseInt(pubEntry.getKey())); - } - - currentPubYear.add(pubEntry.getValue()); - yearPubCount.add(currentPubYear); - } + MapOfScience entityJson = new MapOfScience(subentity.getIndividualURI()); - entityJson.setYearToActivityCount(yearPubCount); - - entityJson.setOrganizationTypes(subentity.getEntityTypeLabels()); - - entityJson.setEntityURI(subentity.getIndividualURI()); + entityJson.setLabel(subentity.getIndividualLabel()); entityJson.setLastCachedAtDateTime(subentity.getLastCachedAtDateTime()); if (subentity.getEntityClass().equals(VOConstants.EntityClassType.PERSON)) { - entityJson.setVisMode("PERSON"); + entityJson.setType("PERSON"); } else if (subentity.getEntityClass().equals(VOConstants.EntityClassType.ORGANIZATION)) { - entityJson.setVisMode("ORGANIZATION"); + entityJson.setType("ORGANIZATION"); } - subEntitiesJson.add(entityJson); + + Map journalToPublicationCount = new HashMap(); + int i = 0; + for (Activity activity : subentity.getActivities()) { + System.out.println(i); + System.out.println(activity.getActivityURI()); + System.out.println("------"); + + String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal().trim(); + + if (journalToPublicationCount.containsKey(journalName)) { + + journalToPublicationCount.put(journalName, + journalToPublicationCount.get(journalName) + 1); + } else { + + journalToPublicationCount.put(journalName, 1); + } + i++; + } + + entityJson.setSubdisciplineActivity(journalToPublicationCount); + + jsonContent.add(entityJson); } - SubjectEntityJSON subjectEntityJSON = new SubjectEntityJSON(subjectEntity.getEntityLabel(), - subjectEntity.getEntityURI(), - subjectEntity.getParents()); - - subEntitiesJson.add(subjectEntityJSON); - - return json.toJson(subEntitiesJson); + return json.toJson(jsonContent); } private String getEntityPublicationsPerYearCSVContent(Entity entity) { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java index 25344e72..81082cb1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java @@ -47,6 +47,8 @@ public class OrganizationToPublicationsForSubOrganizationsModelConstructor imple + " ?Document rdfs:label ?DocumentLabel . " + " ?Document core:dateTimeValue ?dateTimeValue . " + " ?dateTimeValue core:dateTime ?publicationDate . " + + " ?Document core:hasPublicationVenue ?journal ." + + " ?journal rdfs:label ?journalLabel . " + " } " + " WHERE { " + " <" + organizationURI + "> rdfs:label ?organizationLabel . " @@ -62,6 +64,11 @@ public class OrganizationToPublicationsForSubOrganizationsModelConstructor imple + " ?dateTimeValue core:dateTime ?publicationDate . " + " } " + " " + + " OPTIONAL { " + + " ?Document core:hasPublicationVenue ?journal ." + + " ?journal rdfs:label ?journalLabel . " + + " } " + + " " + " LET(?now := afn:now()) " + " } "; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java index bf87900b..d716054d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java @@ -43,6 +43,8 @@ public class PeopleToPublicationsModelConstructor implements ModelConstructor { + " ?Document rdfs:label ?DocumentLabel . " + " ?Document core:dateTimeValue ?dateTimeValue . " + " ?dateTimeValue core:dateTime ?publicationDate . " + + " ?Document core:hasPublicationVenue ?journal ." + + " ?journal rdfs:label ?journalLabel . " + " } " + " WHERE { " + " ?person core:authorInAuthorship ?Resource . " @@ -54,6 +56,11 @@ public class PeopleToPublicationsModelConstructor implements ModelConstructor { + " ?dateTimeValue core:dateTime ?publicationDate . " + " } " + " " + + " OPTIONAL { " + + " ?Document core:hasPublicationVenue ?journal ." + + " ?journal rdfs:label ?journalLabel . " + + " } " + + " " + " LET(?now := afn:now()) " + " } "; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java index 19818ee1..fcfbbd29 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java @@ -46,6 +46,8 @@ public class PersonToPublicationsModelConstructor implements ModelConstructor { + " ?Document rdfs:label ?DocumentLabel . " + " ?Document core:dateTimeValue ?dateTimeValue . " + " ?dateTimeValue core:dateTime ?publicationDate . " + + " ?Document core:hasPublicationVenue ?journal ." + + " ?journal rdfs:label ?journalLabel . " + " } " + " WHERE { " + " <" + personURI + "> core:authorInAuthorship ?Resource . " @@ -57,6 +59,11 @@ public class PersonToPublicationsModelConstructor implements ModelConstructor { + " ?dateTimeValue core:dateTime ?publicationDate . " + " } " + " " + + " OPTIONAL { " + + " ?Document core:hasPublicationVenue ?journal ." + + " ?journal rdfs:label ?journalLabel . " + + " } " + + " " + " LET(?now := afn:now()) " + " } "; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java index 15cd9b8b..b491ffff 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java @@ -16,8 +16,8 @@ import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java index 4d4ed129..9afbdb05 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -13,7 +13,7 @@ import java.util.Set; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; 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 c12417be..a81ae922 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -15,7 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipQueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipVisCodeGenerator; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java index ed75910b..c6d3fc7f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java @@ -16,8 +16,8 @@ import com.hp.hpl.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizationController; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java index bc1d70f5..46d6af8e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -13,7 +13,7 @@ import java.util.Set; import org.apache.commons.logging.Log; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java index 9c2da768..95572651 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java new file mode 100644 index 00000000..b66d3d8f --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java @@ -0,0 +1,19 @@ +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; + +public class MapOfScienceActivity extends Activity { + + private String publishedInJournal = "NONE"; + + public MapOfScienceActivity(String activityURI) { + super(activityURI); + } + + public void setPublishedInJournal(String publishedInJournal) { + this.publishedInJournal = publishedInJournal; + } + + public String getPublishedInJournal() { + return publishedInJournal; + } + +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java index 017dabe6..ee00ab7a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/JsonObject.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java new file mode 100644 index 00000000..d4d8e720 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java @@ -0,0 +1,66 @@ +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; + +import java.util.HashMap; +import java.util.Map; + +public class MapOfScience { + + private String uri; + private String label; + private String type; + private int pubsMapped; + private int pubsUnmapped; + private String lastCachedAtDateTime; + private Map subdisciplineActivity = new HashMap(); + + public MapOfScience(String uri) { + this.uri = uri; + } + + public void setType(String type) { + this.type = type; + } + public String getType() { + return type; + } + public void setUri(String uri) { + this.uri = uri; + } + public String getUri() { + return uri; + } + + public void setLabel(String label) { + this.label = label; + } + public String getLabel() { + return label; + } + public void setPubsMapped(int pubsMapped) { + this.pubsMapped = pubsMapped; + } + public int getPubsMapped() { + return pubsMapped; + } + public void setPubsUnmapped(int pubsUnmapped) { + this.pubsUnmapped = pubsUnmapped; + } + public int getPubsUnmapped() { + return pubsUnmapped; + } + public void setSubdisciplineActivity(Map subdisciplineActivity) { + this.subdisciplineActivity = subdisciplineActivity; + } + public Map getSubdisciplineActivity() { + return subdisciplineActivity; + } + + public void setLastCachedAtDateTime(String lastCachedAtDateTime) { + this.lastCachedAtDateTime = lastCachedAtDateTime; + } + + public String getLastCachedAtDateTime() { + return lastCachedAtDateTime; + } + +} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java index e3bcd6fb..2c0e5a08 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/SubjectEntityJSON.java @@ -1,10 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; import java.util.HashMap; import java.util.Map; import java.util.Set; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; + public class SubjectEntityJSON { private String subjectEntityLabel; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java index 53501679..8738f8ad 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java @@ -29,6 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.SubOrgani import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.MapOfScienceActivity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; public class SelectOnModelUtilities { @@ -317,6 +318,58 @@ public class SelectOnModelUtilities { return allDocumentURIToVOs; } + public static Map getPublicationsWithJournalForAllSubOrganizations( + Dataset dataset, Entity organizationEntity) + throws MalformedQueryParametersException { + Map allDocumentURIToVOs = new HashMap(); + + for (SubEntity subOrganization : organizationEntity.getSubEntities()) { + + Model subOrganizationPublicationsModel = ModelConstructorUtilities + .getOrConstructModel( + subOrganization.getIndividualURI(), + OrganizationToPublicationsForSubOrganizationsModelConstructor.MODEL_TYPE, + dataset); + +// System.out.println("getting publications for " + subOrganization.getIndividualLabel()); + + Map fieldLabelToOutputFieldLabel = new HashMap(); + fieldLabelToOutputFieldLabel.put("document", QueryFieldLabels.DOCUMENT_URL); + fieldLabelToOutputFieldLabel.put("documentLabel", QueryFieldLabels.DOCUMENT_LABEL); + fieldLabelToOutputFieldLabel.put("documentPublicationDate", QueryFieldLabels.DOCUMENT_PUBLICATION_DATE); + fieldLabelToOutputFieldLabel.put("journalLabel", QueryFieldLabels.DOCUMENT_JOURNAL_LABEL); + + String whereClause = "" + + " <" + subOrganization.getIndividualURI() + "> vivosocnet:hasPersonWithPublication ?document . " + + " ?document rdfs:label ?documentLabel . " + + " OPTIONAL { " + + " ?document core:dateTimeValue ?dateTimeValue . " + + " ?dateTimeValue core:dateTime ?documentPublicationDate } . " + + " OPTIONAL { " + + " ?document core:hasPublicationVenue ?journal . " + + " ?journal rdfs:label ?journalLabel . } "; + + QueryRunner subOrganizationPublicationsQuery = + new GenericQueryRunnerOnModel(fieldLabelToOutputFieldLabel, + "", + whereClause, + "", + subOrganizationPublicationsModel); + + getPublicationWithJournalForEntity(subOrganizationPublicationsQuery.getQueryResult(), + subOrganization, + allDocumentURIToVOs); + + String lastCachedAtForEntity = getLastCachedAtDateTimeForEntityInModel( + subOrganization, + subOrganizationPublicationsModel); + + subOrganization.setLastCachedAtDateTime(lastCachedAtForEntity); + + } + return allDocumentURIToVOs; + } + private static void getPublicationForEntity( ResultSet queryResult, SubEntity subEntity, Map allDocumentURIToVOs) { @@ -357,6 +410,54 @@ public class SelectOnModelUtilities { subEntity.addActivities(currentEntityPublications); } + private static void getPublicationWithJournalForEntity( + ResultSet queryResult, + SubEntity subEntity, + Map allDocumentURIToVOs) { + + Set currentEntityPublications = new HashSet(); + + while (queryResult.hasNext()) { + + QuerySolution solution = queryResult.nextSolution(); + + if (StringUtils.isEmpty(subEntity.getLastCachedAtDateTime())) { + + RDFNode lastCachedAtNode = solution.get(QueryFieldLabels.LAST_CACHED_AT_DATETIME); + if (lastCachedAtNode != null) { + subEntity.setLastCachedAtDateTime(lastCachedAtNode.toString()); + } + } + + RDFNode documentNode = solution.get(QueryFieldLabels.DOCUMENT_URL); + Activity biboDocument; + + if (allDocumentURIToVOs.containsKey(documentNode.toString())) { + biboDocument = allDocumentURIToVOs.get(documentNode.toString()); + + } else { + + biboDocument = new MapOfScienceActivity(documentNode.toString()); + allDocumentURIToVOs.put(documentNode.toString(), biboDocument); + + RDFNode publicationDateNode = solution.get(QueryFieldLabels + .DOCUMENT_PUBLICATION_DATE); + if (publicationDateNode != null) { + biboDocument.setActivityDate(publicationDateNode.toString()); + } + + RDFNode publicationJournalNode = solution.get(QueryFieldLabels + .DOCUMENT_JOURNAL_LABEL); + + if (publicationJournalNode != null) { + ((MapOfScienceActivity) biboDocument).setPublishedInJournal(publicationJournalNode.toString()); + } + } + currentEntityPublications.add(biboDocument); + } + subEntity.addActivities(currentEntityPublications); + } + public static String getLastCachedAtForEntity(ResultSet queryResult) { String lastCachedAtDateTime = null; @@ -638,5 +739,57 @@ public class SelectOnModelUtilities { } return allDocumentURIToVOs; } + + public static Map getPublicationsWithJournalForAssociatedPeople( + Dataset dataset, Collection people) + throws MalformedQueryParametersException { + Map allDocumentURIToVOs = new HashMap(); + + Model peoplePublicationsModel = ModelConstructorUtilities + .getOrConstructModel( + null, + PeopleToPublicationsModelConstructor.MODEL_TYPE, + dataset); + + for (SubEntity person : people) { + +// System.out.println("getting publications for " + person.getIndividualLabel()); + + Map fieldLabelToOutputFieldLabel = new HashMap(); + fieldLabelToOutputFieldLabel.put("document", QueryFieldLabels.DOCUMENT_URL); + fieldLabelToOutputFieldLabel.put("documentLabel", QueryFieldLabels.DOCUMENT_LABEL); + fieldLabelToOutputFieldLabel.put("documentPublicationDate", QueryFieldLabels.DOCUMENT_PUBLICATION_DATE); + fieldLabelToOutputFieldLabel.put("journalLabel", QueryFieldLabels.DOCUMENT_JOURNAL_LABEL); + + String whereClause = "" + + " <" + person.getIndividualURI() + "> vivosocnet:hasPublication ?document . " + + " ?document rdfs:label ?documentLabel . " + + " OPTIONAL { " + + " ?document core:dateTimeValue ?dateTimeValue . " + + " ?dateTimeValue core:dateTime ?documentPublicationDate } . " + + " OPTIONAL { " + + " ?document core:hasPublicationVenue ?journal . " + + " ?journal rdfs:label ?journalLabel . } "; + + QueryRunner personPublicationsQuery = + new GenericQueryRunnerOnModel(fieldLabelToOutputFieldLabel, + "", + whereClause, + "", + peoplePublicationsModel); + + getPublicationWithJournalForEntity(personPublicationsQuery.getQueryResult(), + person, + allDocumentURIToVOs); + + String lastCachedAtForEntity = getLastCachedAtDateTimeForEntityInModel( + person, + peoplePublicationsModel); + + person.setLastCachedAtDateTime(lastCachedAtForEntity); + + } + return allDocumentURIToVOs; + } } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java index 00df4df7..4a555817 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java index f4e85460..4b02eb18 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java +++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java @@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class IndividualTemplateModel extends BaseIndividualTemplateModel { From f812185dad290d65a531c1e34f7474ddba38678c Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 12 May 2011 21:13:00 +0000 Subject: [PATCH 09/16] 1. Fix for license text missing. --- .../mapofscience/MapOfScienceVisualizationRequestHandler.java | 1 + .../webapp/visualization/valueobjects/MapOfScienceActivity.java | 1 + .../webapp/visualization/valueobjects/json/MapOfScience.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index b4b2a00c..d88702cd 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -323,6 +323,7 @@ public class MapOfScienceVisualizationRequestHandler implements for (Activity activity : subentity.getActivities()) { System.out.println(i); System.out.println(activity.getActivityURI()); + System.out.println(activity.getClass()); System.out.println("------"); String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal().trim(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java index b66d3d8f..f9705d9a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; public class MapOfScienceActivity extends Activity { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java index d4d8e720..b181f414 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/json/MapOfScience.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json; import java.util.HashMap; From f0cae04b19dff949c835d29b08d1672551db6180 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 12 May 2011 21:28:47 +0000 Subject: [PATCH 10/16] 1. Fix for misbehaving VOs for science maps vis. --- .../mapofscience/MapOfScienceVisualizationRequestHandler.java | 4 ++-- .../webapp/visualization/visutils/SelectOnModelUtilities.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index d88702cd..d02f09eb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -106,7 +106,7 @@ public class MapOfScienceVisualizationRequestHandler implements Map documentURIForAssociatedPeopleTOVO = new HashMap(); Map allDocumentURIToVOs = new HashMap(); - allDocumentURIToVOs = SelectOnModelUtilities.getPublicationsForAllSubOrganizations(dataset, organizationEntity); + allDocumentURIToVOs = SelectOnModelUtilities.getPublicationsWithJournalForAllSubOrganizations(dataset, organizationEntity); Entity organizationWithAssociatedPeople = SelectOnModelUtilities .getSubjectOrganizationAssociatedPeople(dataset, subjectEntityURI); @@ -114,7 +114,7 @@ public class MapOfScienceVisualizationRequestHandler implements if (organizationWithAssociatedPeople.getSubEntities() != null) { documentURIForAssociatedPeopleTOVO = SelectOnModelUtilities - .getPublicationsForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities()); + .getPublicationsWithJournalForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities()); organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI( organizationEntity, diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java index 8738f8ad..622b8d90 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java @@ -454,6 +454,8 @@ public class SelectOnModelUtilities { } } currentEntityPublications.add(biboDocument); + + System.out.println(biboDocument.getClass() + " -- " + ((MapOfScienceActivity) biboDocument).getPublishedInJournal()); } subEntity.addActivities(currentEntityPublications); } From f4d89253a8e040439ac08341c3c755ad8490cb8a Mon Sep 17 00:00:00 2001 From: ryounes Date: Thu, 12 May 2011 21:36:28 +0000 Subject: [PATCH 11/16] NIHVIVO-2458, NIHVIVO-2459 Add commented-out servlet definitions of new solr-based servlets for autocomplete and json data services. --- productMods/WEB-INF/web.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index bfb2f9ce..ca277695 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -954,6 +954,12 @@ AutocompleteController edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController + AutocompleteController /autocomplete @@ -1003,6 +1009,12 @@ JSON Service edu.cornell.mannlib.vitro.webapp.controller.JSONServlet + JSON Service /dataservice From 0e3ccec947038adf8c0b563e4916dbc97d70d514 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 12 May 2011 22:19:58 +0000 Subject: [PATCH 12/16] 1. Improved the json response structure for the scimaps vis. --- ...pOfScienceVisualizationRequestHandler.java | 37 +++++++++++-------- .../valueobjects/MapOfScienceActivity.java | 2 +- .../visutils/SelectOnModelUtilities.java | 1 - 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index d02f09eb..74df403b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -2,10 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; @@ -29,9 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.MapOfScienceActivity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; @@ -319,26 +315,35 @@ public class MapOfScienceVisualizationRequestHandler implements Map journalToPublicationCount = new HashMap(); - int i = 0; + + int mappedPublicationCount = 0; + int unMappedPublicationCount = 0; + for (Activity activity : subentity.getActivities()) { - System.out.println(i); - System.out.println(activity.getActivityURI()); - System.out.println(activity.getClass()); - System.out.println("------"); - String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal().trim(); - - if (journalToPublicationCount.containsKey(journalName)) { + if (StringUtils.isNotBlank(((MapOfScienceActivity) activity).getPublishedInJournal())) { + + String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal(); + if (journalToPublicationCount.containsKey(journalName)) { + + journalToPublicationCount.put(journalName, + journalToPublicationCount.get(journalName) + 1); + } else { + + journalToPublicationCount.put(journalName, 1); + } + + mappedPublicationCount++; - journalToPublicationCount.put(journalName, - journalToPublicationCount.get(journalName) + 1); } else { - journalToPublicationCount.put(journalName, 1); + unMappedPublicationCount++; } - i++; + } + entityJson.setPubsMapped(mappedPublicationCount); + entityJson.setPubsUnmapped(unMappedPublicationCount); entityJson.setSubdisciplineActivity(journalToPublicationCount); jsonContent.add(entityJson); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java index f9705d9a..e65c7654 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java @@ -3,7 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; public class MapOfScienceActivity extends Activity { - private String publishedInJournal = "NONE"; + private String publishedInJournal; public MapOfScienceActivity(String activityURI) { super(activityURI); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java index 622b8d90..cbc6e297 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java @@ -455,7 +455,6 @@ public class SelectOnModelUtilities { } currentEntityPublications.add(biboDocument); - System.out.println(biboDocument.getClass() + " -- " + ((MapOfScienceActivity) biboDocument).getPublishedInJournal()); } subEntity.addActivities(currentEntityPublications); } From ddae764181f7a814d88f6aefe3152f8b9059d782 Mon Sep 17 00:00:00 2001 From: tankchintan Date: Fri, 13 May 2011 14:07:52 +0000 Subject: [PATCH 13/16] 1. Testing new svn credentials. --- .../mapofscience/MapOfScienceVisualizationRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index 74df403b..fd4f3734 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -340,7 +340,7 @@ public class MapOfScienceVisualizationRequestHandler implements unMappedPublicationCount++; } - } + } entityJson.setPubsMapped(mappedPublicationCount); entityJson.setPubsUnmapped(unMappedPublicationCount); From da42c915c640de38c6ec1e6fd0a6b67c48950b3c Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 13 May 2011 16:30:39 +0000 Subject: [PATCH 14/16] NIHVIVO-2299 Remove old unused identifier factories: SelfEditing2RoleIdentifierFactory and UserToIndIdentifierFactory --- productMods/WEB-INF/web.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index ca277695..3b1974f8 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -162,12 +162,6 @@ edu.cornell.mannlib.vitro.webapp.auth.policy.setup.SelfEditingPolicySetup - - - edu.cornell.mannlib.vitro.webapp.auth.identifier.UserToIndIdentifierFactorySetup - - - edu.cornell.mannlib.vitro.webapp.auth.policy.setup.EditorEditingPolicySetup From bcdc7ee9810d1f4b488af25c0b99fe88ab340c9f Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 17 May 2011 18:11:31 +0000 Subject: [PATCH 15/16] VIVO-304 clean up old login-related files. --- productMods/selfEditIntro.jsp | 43 ----------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 productMods/selfEditIntro.jsp diff --git a/productMods/selfEditIntro.jsp b/productMods/selfEditIntro.jsp deleted file mode 100644 index e77ab470..00000000 --- a/productMods/selfEditIntro.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page errorPage="/error.jsp"%> -<%@ page contentType="text/html; charset=UTF-8"%> - - - - - - - " media="screen"/> - - - Edit Your Profile - - - -
    - -
    - -
    -
    - If you are a member of the Cornell community and would like to edit you profile - in the Vivo system please login using your netId. -
    -
    - - -
    - -
    - -
    - -
    - - From 09daaa58ac8000c6b19892e9cf91d26d8a7598db Mon Sep 17 00:00:00 2001 From: mbarbier Date: Tue, 17 May 2011 20:57:54 +0000 Subject: [PATCH 16/16] testfile.ftl and TestFileController.java: modifications for calling a script instead of directly calling Harvester --- .../freemarker/body/harvester/testfile.ftl | 344 +++----------- .../harvester/TestFileController.java | 435 +++++++++++------- 2 files changed, 315 insertions(+), 464 deletions(-) diff --git a/productMods/templates/freemarker/body/harvester/testfile.ftl b/productMods/templates/freemarker/body/harvester/testfile.ftl index 03082f87..399b39d2 100644 --- a/productMods/templates/freemarker/body/harvester/testfile.ftl +++ b/productMods/templates/freemarker/body/harvester/testfile.ftl @@ -1,35 +1,64 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->