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

1. Made changes so that visualizations url prefix is less vague (refer NIHVIVO-967)

Browse source
This commit is contained in:
cdtank 2010-07-29 22:17:13 +00:00
parent 636ab2bf65
commit d7e39e2953
14 changed files with 75 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,6 @@ public class VisualizationController extends BaseEditController {
this.doGet(request, response);
}
//TODO: Set it up so visualizations register themselves with this object. Don't tie this class to each visualization.
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@ -166,8 +165,6 @@ public class VisualizationController extends BaseEditController {
* */
visRequestHandler.generateVisualization(vreq, request, response, log, dataSource);
System.out.println(" VIS ID TO CLASS " + visualizationIDsToClass);
} else {
String errorMessage = "Data Model Empty &/or Inappropriate "

7
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
View file

@ -4,14 +4,14 @@ package edu.cornell.mannlib.vitro.webapp.controller.visualization;
public class VisualizationFrameworkConstants {
public static final String VISUALIZATION_URL_PREFIX = "/visualization";
public static final String VIS_TYPE_URL_HANDLE = "vis";
public static final String VIS_CONTAINER_URL_HANDLE = "container";
public static final String INDIVIDUAL_URI_URL_HANDLE = "uri";
public static final String VIS_MODE_URL_HANDLE = "vis_mode";
public static final String RENDER_MODE_URL_HANDLE = "render_mode";
public static final String STANDALONE_RENDER_MODE_URL_VALUE = "standalone";
public static final String DYNAMIC_RENDER_MODE_URL_VALUE = "dynamic";
public static final String DATA_RENDER_MODE_URL_VALUE = "data";
@ -25,4 +25,7 @@ public class VisualizationFrameworkConstants {
public static final String PERSON_LEVEL_UTILS_VIS_MODE = "PERSON_LEVEL_URL";
public static final String IMAGE_UTILS_VIS_MODE = "IMAGE_URL";
}

9
src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryHandler.java
View file

@ -44,6 +44,8 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator
*/
public class CoAuthorshipQueryHandler implements QueryHandler<CoAuthorshipVOContainer> {
private static final int MAX_AUTHORS_PER_PAPER_ALLOWED = 101;
protected static final Syntax SYNTAX = Syntax.syntaxARQ;
private String egoURLParam;
@ -222,8 +224,13 @@ public class CoAuthorshipQueryHandler implements QueryHandler<CoAuthorshipVOCont
/*
* If there was only one co-author (other than ego) then we dont have to create any
* edges. so the below condition will take care of that.
*
* We are restricting edges between co-author if a particular document has more than
* 100 co-authors. Our conjecture is that such edges do not provide any good insight
* & causes unnecessary computations causing the server to time-out.
* */
if (currentBiboDocumentEntry.getValue().size() > 1) {
if (currentBiboDocumentEntry.getValue().size() > 1
&& currentBiboDocumentEntry.getValue().size() < MAX_AUTHORS_PER_PAPER_ALLOWED) {
Set<Edge> newlyAddedEdges = new HashSet<Edge>();

8
src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java
View file

@ -510,8 +510,8 @@ public class CoAuthorshipVisCodeGenerator {
if (yearToUniqueCoauthors.size() > 0) {
String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) {
secondaryContextPath = "/admin/visQuery";
if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
}
@ -548,8 +548,8 @@ public class CoAuthorshipVisCodeGenerator {
if (yearToUniqueCoauthors.size() > 0) {
String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) {
secondaryContextPath = "/admin/visQuery";
if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
}
String fullTimelineNetworkURL = contextPath

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

@ -522,8 +522,8 @@ public class PersonPublicationCountVisCodeGenerator {
if (yearToPublicationCount.size() > 0) {
String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) {
secondaryContextPath = "/admin/visQuery";
if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
}
@ -560,8 +560,8 @@ public class PersonPublicationCountVisCodeGenerator {
if (yearToPublicationCount.size() > 0) {
String secondaryContextPath = "";
if (!contextPath.contains("/admin/visQuery")) {
secondaryContextPath = "/admin/visQuery";
if (!contextPath.contains(VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX)) {
secondaryContextPath = VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX;
}
String fullTimelineNetworkURL = contextPath

4
src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java
View file

@ -159,7 +159,7 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
* */
preparedURL += request.getContextPath()
+ "/admin/visQuery"
+ VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX
+ "?"
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
+ "=" + URLEncoder.encode(individualURIParam,
@ -187,7 +187,7 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
* */
preparedURL += request.getContextPath()
+ "/admin/visQuery"
+ VisualizationFrameworkConstants.VISUALIZATION_URL_PREFIX
+ "?"
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
+ "=" + URLEncoder.encode(individualURIParam,