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

Removed Portal class and almost everything related to portals and flags for NIHVIVO-2248

Browse source
This commit is contained in:
brianjlowe 2011-05-03 19:02:44 +00:00
parent 29750c378f
commit 7992ab1a4b
11 changed files with 5 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
productMods/WEB-INF/web.xml
View file

@ -251,15 +251,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>Portal Picker Filter</filter-name>
<filter-class>edu.cornell.mannlib.vitro.webapp.filters.PortalPickerFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>Portal Picker Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>WebappDaoFactorySDBPrep</filter-name>
<filter-class>edu.cornell.mannlib.vitro.webapp.filters.WebappDaoFactorySDBPrep</filter-class>
@ -847,15 +838,6 @@
<url-pattern>/addRestriction</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>PortalsListingController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PortalsListingController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>PortalsListingController</servlet-name>
<url-pattern>/listPortals</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>UsersListingController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.UsersListingController</servlet-class>

7
productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -8,16 +8,9 @@
<h3>Site Configuration</h3>
<ul>
<#if siteConfig.urls.portals??>
<#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
</#if>
<li><a href="${siteConfig.urls.portals}">List all portals</a></li>
<#else>
<#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
</#if>
</#if>
<#if siteConfig.urls.menuN3Editor??>
<#if currentTheme != "vivo-basic"> <#-- vivo-basic doesn't support menu pages -->

3
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
View file

@ -17,7 +17,6 @@ import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -250,7 +249,6 @@ public class EntityPublicationCountRequestHandler implements
private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
String entityURI) {
Portal portal = vreq.getPortal();
String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl";
String organizationLabel = EntityComparisonUtilityFunctions
@ -258,7 +256,6 @@ public class EntityPublicationCountRequestHandler implements
entityURI);
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));

3
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java
View file

@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -282,14 +281,12 @@ public class TemporalGrantVisualizationRequestHandler implements
private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
String entityURI) {
Portal portal = vreq.getPortal();
String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl";
String organizationLabel = EntityComparisonUtilityFunctions.getEntityLabelFromDAO(vreq,
entityURI);
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));

3
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java
View file

@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -273,7 +272,6 @@ public class TemporalPublicationVisualizationRequestHandler implements
private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
String entityURI) {
Portal portal = vreq.getPortal();
String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl";
String organizationLabel = EntityComparisonUtilityFunctions
@ -281,7 +279,6 @@ public class TemporalPublicationVisualizationRequestHandler implements
entityURI);
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));

3
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java
View file

@ -17,7 +17,6 @@ import com.google.gson.Gson;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -249,14 +248,12 @@ public class EntityGrantCountRequestHandler implements
private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
String entityURI) {
Portal portal = vreq.getPortal();
String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl";
String organizationLabel = EntityComparisonUtilityFunctions.getEntityLabelFromDAO(vreq,
entityURI);
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("title", organizationLabel + " - Temporal Graph Visualization");
body.put("organizationURI", entityURI);
body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));

12
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
View file

@ -13,19 +13,18 @@ import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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.VisualizationFrameworkConstants;
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.freemarker.visutils.QueryRunner;
/**
@ -245,12 +244,9 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
SparklineData valueObjectContainer) {
Portal portal = vreq.getPortal();
String standaloneTemplate = "personGrantCountStandaloneActivator.ftl";
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("title", "Individual Grant Count visualization");
body.put("sparklineVO", valueObjectContainer);
@ -271,13 +267,9 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
SparklineData valueObjectContainer,
boolean shouldVIVOrenderVis) {
Portal portal = vreq.getPortal();
String dynamicTemplate = "personGrantCountDynamicActivator.ftl";
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("sparklineVO", valueObjectContainer);
body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);

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

@ -11,7 +11,6 @@ import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -230,7 +229,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
Map<String, Object> body = new HashMap<String, Object>();
Portal portal = vitroRequest.getPortal();
String standaloneTemplate = "coAuthorPersonLevel.ftl";
body.put("egoURIParam", egoURI);
@ -253,7 +251,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
body.put("egoPubSparklineVO", egoPubSparklineVO);
body.put("uniqueCoauthorsSparklineVO", uniqueCoauthorsSparklineVO);
body.put("portalBean", portal);
body.put("title", title + "Person Level Visualization");
return new TemplateResponseValues(standaloneTemplate, body);
@ -269,8 +266,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
Map<String, Object> body = new HashMap<String, Object>();
Portal portal = vitroRequest.getPortal();
body.put("egoURIParam", egoURI);
body.put("egoLocalName", UtilityFunctions.getIndividualLocalName(egoURI, vitroRequest));
@ -291,7 +286,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
body.put("egoGrantSparklineVO", egoGrantSparklineVO);
body.put("uniqueCoInvestigatorsSparklineVO", uniqueCopisSparklineVO);
body.put("portalBean", portal);
body.put("title", title + "Person Level Visualization");
return new TemplateResponseValues(standaloneTemplate, body);

7
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
View file

@ -13,7 +13,6 @@ import org.apache.commons.logging.Log;
import com.hp.hpl.jena.query.Dataset;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -253,12 +252,9 @@ VisualizationRequestHandler {
private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
SparklineData valueObjectContainer) {
Portal portal = vreq.getPortal();
String standaloneTemplate = "personPublicationCountStandaloneActivator.ftl";
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("title", "Individual Publication Count visualization");
body.put("sparklineVO", valueObjectContainer);
@ -278,12 +274,9 @@ VisualizationRequestHandler {
private TemplateResponseValues prepareDynamicResponse(VitroRequest vreq,
SparklineData valueObjectContainer, boolean shouldVIVOrenderVis) {
Portal portal = vreq.getPortal();
String dynamicTemplate = "personPublicationCountDynamicActivator.ftl";
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("sparklineVO", valueObjectContainer);
body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);

4
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java
View file

@ -19,7 +19,6 @@ import org.joda.time.format.DateTimeFormatter;
import com.google.gson.Gson;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
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;
@ -132,10 +131,7 @@ public class UtilityFunctions {
String errorMessage,
VitroRequest vitroRequest) {
Portal portal = vitroRequest.getPortal();
Map<String, Object> body = new HashMap<String, Object>();
body.put("portalBean", portal);
body.put("error", errorMessage);
body.put("title", errorPageTitle);

10
themes/vivo-basic/templates/menu.ftl
View file

@ -17,16 +17,6 @@
<div id="searchBlock">
<form id="searchForm" action="${urls.search}" >
<label for="search">Search </label>
<#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>
<input type="hidden" name="flag1" value="${portalId}" />
</#if>
<input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
<input class="search-form-submit" name="submit" type="submit" value="Search" />
</form>