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

NIHVIVO-1554 Removed controllers and jsps that have been superceded by Freemarker controllers and templates

Browse source
This commit is contained in:
rjy7 2011-03-04 19:24:31 +00:00
parent e14b399147
commit 30dd807f8e
2 changed files with 1 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -198,9 +198,7 @@
--> -->
<!-- vivo specific --> <!-- vivo specific -->
<listener>
<listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.VivoMergedListFilteringSetup</listener-class>
</listener>
<!-- Filters ********************************************************** --> <!-- Filters ********************************************************** -->
<!-- in 2.4 spec, filter chain order is first by filter-mapping <url-pattern> order in web.xml, <!-- in 2.4 spec, filter chain order is first by filter-mapping <url-pattern> order in web.xml,
@ -1166,29 +1164,6 @@
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.MailUsersServlet</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.MailUsersServlet</servlet-class>
<load-on-startup>5</load-on-startup> <load-on-startup>5</load-on-startup>
</servlet> </servlet>
<!--
<servlet>
<servlet-name>entity</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>entity</servlet-name>
<url-pattern>/entityold</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>entity</servlet-name>
<url-pattern>/entityold/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>entity</servlet-name>
<url-pattern>/individualold/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>entity</servlet-name>
<url-pattern>/displayold/*</url-pattern>
</servlet-mapping>
-->
<servlet> <servlet>
<servlet-name>ontology</servlet-name> <servlet-name>ontology</servlet-name>

116
src/edu/cornell/mannlib/vitro/webapp/servlet/setup/VivoMergedListFilteringSetup.java
View file

@ -1,116 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.servlet.setup;
import javax.servlet.ServletContextEvent;
import net.sf.jga.fn.UnaryFunctor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.joda.time.DateTime;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.IndividualFiltering;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFiltersImpl;
/**
* This adds an object to the servlet context that will be used by
* EntityMergedPropertiesListController to convert the individual that
* is specified by the URI of the request to an individual that is filtered.
* The object is a function from an Individual to an Individual. The original
* Individual is wrapped in an object that will filter out any object property statements
* to Individuals of core:Position whos date is in the past.
*
* This is related to http://issues.library.cornell.edu/browse/NIHVIVO-984
*
* @author bdc34
*
*/
public class VivoMergedListFilteringSetup implements javax.servlet.ServletContextListener {
private static final Log log = LogFactory.getLog(VivoMergedListFilteringSetup.class);
@Override
public void contextDestroyed(ServletContextEvent arg0) {
}
@Override
public void contextInitialized(ServletContextEvent arg0) {
log.info("Setting up Vivo Merged List Filtering.");
UnaryFunctor<Individual,Individual> fn = new UnaryFunctor<Individual,Individual>(){
@Override
public Individual fn(Individual subject) {
if( subject != null && subject.isVClass("http://xmlns.com/foaf/0.1/Organization")){
return new IndividualFiltering(subject, new VitroFiltersImpl(){
// @Override
// public UnaryFunctor<Individual, Boolean> getIndividualFilter(){
// return new UnaryFunctor<Individual,Boolean>(){
// @Override
// public Boolean fn(Individual arg) {
// return ! isPast(arg);
// }
// };
// }
/**
* This returns true if we should keep the statement, false if we should get rid of the statement
*/
@Override
public UnaryFunctor<ObjectPropertyStatement, Boolean> getObjectPropertyStatementFilter(){
return new UnaryFunctor<ObjectPropertyStatement,Boolean>(){
@Override
public Boolean fn(ObjectPropertyStatement arg) {
if( "http://vivoweb.org/ontology/core#organizationForPosition".equals(arg.getPropertyURI())){
return ! positionInPast(arg.getObject());
}else{
return true;
}
}
};
}
});
}else{
return subject;
}
}
};
EntityMergedPropertyListController.setMergedPropertyListFilter(fn, arg0.getServletContext());
}
private boolean positionInPast(Individual ind){
if( ind.isVClass( "http://vivoweb.org/ontology/core#Position" ) ){
//positionShortView.jsp does not check core:endDate
// for(DataPropertyStatement stmt : ind.getDataPropertyStatements("http://vivoweb.org/ontology/core#endDate")){
// DateTime end = new DateTime( stmt.getData() );
// if( end.isBeforeNow() )
// return true;
// }
for(DataPropertyStatement stmt : ind.getDataPropertyStatements("http://vivoweb.org/ontology/core#endYear")){
int endYear = Integer.MAX_VALUE;
try{
endYear = Integer.parseInt(stmt.getData());
}catch(NumberFormatException nfe){
log.warn("Could not parse year: " + stmt.getData());
}
int nowYear = (new DateTime()).getYear();
//This should use the same logic as positionShortView.jsp
return nowYear > endYear;
}
}
return false;
}
}