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

1. Improved the json response structure for the scimaps vis.

Browse source
This commit is contained in:
cdtank 2011-05-12 22:19:58 +00:00
parent f4d89253a8
commit 0e3ccec947
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -2,10 +2,8 @@
package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience; package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -29,9 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.MapOfScienceActivity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.MapOfScienceActivity;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON;
import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities;
import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
@ -319,26 +315,35 @@ public class MapOfScienceVisualizationRequestHandler implements
Map<String, Integer> journalToPublicationCount = new HashMap<String, Integer>(); Map<String, Integer> journalToPublicationCount = new HashMap<String, Integer>();
int i = 0;
int mappedPublicationCount = 0;
int unMappedPublicationCount = 0;
for (Activity activity : subentity.getActivities()) { for (Activity activity : subentity.getActivities()) {
System.out.println(i);
System.out.println(activity.getActivityURI());
System.out.println(activity.getClass());
System.out.println("------");
String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal().trim(); if (StringUtils.isNotBlank(((MapOfScienceActivity) activity).getPublishedInJournal())) {
if (journalToPublicationCount.containsKey(journalName)) { String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal();
if (journalToPublicationCount.containsKey(journalName)) {
journalToPublicationCount.put(journalName,
journalToPublicationCount.get(journalName) + 1);
} else {
journalToPublicationCount.put(journalName, 1);
}
mappedPublicationCount++;
journalToPublicationCount.put(journalName,
journalToPublicationCount.get(journalName) + 1);
} else { } else {
journalToPublicationCount.put(journalName, 1); unMappedPublicationCount++;
} }
i++;
} }
entityJson.setPubsMapped(mappedPublicationCount);
entityJson.setPubsUnmapped(unMappedPublicationCount);
entityJson.setSubdisciplineActivity(journalToPublicationCount); entityJson.setSubdisciplineActivity(journalToPublicationCount);
jsonContent.add(entityJson); jsonContent.add(entityJson);

2
src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
View file

@ -3,7 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
public class MapOfScienceActivity extends Activity { public class MapOfScienceActivity extends Activity {
private String publishedInJournal = "NONE"; private String publishedInJournal;
public MapOfScienceActivity(String activityURI) { public MapOfScienceActivity(String activityURI) {
super(activityURI); super(activityURI);

1
src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
View file

@ -455,7 +455,6 @@ public class SelectOnModelUtilities {
} }
currentEntityPublications.add(biboDocument); currentEntityPublications.add(biboDocument);
System.out.println(biboDocument.getClass() + " -- " + ((MapOfScienceActivity) biboDocument).getPublishedInJournal());
} }
subEntity.addActivities(currentEntityPublications); subEntity.addActivities(currentEntityPublications);
} }