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

Fixing the issue with PersonGrantCountRequestHandler

Browse source
This commit is contained in:
bkoniden 2010-12-03 18:43:17 +00:00
parent c22b104816
commit 821f4ae2c3
2 changed files with 80 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java
View file

@ -34,7 +34,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
* Deepak Konidena
*
*/
public class PersonGrantCountQueryRunner implements QueryRunner<Set<Grant>>{
protected static final Syntax SYNTAX = Syntax.syntaxARQ;
@ -157,104 +156,5 @@ public class PersonGrantCountQueryRunner implements QueryRunner<Set<Grant>>{
return createJavaValueObjects(resultSet);
}
}

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

@ -30,7 +30,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
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.BiboDocument;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Grant;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
@ -39,7 +38,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.PDFDocument;
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 the content related to an individual's
@ -79,30 +77,30 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
VisualizationFrameworkConstants
.VIS_CONTAINER_KEY);
QueryRunner<Set<BiboDocument>> queryManager =
QueryRunner<Set<Grant>> queryManager =
new PersonGrantCountQueryRunner(personURI, dataSource, log);
try {
Set<Grant> authorDocuments = queryManager.getQueryResult();
// try {
// Set<Grant> authorDocuments = queryManager.getQueryResult();
/*
* Create a map from the year to number of publications. Use the BiboDocument's
* parsedPublicationYear to populate the data.
* */
Map<String, Integer> yearToPublicationCount =
UtilityFunctions.getYearToPublicationCount(authorDocuments);
Individual author = ((PersonGrantCountQueryRunner) queryManager).getAuthor();
if (VisualizationFrameworkConstants.DATA_RENDER_MODE
.equalsIgnoreCase(renderMode)) {
prepareDataResponse(author,
authorDocuments,
yearToPublicationCount,
response);
return;
}
// Map<String, Integer> yearToPublicationCount =
// UtilityFunctions.getYearToPublicationCount(authorDocuments);
//
// Individual author = ((PersonGrantCountQueryRunner) queryManager).getAuthor();
//
// if (VisualizationFrameworkConstants.DATA_RENDER_MODE
// .equalsIgnoreCase(renderMode)) {
//
// prepareDataResponse(author,
// authorDocuments,
// yearToPublicationCount,
// response);
// return;
// }
/*
@ -123,66 +121,66 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
/*
* Computations required to generate HTML for the sparkline & related context.
* */
PersonGrantCountVisCodeGenerator visualizationCodeGenerator =
new PersonGrantCountVisCodeGenerator(vitroRequest.getContextPath(),
personURI,
visMode,
visContainer,
authorDocuments,
yearToPublicationCount,
log);
SparklineData sparklineData = visualizationCodeGenerator
.getValueObjectContainer();
/*
* This is side-effecting because the response of this method is just to redirect to
* a page with visualization on it.
* */
RequestDispatcher requestDispatcher = null;
if (VisualizationFrameworkConstants.DYNAMIC_RENDER_MODE
.equalsIgnoreCase(renderMode)) {
prepareDynamicResponse(request,
response,
vitroRequest,
sparklineData,
yearToPublicationCount);
requestDispatcher = request.getRequestDispatcher("/templates/page/blankPage.jsp");
} else {
prepareStandaloneResponse(request,
response,
vitroRequest,
sparklineData);
requestDispatcher = request.getRequestDispatcher(Controllers.BASIC_JSP);
}
try {
requestDispatcher.forward(request, response);
} catch (Exception e) {
log.error("EntityEditController could not forward to view.");
log.error(e.getMessage());
log.error(e.getStackTrace());
}
} catch (MalformedQueryParametersException e) {
try {
UtilityFunctions.handleMalformedParameters(
e.getMessage(),
"Visualization Query Error - Individual Publication Count",
vitroRequest,
request,
response,
log);
} catch (ServletException e1) {
log.error(e1.getStackTrace());
} catch (IOException e1) {
log.error(e1.getStackTrace());
}
return;
}
// PersonGrantCountVisCodeGenerator visualizationCodeGenerator =
// new PersonGrantCountVisCodeGenerator(vitroRequest.getContextPath(),
// personURI,
// visMode,
// visContainer,
// authorDocuments,
// yearToPublicationCount,
// log);
//
// SparklineData sparklineData = visualizationCodeGenerator
// .getValueObjectContainer();
//
// /*
// * This is side-effecting because the response of this method is just to redirect to
// * a page with visualization on it.
// * */
// RequestDispatcher requestDispatcher = null;
//
// if (VisualizationFrameworkConstants.DYNAMIC_RENDER_MODE
// .equalsIgnoreCase(renderMode)) {
//
// prepareDynamicResponse(request,
// response,
// vitroRequest,
// sparklineData,
// yearToPublicationCount);
// requestDispatcher = request.getRequestDispatcher("/templates/page/blankPage.jsp");
//
// } else {
// prepareStandaloneResponse(request,
// response,
// vitroRequest,
// sparklineData);
// requestDispatcher = request.getRequestDispatcher(Controllers.BASIC_JSP);
// }
//
// try {
// requestDispatcher.forward(request, response);
// } catch (Exception e) {
// log.error("EntityEditController could not forward to view.");
// log.error(e.getMessage());
// log.error(e.getStackTrace());
// }
//
// } catch (MalformedQueryParametersException e) {
// try {
// UtilityFunctions.handleMalformedParameters(
// e.getMessage(),
// "Visualization Query Error - Individual Publication Count",
// vitroRequest,
// request,
// response,
// log);
// } catch (ServletException e1) {
// log.error(e1.getStackTrace());
// } catch (IOException e1) {
// log.error(e1.getStackTrace());
// }
// return;
// }
}
private void writePublicationsOverTimeCSV(
@ -216,7 +214,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
*/
private void prepareDataResponse(
Individual author,
Set<BiboDocument> authorDocuments,
Set<Grant> authorDocuments,
Map<String, Integer> yearToPublicationCount,
HttpServletResponse response) {
@ -313,7 +311,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
}
private void preparePDFResponse(Individual author,
Set<BiboDocument> authorDocuments,
Set<Grant> authorDocuments,
Map<String, Integer> yearToPublicationCount,
HttpServletResponse response) {