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

[VIVO-1245] Cleanup of IndividualSearchResult (add new startup listener to configure for VIVO) and new SiteAdminController

Browse source
This commit is contained in:
Graham Triggs 2016-05-24 14:34:26 +01:00
parent 4e7802d34c
commit cc0d131ff6
5 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java → api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java
View file

@ -11,10 +11,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler;
public class SiteAdminController extends BaseSiteAdminController {
public class VIVOSiteAdminController extends BaseSiteAdminController {
private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(SiteAdminController.class);
private static final Log log = LogFactory.getLog(VIVOSiteAdminController.class);
@Override
protected Map<String, Object> getSiteMaintenanceUrls(VitroRequest vreq) {

9
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java → api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
View file

@ -13,8 +13,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
public class IndividualSearchResult extends BaseIndividualSearchResult {
private static final Log log = LogFactory.getLog(IndividualSearchResult.class);
public class VIVOIndividualSearchResult extends IndividualSearchResult {
private static final Log log = LogFactory.getLog(VIVOIndividualSearchResult.class);
private static String VCARD_DATA_QUERY = ""
+ "PREFIX obo: <http://purl.obolibrary.org/obo/> \n"
@ -33,7 +33,7 @@ public class IndividualSearchResult extends BaseIndividualSearchResult {
private String email = "";
private String title = "";
public IndividualSearchResult(Individual individual, VitroRequest vreq) {
public VIVOIndividualSearchResult(Individual individual, VitroRequest vreq) {
super(individual, vreq);
log.debug("Called Individual Search Result");
findVcardInfo();
@ -71,4 +71,7 @@ public class IndividualSearchResult extends BaseIndividualSearchResult {
return email;
}
public static void register() {
IndividualSearchResult.registerResultClass(VIVOIndividualSearchResult.class);
}
}

18
api/src/main/java/org/vivoweb/webapp/startup/SearchResultTemplateModelSetup.java Normal file
View file

@ -0,0 +1,18 @@
package org.vivoweb.webapp.startup;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
public class SearchResultTemplateModelSetup implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent servletContextEvent) {
VIVOIndividualSearchResult.register();
}
@Override
public void contextDestroyed(ServletContextEvent servletContextEvent) {
}
}