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

1. Refactored code to use the vis services provided via dependency injection method.

Browse source
This commit is contained in:
cdtank 2010-07-29 21:37:14 +00:00
parent e22b5d7d23
commit 636ab2bf65
2 changed files with 21 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationController.java
View file

@ -56,11 +56,7 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipRequestHandler; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.collegepubcount.CollegePublicationCountRequestHandler;
import edu.cornell.mannlib.vitro.webapp.visualization.personlevel.PersonLevelRequestHandler;
import edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountRequestHandler;
import edu.cornell.mannlib.vitro.webapp.visualization.utilities.UtilitiesRequestHandler;
import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
/** /**
@ -112,7 +108,7 @@ public class VisualizationController extends BaseEditController {
.getRealPath("/WEB-INF/visualization/visualizations-beans-injection.xml"); .getRealPath("/WEB-INF/visualization/visualizations-beans-injection.xml");
ApplicationContext context = new ClassPathXmlApplicationContext( ApplicationContext context = new ClassPathXmlApplicationContext(
resourcePath); "file:" + resourcePath);
BeanFactory factory = context; BeanFactory factory = context;
@ -122,9 +118,7 @@ public class VisualizationController extends BaseEditController {
visualizationIDsToClass = visualizationInjector.getVisualizationIDToClass(); visualizationIDsToClass = visualizationInjector.getVisualizationIDToClass();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
System.out.println(e);
} }
} }
@ -146,34 +140,9 @@ public class VisualizationController extends BaseEditController {
String visTypeURLHandle = vreq.getParameter(VIS_TYPE_URL_HANDLE); String visTypeURLHandle = vreq.getParameter(VIS_TYPE_URL_HANDLE);
VisualizationRequestHandler visRequestHandler = null; VisualizationRequestHandler visRequestHandler = null;
try {
if (PERSON_PUBLICATION_COUNT_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) { visRequestHandler = visualizationIDsToClass.get(visTypeURLHandle);
} catch (NullPointerException nullKey) {
visRequestHandler = new PersonPublicationCountRequestHandler();
} else if (COLLEGE_PUBLICATION_COUNT_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) {
visRequestHandler = new CollegePublicationCountRequestHandler();
} else if (COAUTHORSHIP_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) {
visRequestHandler = new CoAuthorshipRequestHandler();
} else if (PERSON_LEVEL_VIS_URL_VALUE.equalsIgnoreCase(visTypeURLHandle)) {
visRequestHandler = new PersonLevelRequestHandler();
} else if (UTILITIES_URL_VALUE
.equalsIgnoreCase(visTypeURLHandle)) {
visRequestHandler = new UtilitiesRequestHandler();
} else {
log.debug("vis uqery parameter value -> " + vreq.getParameter("vis"));
log.debug("uri uqery parameter value -> " + vreq.getParameter("uri"));
log.debug("render_mode query parameter value -> " + vreq.getParameter("render_mode"));
/* /*
* This is side-effecting because the error content is directly * This is side-effecting because the error content is directly
@ -181,16 +150,13 @@ public class VisualizationController extends BaseEditController {
* the error page. * the error page.
* */ * */
handleMalformedParameters("Inappropriate query parameters were submitted. ", handleMalformedParameters("Inappropriate query parameters were submitted. ",
request, request,
response); response);
} }
String rdfResultFormatParam = "RDF/XML-ABBREV";
DataSource dataSource = setupJENADataSource(request, DataSource dataSource = setupJENADataSource(request,
response, response,
vreq, vreq);
rdfResultFormatParam);
if (dataSource != null && visRequestHandler != null) { if (dataSource != null && visRequestHandler != null) {
@ -204,7 +170,14 @@ public class VisualizationController extends BaseEditController {
} else { } else {
log.error("ERROR! Data Model Empty &/or inapproppriate vis request made"); String errorMessage = "Data Model Empty &/or Inappropriate "
+ "query parameters were submitted. ";
handleMalformedParameters(errorMessage,
request,
response);
log.error(errorMessage);
} }
return; return;
@ -249,8 +222,7 @@ public class VisualizationController extends BaseEditController {
} }
private DataSource setupJENADataSource(HttpServletRequest request, private DataSource setupJENADataSource(HttpServletRequest request,
HttpServletResponse response, VitroRequest vreq, HttpServletResponse response, VitroRequest vreq) {
String rdfResultFormatParam) {
Model model = vreq.getJenaOntModel(); // getModel() Model model = vreq.getJenaOntModel(); // getModel()
if (model == null) { if (model == null) {
@ -258,7 +230,7 @@ public class VisualizationController extends BaseEditController {
return null; return null;
} }
log.debug("rdfResultFormat was: " + rdfResultFormatParam); log.debug("rdfResultFormat was: " + VisConstants.RDF_RESULT_FORMAT_PARAM);
DataSource dataSource = DatasetFactory.create(); DataSource dataSource = DatasetFactory.create();
ModelMaker maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker"); ModelMaker maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");

6
src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/IVisRequestHandler.java
View file

@ -1,6 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.visualization.visutils;
public interface IVisRequestHandler {
public void doSomething();
}