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

1. Refactored to remove a parameter not used by the called calss. see http://issues.library.cornell.edu/browse/NIHVIVO-2114

Browse source
This commit is contained in:
cdtank 2011-02-22 19:58:36 +00:00
parent 6970daed9f
commit e67aac14bb
6 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,6 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
new PersonGrantCountVisCodeGenerator(personURI, new PersonGrantCountVisCodeGenerator(personURI,
visMode, visMode,
visContainer, visContainer,
piGrants,
yearToGrantCount, yearToGrantCount,
log); log);
@ -157,7 +156,6 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
new PersonGrantCountVisCodeGenerator(personURI, new PersonGrantCountVisCodeGenerator(personURI,
visMode, visMode,
visContainer, visContainer,
piGrants,
yearToGrantCount, yearToGrantCount,
log); log);

9
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java
View file

@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
@ -45,8 +44,7 @@ public class PersonGrantCountVisCodeGenerator {
private String individualURI; private String individualURI;
public PersonGrantCountVisCodeGenerator(String individualURIParam, public PersonGrantCountVisCodeGenerator(String individualURIParam,
String visMode, String visContainer, Set<Grant> piGrants, String visMode, String visContainer, Map<String, Integer> yearToGrantCount,
Map<String, Integer> yearToGrantCount,
Log log) { Log log) {
this.individualURI = individualURIParam; this.individualURI = individualURIParam;
@ -55,7 +53,7 @@ public class PersonGrantCountVisCodeGenerator {
this.log = log; this.log = log;
this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer, piGrants); this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
} }
@ -68,8 +66,7 @@ public class PersonGrantCountVisCodeGenerator {
* @return * @return
*/ */
private SparklineData setupSparklineParameters(String visMode, private SparklineData setupSparklineParameters(String visMode,
String providedVisContainerID, String providedVisContainerID) {
Set<Grant> piGrants) {
SparklineData sparklineData = new SparklineData(); SparklineData sparklineData = new SparklineData();
sparklineData.setYearToActivityCount(yearToGrantCount); sparklineData.setYearToActivityCount(yearToGrantCount);

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

@ -113,7 +113,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
egoURI, egoURI,
VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE, VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
EGO_GRANT_SPARKLINE_VIS_CONTAINER_ID, EGO_GRANT_SPARKLINE_VIS_CONTAINER_ID,
piGrants,
yearToGrantCount, yearToGrantCount,
log); log);
@ -174,7 +173,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
egoURI, egoURI,
VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE, VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
EGO_PUB_SPARKLINE_VIS_CONTAINER_ID, EGO_PUB_SPARKLINE_VIS_CONTAINER_ID,
authorDocuments,
yearToPublicationCount, yearToPublicationCount,
log); log);

10
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java
View file

@ -55,13 +55,11 @@ public class PersonPublicationCountQueryRunner implements QueryRunner<Set<BiboDo
+ "SELECT (str(?authorLabel) as ?" + QueryFieldLabels.AUTHOR_LABEL + ") \n" + "SELECT (str(?authorLabel) as ?" + QueryFieldLabels.AUTHOR_LABEL + ") \n"
+ " (str(?document) as ?" + QueryFieldLabels.DOCUMENT_URL + ") \n" + " (str(?document) as ?" + QueryFieldLabels.DOCUMENT_URL + ") \n"
+ " (str(?publicationDate) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_DATE + ") \n"; + " (str(?publicationDate) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_DATE + ") \n";
// + " (str(?publicationYearUsing_1_1_property) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY + ") \n";
private static final String SPARQL_QUERY_COMMON_WHERE_CLAUSE = "" private static final String SPARQL_QUERY_COMMON_WHERE_CLAUSE = ""
+ "?document rdfs:label ?documentLabel .\n" + "?document rdfs:label ?documentLabel .\n"
+ "OPTIONAL { ?document core:dateTimeValue ?dateTimeValue . \n" + "OPTIONAL { ?document core:dateTimeValue ?dateTimeValue . \n"
+ " ?dateTimeValue core:dateTime ?publicationDate } .\n" ; + " ?dateTimeValue core:dateTime ?publicationDate } .\n" ;
//+ "OPTIONAL { ?document core:year ?publicationYearUsing_1_1_property } ." ;
public PersonPublicationCountQueryRunner(String personURI, public PersonPublicationCountQueryRunner(String personURI,
Dataset Dataset, Log log) { Dataset Dataset, Log log) {
@ -87,14 +85,6 @@ public class PersonPublicationCountQueryRunner implements QueryRunner<Set<BiboDo
biboDocument.setPublicationDate(publicationDateNode.toString()); biboDocument.setPublicationDate(publicationDateNode.toString());
} }
/*
* This is being used so that date in the data from pre-1.2 ontology can be captured.
* */
// RDFNode publicationYearUsing_1_1_PropertyNode = solution.get(QueryFieldLabels.DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY);
// if (publicationYearUsing_1_1_PropertyNode != null) {
// biboDocument.setPublicationYear(publicationYearUsing_1_1_PropertyNode.toString());
// }
/* /*
* Since we are getting publication count for just one author at a time we need * Since we are getting publication count for just one author at a time we need
* to create only one "Individual" instance. We test against the null for "author" to * to create only one "Individual" instance. We test against the null for "author" to

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

@ -6,8 +6,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -25,16 +25,16 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; 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.ResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; 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.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.exceptions.MalformedQueryParametersException;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; 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.valueobjects.SparklineData;
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.PDFDocument; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.PDFDocument;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; 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;
/** /**
* *
@ -94,12 +94,10 @@ VisualizationRequestHandler {
personURI, personURI,
visMode, visMode,
visContainer, visContainer,
authorDocuments, yearToPublicationCount,
yearToPublicationCount,
log); log);
SparklineData sparklineData = visualizationCodeGenerator SparklineData sparklineData = visualizationCodeGenerator.getValueObjectContainer();
.getValueObjectContainer();
return prepareDynamicResponse(vitroRequest, sparklineData, return prepareDynamicResponse(vitroRequest, sparklineData,
shouldVIVOrenderVis); shouldVIVOrenderVis);
@ -172,8 +170,7 @@ VisualizationRequestHandler {
personURI, personURI,
visMode, visMode,
visContainer, visContainer,
authorDocuments, yearToPublicationCount,
yearToPublicationCount,
log); log);
SparklineData sparklineData = SparklineData sparklineData =

8
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java
View file

@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement;
import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
@ -47,7 +46,6 @@ public class PersonPublicationCountVisCodeGenerator {
public PersonPublicationCountVisCodeGenerator(String individualURIParam, public PersonPublicationCountVisCodeGenerator(String individualURIParam,
String visMode, String visMode,
String visContainer, String visContainer,
Set<BiboDocument> authorDocuments,
Map<String, Integer> yearToPublicationCount, Map<String, Integer> yearToPublicationCount,
Log log) { Log log) {
@ -57,7 +55,7 @@ public class PersonPublicationCountVisCodeGenerator {
this.log = log; this.log = log;
this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer, authorDocuments); this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
} }
@ -66,12 +64,10 @@ public class PersonPublicationCountVisCodeGenerator {
* will be used in the template to construct the actual html/javascript code. * will be used in the template to construct the actual html/javascript code.
* @param visMode * @param visMode
* @param visContainer * @param visContainer
* @param authorDocuments
* @return * @return
*/ */
private SparklineData setupSparklineParameters(String visMode, private SparklineData setupSparklineParameters(String visMode,
String providedVisContainerID, String providedVisContainerID) {
Set<BiboDocument> authorDocuments) {
SparklineData sparklineData = new SparklineData(); SparklineData sparklineData = new SparklineData();
sparklineData.setYearToActivityCount(yearToPublicationCount); sparklineData.setYearToActivityCount(yearToPublicationCount);