Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
This commit is contained in:
tworrall
commit
36a7b57fad
21 changed files with 805 additions and 1825 deletions
|
|
@ -74,6 +74,15 @@ public class SimplePermission extends Permission {
|
|||
"SeeVerbosePropertyInformation");
|
||||
public static final SimplePermission USE_ADVANCED_DATA_TOOLS_PAGES = new SimplePermission(
|
||||
"UseAdvancedDataToolsPages");
|
||||
public static final SimplePermission USE_SPARQL_QUERY_PAGE = new SimplePermission(
|
||||
"UseSparqlQueryPage");
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// These instances are "catch all" permissions to cover poorly defined
|
||||
// groups of actions until better definitions were found. Don't add usages
|
||||
// of these, and remove existing usages where possible.
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
public static final SimplePermission USE_BASIC_AJAX_CONTROLLERS = new SimplePermission(
|
||||
"UseBasicAjaxControllers");
|
||||
public static final SimplePermission USE_MISCELLANEOUS_ADMIN_PAGES = new SimplePermission(
|
||||
|
|
@ -84,8 +93,6 @@ public class SimplePermission extends Permission {
|
|||
"UseMiscellaneousEditorPages");
|
||||
public static final SimplePermission USE_MISCELLANEOUS_PAGES = new SimplePermission(
|
||||
"UseMiscellaneousPages");
|
||||
public static final SimplePermission USE_SPARQL_QUERY_PAGE = new SimplePermission(
|
||||
"UseSparqlQueryPage");
|
||||
|
||||
public static List<SimplePermission> getAllInstances() {
|
||||
return new ArrayList<SimplePermission>(allInstances.values());
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
package edu.cornell.mannlib.vitro.webapp.controller.json;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.PageDataGetterUtils;
|
||||
|
||||
/**
|
||||
* Gets data based on data getter for page uri and returns in the form of Json objects
|
||||
*/
|
||||
public class GetDataForPage extends JsonObjectProducer {
|
||||
private static final Log log = LogFactory.getLog(GetDataForPage.class);
|
||||
|
||||
protected GetDataForPage(VitroRequest vreq) {
|
||||
super(vreq);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JSONObject process() throws Exception {
|
||||
JSONObject rObj = null;
|
||||
String pageUri = vreq.getParameter("pageUri");
|
||||
if(pageUri != null && !pageUri.isEmpty()) {
|
||||
Map<String,Object> data = PageDataGetterUtils.getDataForPage(pageUri, vreq, ctx);
|
||||
//Convert to json version based on type of page
|
||||
if(data != null) {
|
||||
//Convert to json version based on type of page
|
||||
rObj = PageDataGetterUtils.covertDataToJSONForPage(pageUri, data, vreq, ctx);
|
||||
}
|
||||
}
|
||||
return rObj;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -3,8 +3,11 @@
|
|||
package edu.cornell.mannlib.vitro.webapp.controller.json;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Enumeration;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -15,17 +18,21 @@ import javax.servlet.http.HttpServletResponse;
|
|||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.PageRecord;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
|
||||
import edu.cornell.mannlib.vitro.webapp.utils.log.LogUtils;
|
||||
import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.PageDataGetterUtils;
|
||||
|
||||
/**
|
||||
* This servlet is for servicing requests for JSON objects/data.
|
||||
|
|
@ -69,7 +76,9 @@ public class JsonServlet extends VitroHttpServlet {
|
|||
log.debug("AJAX request to retrieve individuals by vclasses");
|
||||
new GetSolrIndividualsByVClasses(vreq).process(resp);
|
||||
} else if( vreq.getParameter("getDataForPage") != null ){
|
||||
new GetDataForPage(vreq).process(resp);
|
||||
throw new IllegalArgumentException("The call invoked deprecated classes " +
|
||||
"and the parameter for this call appeared nowhere in the code base, " +
|
||||
"so it was removed in Aug 5th 2013.");
|
||||
}else if( vreq.getParameter("getRenderedSolrIndividualsByVClass") != null ){
|
||||
new GetRenderedSolrIndividualsByVClass(vreq).process(resp);
|
||||
}else if( vreq.getParameter("getRandomSolrIndividualsByVClass") != null ){
|
||||
|
|
@ -85,7 +94,7 @@ public class JsonServlet extends VitroHttpServlet {
|
|||
|
||||
Map<String, Object> map = getSolrVClassIntersectionResults(vclassURIs, vreq, context);
|
||||
//last parameter indicates single vclass instead of multiple vclasses
|
||||
return processVClassResults(map, vreq, context, false);
|
||||
return processVclassResultsJSON(map, vreq, false);
|
||||
}
|
||||
|
||||
public static JSONObject getSolrIndividualsByVClasses(List<String> vclassURIs, HttpServletRequest req, ServletContext context) throws Exception {
|
||||
|
|
@ -93,8 +102,8 @@ public class JsonServlet extends VitroHttpServlet {
|
|||
log.debug("Retrieve solr results for vclasses" + vclassURIs.toString());
|
||||
Map<String, Object> map = getSolrVClassIntersectionResults(vclassURIs, vreq, context);
|
||||
log.debug("Results returned from Solr for " + vclassURIs.toString() + " are of size " + map.size());
|
||||
JSONObject rObj = processVClassResults(map, vreq, context, true);
|
||||
return rObj;
|
||||
|
||||
return processVclassResultsJSON(map, vreq, true);
|
||||
}
|
||||
|
||||
//Including version for Solr query for Vclass Intersections
|
||||
|
|
@ -119,10 +128,10 @@ public class JsonServlet extends VitroHttpServlet {
|
|||
}
|
||||
|
||||
// Map given to process method includes the actual individuals returned from the search
|
||||
public static JSONObject processVClassResults(Map<String, Object> map, VitroRequest vreq, ServletContext context, boolean multipleVclasses) throws Exception{
|
||||
JSONObject rObj = PageDataGetterUtils.processVclassResultsJSON(map, vreq, multipleVclasses);
|
||||
return rObj;
|
||||
}
|
||||
// public static JSONObject processVClassResults(Map<String, Object> map, VitroRequest vreq, ServletContext context, boolean multipleVclasses) throws Exception{
|
||||
// JSONObject rObj = processVclassResultsJSON(map, vreq, multipleVclasses);
|
||||
// return rObj;
|
||||
// }
|
||||
|
||||
public static Collection<String> getMostSpecificTypes(Individual individual, WebappDaoFactory wdf) {
|
||||
ObjectPropertyStatementDao opsDao = wdf.getObjectPropertyStatementDao();
|
||||
|
|
@ -143,7 +152,7 @@ public class JsonServlet extends VitroHttpServlet {
|
|||
|
||||
Map<String, Object> map = getRandomSolrVClassResults(vclassURI, vreq, context);
|
||||
//last parameter indicates single vclass instead of multiple vclasses
|
||||
return processVClassResults(map, vreq, context, false);
|
||||
return processVclassResultsJSON(map, vreq, false);
|
||||
}
|
||||
|
||||
//Including version for Random Solr query for Vclass Intersections
|
||||
|
|
@ -169,4 +178,120 @@ public class JsonServlet extends VitroHttpServlet {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Process results related to VClass or vclasses. Handles both single and multiple vclasses being sent.
|
||||
*/
|
||||
public static JSONObject processVclassResultsJSON(Map<String, Object> map, VitroRequest vreq, boolean multipleVclasses) {
|
||||
JSONObject rObj = new JSONObject();
|
||||
VClass vclass=null;
|
||||
|
||||
try {
|
||||
|
||||
// Properties from ontologies used by VIVO - should not be in vitro
|
||||
DataProperty fNameDp = (new DataProperty());
|
||||
fNameDp.setURI("http://xmlns.com/foaf/0.1/firstName");
|
||||
DataProperty lNameDp = (new DataProperty());
|
||||
lNameDp.setURI("http://xmlns.com/foaf/0.1/lastName");
|
||||
DataProperty preferredTitleDp = (new DataProperty());
|
||||
preferredTitleDp.setURI("http://vivoweb.org/ontology/core#preferredTitle");
|
||||
|
||||
if( log.isDebugEnabled() ){
|
||||
@SuppressWarnings("unchecked")
|
||||
Enumeration<String> e = vreq.getParameterNames();
|
||||
while(e.hasMoreElements()){
|
||||
String name = e.nextElement();
|
||||
log.debug("parameter: " + name);
|
||||
for( String value : vreq.getParameterValues(name) ){
|
||||
log.debug("value for " + name + ": '" + value + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//need an unfiltered dao to get firstnames and lastnames
|
||||
WebappDaoFactory fullWdf = vreq.getUnfilteredWebappDaoFactory();
|
||||
|
||||
String[] vitroClassIdStr = vreq.getParameterValues("vclassId");
|
||||
if ( vitroClassIdStr != null && vitroClassIdStr.length > 0){
|
||||
for(String vclassId: vitroClassIdStr) {
|
||||
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassId);
|
||||
if (vclass == null) {
|
||||
log.error("Couldn't retrieve vclass ");
|
||||
throw new Exception ("Class " + vclassId + " not found");
|
||||
}
|
||||
}
|
||||
}else{
|
||||
log.error("parameter vclassId URI parameter expected ");
|
||||
throw new Exception("parameter vclassId URI parameter expected ");
|
||||
}
|
||||
List<String> vclassIds = Arrays.asList(vitroClassIdStr);
|
||||
//if single vclass expected, then include vclass. This relates to what the expected behavior is, not size of list
|
||||
if(!multipleVclasses) {
|
||||
//currently used for ClassGroupPage
|
||||
rObj.put("vclass",
|
||||
new JSONObject().put("URI",vclass.getURI())
|
||||
.put("name",vclass.getName()));
|
||||
} else {
|
||||
//For now, utilize very last VClass (assume that that is the one to be employed)
|
||||
//TODO: Find more general way of dealing with this
|
||||
//put multiple ones in?
|
||||
if(vclassIds.size() > 0) {
|
||||
int numberVClasses = vclassIds.size();
|
||||
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(numberVClasses - 1));
|
||||
rObj.put("vclass", new JSONObject().put("URI",vclass.getURI())
|
||||
.put("name",vclass.getName()));
|
||||
}
|
||||
// rObj.put("vclasses", new JSONObject().put("URIs",vitroClassIdStr)
|
||||
// .put("name",vclass.getName()));
|
||||
}
|
||||
if (vclass != null) {
|
||||
|
||||
rObj.put("totalCount", map.get("totalCount"));
|
||||
rObj.put("alpha", map.get("alpha"));
|
||||
|
||||
List<Individual> inds = (List<Individual>)map.get("entities");
|
||||
log.debug("Number of individuals returned from request: " + inds.size());
|
||||
JSONArray jInds = new JSONArray();
|
||||
for(Individual ind : inds ){
|
||||
JSONObject jo = new JSONObject();
|
||||
jo.put("URI", ind.getURI());
|
||||
jo.put("label",ind.getRdfsLabel());
|
||||
jo.put("name",ind.getName());
|
||||
jo.put("thumbUrl", ind.getThumbUrl());
|
||||
jo.put("imageUrl", ind.getImageUrl());
|
||||
jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq));
|
||||
|
||||
jo.put("mostSpecificTypes", JsonServlet.getMostSpecificTypes(ind,fullWdf));
|
||||
jo.put("preferredTitle", JsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf));
|
||||
|
||||
jInds.put(jo);
|
||||
}
|
||||
rObj.put("individuals", jInds);
|
||||
|
||||
JSONArray wpages = new JSONArray();
|
||||
//Made sure that PageRecord here is SolrIndividualListController not IndividualListController
|
||||
List<PageRecord> pages = (List<PageRecord>)map.get("pages");
|
||||
for( PageRecord pr: pages ){
|
||||
JSONObject p = new JSONObject();
|
||||
p.put("text", pr.text);
|
||||
p.put("param", pr.param);
|
||||
p.put("index", pr.index);
|
||||
wpages.put( p );
|
||||
}
|
||||
rObj.put("pages",wpages);
|
||||
|
||||
JSONArray jletters = new JSONArray();
|
||||
List<String> letters = Controllers.getLetters();
|
||||
for( String s : letters){
|
||||
JSONObject jo = new JSONObject();
|
||||
jo.put("text", s);
|
||||
jo.put("param", "alpha=" + URLEncoder.encode(s, "UTF-8"));
|
||||
jletters.put( jo );
|
||||
}
|
||||
rObj.put("letters", jletters);
|
||||
}
|
||||
} catch(Exception ex) {
|
||||
log.error("Error occurred in processing JSON object", ex);
|
||||
}
|
||||
return rObj;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,11 @@ package edu.cornell.mannlib.vitro.webapp.servlet.setup;
|
|||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.StringWriter;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
|
|
@ -31,11 +35,13 @@ import com.hp.hpl.jena.shared.Lock;
|
|||
import com.hp.hpl.jena.vocabulary.RDF;
|
||||
import com.hp.hpl.jena.vocabulary.RDFS;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
|
||||
import edu.cornell.mannlib.vitro.webapp.ontology.update.KnowledgeBaseUpdater;
|
||||
import edu.cornell.mannlib.vitro.webapp.ontology.update.UpdateSettings;
|
||||
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
|
||||
|
||||
/**
|
||||
* Invokes process to test whether the knowledge base needs any updating
|
||||
|
|
@ -44,21 +50,10 @@ import edu.cornell.mannlib.vitro.webapp.ontology.update.UpdateSettings;
|
|||
*
|
||||
*/
|
||||
public class UpdateKnowledgeBase implements ServletContextListener {
|
||||
|
||||
public static final String KBM_REQURIED_AT_STARTUP = "KNOWLEDGE_BASE_MIGRATION_REQUIRED_AT_STARTUP";
|
||||
private final static Log log = LogFactory.getLog(UpdateKnowledgeBase.class);
|
||||
|
||||
private static final String DATA_DIR = "/WEB-INF/ontologies/update/";
|
||||
private static final String LOG_DIR = "logs/";
|
||||
private static final String CHANGED_DATA_DIR = "changedData/";
|
||||
private static final String ASK_QUERY_FILE = DATA_DIR + "askUpdated.sparql";
|
||||
private static final String SUCCESS_ASSERTIONS_FILE = DATA_DIR + "success.n3";
|
||||
private static final String SUCCESS_RDF_FORMAT = "N3";
|
||||
private static final String DIFF_FILE = DATA_DIR + "diff.tab.txt";
|
||||
private static final String REMOVED_DATA_FILE = DATA_DIR + CHANGED_DATA_DIR + "removedData.n3";
|
||||
private static final String ADDED_DATA_FILE = DATA_DIR + CHANGED_DATA_DIR + "addedData.n3";
|
||||
private static final String SPARQL_CONSTRUCT_ADDITIONS_DIR = DATA_DIR + "sparqlConstructs/additions/";
|
||||
private static final String SPARQL_CONSTRUCT_DELETIONS_DIR = DATA_DIR + "sparqlConstructs/deletions/";
|
||||
private static final String OLD_TBOX_MODEL_DIR = DATA_DIR + "oldVersion/";
|
||||
private static final String NEW_TBOX_MODEL_DIR = "/WEB-INF/filegraph/tbox/";
|
||||
private static final String OLD_TBOX_ANNOTATIONS_DIR = DATA_DIR + "oldAnnotations/";
|
||||
|
|
@ -72,33 +67,15 @@ public class UpdateKnowledgeBase implements ServletContextListener {
|
|||
private static final String LOADED_STARTUPT_DISPLAYMODEL_DIR = "/WEB-INF/ontologies/app/loadedAtStartup/";
|
||||
private static final String OLD_DISPLAYMODEL_VIVOLISTVIEW_PATH = DATA_DIR + "oldDisplayModel/vivoListViewConfig.rdf";
|
||||
|
||||
@Override
|
||||
public void contextInitialized(ServletContextEvent sce) {
|
||||
try {
|
||||
ServletContext ctx = sce.getServletContext();
|
||||
|
||||
// If the DATA_DIR directory doesn't exist no migration check will be done.
|
||||
// This is a normal situation for Vitro.
|
||||
File updateDirectory = new File(ctx.getRealPath(DATA_DIR));
|
||||
if (!updateDirectory.exists()) {
|
||||
log.debug("Directory " + ctx.getRealPath(DATA_DIR) + " does not exist, no migration check will be attempted.");
|
||||
return;
|
||||
}
|
||||
ServletContext ctx = sce.getServletContext();
|
||||
StartupStatus ss = StartupStatus.getBean(ctx);
|
||||
|
||||
String logFileName = DATA_DIR + LOG_DIR + timestampedFileName("knowledgeBaseUpdate", "log");
|
||||
String errorLogFileName = DATA_DIR + LOG_DIR + timestampedFileName("knowledgeBaseUpdate.error", "log");
|
||||
|
||||
try {
|
||||
UpdateSettings settings = new UpdateSettings();
|
||||
settings.setAskUpdatedQueryFile(getAskUpdatedQueryPath(ctx));
|
||||
settings.setDataDir(ctx.getRealPath(DATA_DIR));
|
||||
settings.setSparqlConstructAdditionsDir(ctx.getRealPath(SPARQL_CONSTRUCT_ADDITIONS_DIR));
|
||||
settings.setSparqlConstructDeletionsDir(ctx.getRealPath(SPARQL_CONSTRUCT_DELETIONS_DIR));
|
||||
settings.setDiffFile(ctx.getRealPath(DIFF_FILE));
|
||||
settings.setSuccessAssertionsFile(ctx.getRealPath(SUCCESS_ASSERTIONS_FILE));
|
||||
settings.setSuccessRDFFormat(SUCCESS_RDF_FORMAT);
|
||||
settings.setLogFile(ctx.getRealPath(logFileName));
|
||||
settings.setErrorLogFile(ctx.getRealPath(errorLogFileName));
|
||||
settings.setAddedDataFile(ctx.getRealPath(ADDED_DATA_FILE));
|
||||
settings.setRemovedDataFile(ctx.getRealPath(REMOVED_DATA_FILE));
|
||||
putReportingPathsIntoSettings(ctx, settings);
|
||||
|
||||
WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
|
||||
settings.setDefaultNamespace(wadf.getDefaultNamespace());
|
||||
settings.setAssertionOntModelSelector(ModelAccess.on(ctx).getBaseOntModelSelector());
|
||||
|
|
@ -157,21 +134,54 @@ public class UpdateKnowledgeBase implements ServletContextListener {
|
|||
}
|
||||
}
|
||||
} catch (Exception ioe) {
|
||||
String errMsg = "Exception updating knowledge base " +
|
||||
"for ontology changes: ";
|
||||
// Tomcat doesn't always seem to print exceptions thrown from
|
||||
// context listeners
|
||||
System.out.println(errMsg);
|
||||
ioe.printStackTrace();
|
||||
throw new RuntimeException(errMsg, ioe);
|
||||
ss.fatal(this, "Exception updating knowledge base for ontology changes: ", ioe);
|
||||
}
|
||||
} catch (Throwable t){
|
||||
log.warn("warning", t);
|
||||
ss.fatal(this, "Exception updating knowledge base for ontology changes: ", t);
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
t.printStackTrace();
|
||||
ss.fatal(this, "Exception updating knowledge base for ontology changes: ", t);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create the directories where we will report on the update.
|
||||
* Put the paths for the directories and files into the settings object.
|
||||
*/
|
||||
private void putReportingPathsIntoSettings(ServletContext ctx, UpdateSettings settings) throws IOException {
|
||||
ConfigurationProperties props = ConfigurationProperties.getBean(ctx);
|
||||
Path homeDir = Paths.get(props.getProperty("vitro.home"));
|
||||
|
||||
Path dataDir = createDirectory(homeDir, "upgrade", "knowledgeBase");
|
||||
settings.setDataDir(dataDir.toString());
|
||||
StartupStatus.getBean(ctx).info(this, "Updating knowledge base: reports are in '" + dataDir + "'");
|
||||
|
||||
settings.setAskUpdatedQueryFile(dataDir.resolve("askUpdated.sparql").toString());
|
||||
settings.setDiffFile(dataDir.resolve("diff.tab.txt").toString());
|
||||
settings.setSuccessAssertionsFile(dataDir.resolve("success.n3").toString());
|
||||
settings.setSuccessRDFFormat("N3");
|
||||
|
||||
settings.setSparqlConstructAdditionsDir(createDirectory(dataDir, "sparqlConstructs", "additions").toString());
|
||||
settings.setSparqlConstructDeletionsDir(createDirectory(dataDir, "sparqlConstructs", "deletions").toString());
|
||||
|
||||
Path changedDir = createDirectory(dataDir, "changedData");
|
||||
settings.setAddedDataFile(changedDir.resolve("addedData.n3").toString());
|
||||
settings.setRemovedDataFile(changedDir.resolve("removedData.n3").toString());
|
||||
|
||||
Path logDir = createDirectory(dataDir, "logs");
|
||||
settings.setLogFile(logDir.resolve(timestampedFileName("knowledgeBaseUpdate", "log")).toString());
|
||||
settings.setErrorLogFile(logDir.resolve(timestampedFileName("knowledgeBaseUpdate.error", "log")).toString());
|
||||
}
|
||||
|
||||
private Path createDirectory(Path parent, String... children) throws IOException {
|
||||
Path dir = parent;
|
||||
for (String child : children) {
|
||||
dir = dir.resolve(child);
|
||||
}
|
||||
Files.createDirectories(dir);
|
||||
return dir;
|
||||
}
|
||||
|
||||
|
||||
//Multiple changes from 1.4 to 1.5 will occur
|
||||
//update migration model
|
||||
|
|
@ -473,15 +483,11 @@ public class UpdateKnowledgeBase implements ServletContextListener {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void contextDestroyed(ServletContextEvent arg0) {
|
||||
// nothing to do
|
||||
}
|
||||
|
||||
public static String getAskUpdatedQueryPath(ServletContext ctx) {
|
||||
return ctx.getRealPath(ASK_QUERY_FILE);
|
||||
|
||||
}
|
||||
|
||||
private static String timestampedFileName(String prefix, String suffix) {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-sss");
|
||||
return prefix + "." + sdf.format(new Date()) + "." + suffix;
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ public class UpdatePermissionSetUris implements ServletContextListener {
|
|||
File homeDirectory = new File(homeDirectoryPath);
|
||||
confirmIsDirectory(homeDirectory);
|
||||
|
||||
File upgradeDirectory = createDirectory(homeDirectory, "upgrade");
|
||||
File upgradeDirectory = createDirectory(homeDirectory, "upgrade/permissions");
|
||||
String filename = timestampedFilename("UpgradePermissionSetUris",
|
||||
".txt");
|
||||
this.file = new File(upgradeDirectory, filename);
|
||||
|
|
|
|||
|
|
@ -1,234 +0,0 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.json.JsonServlet;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
|
||||
import edu.cornell.mannlib.vitro.webapp.utils.JsonToFmModel;
|
||||
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
|
||||
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel;
|
||||
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
|
||||
|
||||
public class BrowseDataGetter implements PageDataGetter {
|
||||
final static Log log = LogFactory.getLog(BrowseDataGetter.class);
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getData(ServletContext context,
|
||||
VitroRequest vreq, String pageUri, Map<String, Object> page) {
|
||||
try{
|
||||
Map params = vreq.getParameterMap();
|
||||
|
||||
Mode mode = getMode( vreq, params );
|
||||
switch( mode ){
|
||||
case VCLASS_ALPHA:
|
||||
return doClassAlphaDisplay(params,vreq,context);
|
||||
case CLASS_GROUP:
|
||||
return doClassGroupDisplay(params, vreq, context);
|
||||
case VCLASS:
|
||||
return doClassDisplay(params, vreq, context);
|
||||
case ALL_CLASS_GROUPS:
|
||||
return doAllClassGroupsDisplay( params, page, vreq, context);
|
||||
default:
|
||||
return doAllClassGroupsDisplay( params, page, vreq, context);
|
||||
}
|
||||
}catch(Throwable th){
|
||||
log.error(th,th);
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
return DisplayVocabulary.HOME_PAGE_TYPE;
|
||||
}
|
||||
|
||||
//Get data servuice
|
||||
@Override
|
||||
public String getDataServiceUrl() {
|
||||
return UrlBuilder.getUrl("/dataservice?getSolrIndividualsByVClass=1&vclassId=");
|
||||
}
|
||||
private Map<String, Object> doClassAlphaDisplay( Map params, VitroRequest request, ServletContext context) throws Exception {
|
||||
Map<String,Object> body = new HashMap<String,Object>();
|
||||
body.putAll(getCommonValues(context, request));
|
||||
body.putAll(getClassAlphaValues(params,request,context));
|
||||
return body;
|
||||
}
|
||||
|
||||
private Map<String,Object> getClassAlphaValues( Map params, VitroRequest request, ServletContext context) throws Exception{
|
||||
Map<String,Object> map= new HashMap<String,Object>();
|
||||
|
||||
String classUri = getParam(Mode.VCLASS, request, params);
|
||||
VitroRequest vreq = new VitroRequest(request);
|
||||
VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
|
||||
map.put("class", new VClassTemplateModel(vclass));
|
||||
|
||||
JSONObject vclassRes = JsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context);
|
||||
map.put("totalCount", JsonToFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") ));
|
||||
map.put("alpha", JsonToFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") ));
|
||||
map.put("individuals", JsonToFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") ));
|
||||
map.put("pages", JsonToFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") ));
|
||||
map.put("letters", JsonToFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") ));
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
private Map<String,Object> getCommonValues( ServletContext context, VitroRequest vreq){
|
||||
Map<String,Object> values = new HashMap<String,Object>();
|
||||
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
|
||||
List<VClassGroup> cgList = vcgc.getGroups();
|
||||
LinkedList<VClassGroupTemplateModel> cgtmList = new LinkedList<VClassGroupTemplateModel>();
|
||||
for( VClassGroup classGroup : cgList){
|
||||
cgtmList.add( new VClassGroupTemplateModel( classGroup ));
|
||||
}
|
||||
values.put("vClassGroups",cgtmList);
|
||||
|
||||
return values;
|
||||
}
|
||||
|
||||
protected Map<String, Object> doAllClassGroupsDisplay( Map params, Map<String, Object> page, VitroRequest request, ServletContext context) {
|
||||
Map<String,Object> body = new HashMap<String,Object>();
|
||||
body.putAll(getCommonValues(context,request));
|
||||
body.putAll(getAllClassGroupData(request, params, page, context));
|
||||
|
||||
return body;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a list of all VClassGroups with vclasses with individual counts.
|
||||
* @param params2
|
||||
*/
|
||||
protected Map<String,Object> getAllClassGroupData(VitroRequest request, Map params, Map<String, Object> page, ServletContext context){
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
return map;
|
||||
}
|
||||
|
||||
protected Map<String, Object> doClassDisplay( Map params,
|
||||
VitroRequest request, ServletContext context) {
|
||||
Map<String,Object> body = new HashMap<String,Object>();
|
||||
|
||||
body.putAll(getCommonValues(context,request));
|
||||
body.putAll(getClassData(request,params,context));
|
||||
|
||||
return body;
|
||||
}
|
||||
|
||||
private Map<String, Object> getClassData(VitroRequest request, Map params, ServletContext context) {
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
|
||||
map.putAll(getClassGroupData(request, params,context));
|
||||
|
||||
String classUri = getParam(Mode.VCLASS, request, params);
|
||||
VitroRequest vreq = new VitroRequest(request);
|
||||
VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
|
||||
map.put("class", new VClassTemplateModel(vclass));
|
||||
|
||||
List<Individual> inds = vreq.getWebappDaoFactory().getIndividualDao()
|
||||
.getIndividualsByVClass(vclass);
|
||||
|
||||
List<ListedIndividual> tInds = new ArrayList<ListedIndividual>(inds.size());
|
||||
for( Individual ind : inds){
|
||||
tInds.add(new ListedIndividual(ind, vreq));
|
||||
}
|
||||
map.put("individualsInClass", tInds);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
protected Map<String, Object> doClassGroupDisplay(Map params, VitroRequest request, ServletContext context) {
|
||||
Map<String,Object> body = new HashMap<String,Object>();
|
||||
body.putAll(getCommonValues(context,request));
|
||||
body.putAll( getClassGroupData(request,params, context));
|
||||
|
||||
return body;
|
||||
}
|
||||
|
||||
protected Map<String, Object> getClassGroupData(VitroRequest request, Map params, ServletContext context) {
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
|
||||
String vcgUri = getParam(Mode.CLASS_GROUP, request, params);
|
||||
VitroRequest vreq = new VitroRequest(request);
|
||||
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(request);
|
||||
VClassGroup vcg = vcgc.getGroup(vcgUri);
|
||||
|
||||
ArrayList<VClassTemplateModel> classes = new ArrayList<VClassTemplateModel>(vcg.size());
|
||||
for( VClass vc : vcg){
|
||||
classes.add(new VClassTemplateModel(vc));
|
||||
}
|
||||
map.put("classes", classes);
|
||||
|
||||
map.put("classGroup", new VClassGroupTemplateModel(vcg));
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
enum Mode{
|
||||
VCLASS_ALPHA("vclassAlpha"),
|
||||
VCLASS("vclassUri"),
|
||||
CLASS_GROUP("classgroupUri"),
|
||||
ALL_CLASS_GROUPS("all");
|
||||
String param;
|
||||
Mode(String param){
|
||||
this.param = param;
|
||||
}
|
||||
}
|
||||
|
||||
protected final static Mode DEFAULT_MODE = Mode.ALL_CLASS_GROUPS;
|
||||
|
||||
protected Mode getMode(VitroRequest request, Map<String, Object> params){
|
||||
for( Mode mode : Mode.values()){
|
||||
String queryParam = request.getParameter( mode.param );
|
||||
if( queryParam != null && !queryParam.isEmpty() ){
|
||||
return mode;
|
||||
}
|
||||
Object obj = params.get( mode.param );
|
||||
String param = obj != null ? obj.toString():null;
|
||||
if( param != null && !param.isEmpty() ){
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
return DEFAULT_MODE;
|
||||
}
|
||||
|
||||
public static String getParam(Mode mode, VitroRequest request, Map params){
|
||||
if( request.getParameter(mode.param) != null )
|
||||
return request.getParameter(mode.param);
|
||||
if( params.get(mode.param) != null )
|
||||
return params.get(mode.param).toString();
|
||||
else
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* For processig of JSONObject
|
||||
*/
|
||||
public JSONObject convertToJSON(Map<String, Object> dataMap, VitroRequest vreq) {
|
||||
JSONObject rObj = null;
|
||||
return rObj;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
|
||||
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
|
||||
|
||||
/**
|
||||
* This will pass these variables to the template:
|
||||
* classGroupUri: uri of the classgroup associated with this page.
|
||||
* vClassGroup: a data structure that is the classgroup associated with this page.
|
||||
*/
|
||||
public class ClassGroupPageData implements PageDataGetter{
|
||||
private static final Log log = LogFactory.getLog(ClassGroupPageData.class);
|
||||
|
||||
@Override
|
||||
public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){
|
||||
HashMap<String, Object> data = new HashMap<String,Object>();
|
||||
String classGroupUri = vreq.getWebappDaoFactory().getPageDao().getClassGroupPage(pageUri);
|
||||
data.put("classGroupUri", classGroupUri);
|
||||
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
|
||||
List<VClassGroup> vcgList = vcgc.getGroups();
|
||||
VClassGroup group = null;
|
||||
for( VClassGroup vcg : vcgList){
|
||||
if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
|
||||
group = vcg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){
|
||||
/*This could be for two reasons: one is that the classgroup doesn't exist
|
||||
* The other is that there are no individuals in any of the classgroup's classes */
|
||||
group = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(classGroupUri);
|
||||
if( group != null ){
|
||||
List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
|
||||
.getPublicGroupsWithVClasses(false, true, false);
|
||||
for( VClassGroup vcg : vcgFullList ){
|
||||
if( classGroupUri.equals(vcg.getURI()) ){
|
||||
group = vcg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( group == null ){
|
||||
log.error("Cannot get classgroup '" + classGroupUri + "' for page '" + pageUri + "'");
|
||||
}else{
|
||||
setAllClassCountsToZero(group);
|
||||
}
|
||||
}else{
|
||||
log.error("classgroup " + classGroupUri + " does not exist in the system");
|
||||
}
|
||||
|
||||
}
|
||||
log.debug("Retrieved class group " + group.getURI() + " and returning to template");
|
||||
//if debug enabled, print out the number of entities within each class in the class gorup
|
||||
if(log.isDebugEnabled()){
|
||||
List<VClass> groupClasses = group.getVitroClassList();
|
||||
for(VClass v: groupClasses) {
|
||||
log.debug("Class " + v.getName() + " - " + v.getURI() + " has " + v.getEntityCount() + " entities");
|
||||
}
|
||||
}
|
||||
data.put("vClassGroup", group); //may put null
|
||||
|
||||
//This page level data getters tries to set its own template,
|
||||
// not all of the data getters need to do this.
|
||||
data.put("bodyTemplate", "page-classgroup.ftl");
|
||||
|
||||
//Also add data service url
|
||||
//Hardcoding for now, need a more dynamic way of doing this
|
||||
data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
|
||||
return data;
|
||||
}
|
||||
|
||||
public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
|
||||
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
|
||||
List<VClassGroup> vcgList = vcgc.getGroups();
|
||||
VClassGroup group = null;
|
||||
for( VClassGroup vcg : vcgList){
|
||||
if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
|
||||
group = vcg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){
|
||||
/*This could be for two reasons: one is that the classgroup doesn't exist
|
||||
* The other is that there are no individuals in any of the classgroup's classes */
|
||||
group = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(classGroupUri);
|
||||
if( group != null ){
|
||||
List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
|
||||
.getPublicGroupsWithVClasses(false, true, false);
|
||||
for( VClassGroup vcg : vcgFullList ){
|
||||
if( classGroupUri.equals(vcg.getURI()) ){
|
||||
group = vcg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( group == null ){
|
||||
log.error("Cannot get classgroup '" + classGroupUri + "'");
|
||||
return null;
|
||||
}else{
|
||||
setAllClassCountsToZero(group);
|
||||
}
|
||||
}else{
|
||||
log.error("classgroup " + classGroupUri + " does not exist in the system");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return new VClassGroupTemplateModel(group);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType(){
|
||||
return PageDataGetterUtils.generateDataGetterTypeURI(ClassGroupPageData.class.getName());
|
||||
}
|
||||
|
||||
//Get data servuice
|
||||
@Override
|
||||
public String getDataServiceUrl() {
|
||||
return UrlBuilder.getUrl("/dataservice?getSolrIndividualsByVClass=1&vclassId=");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* For processing of JSONObject
|
||||
*/
|
||||
//Currently empty, TODO: Review requirements
|
||||
@Override
|
||||
public JSONObject convertToJSON(Map<String, Object> dataMap, VitroRequest vreq) {
|
||||
JSONObject rObj = null;
|
||||
return rObj;
|
||||
}
|
||||
protected static void setAllClassCountsToZero(VClassGroup vcg){
|
||||
for(VClass vc : vcg){
|
||||
vc.setEntityCount(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,316 +0,0 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
|
||||
|
||||
import java.net.URLEncoder;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
|
||||
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
|
||||
|
||||
/**
|
||||
* This will pass these variables to the template:
|
||||
* classGroupUri: uri of the classgroup associated with this page.
|
||||
* vClassGroup: a data structure that is the classgroup associated with this page.
|
||||
*/
|
||||
public class IndividualsForClassesDataGetter implements PageDataGetter{
|
||||
private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
|
||||
protected static String restrictClassesTemplateName = null;
|
||||
@Override
|
||||
public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){
|
||||
this.setTemplateName();
|
||||
HashMap<String, Object> data = new HashMap<String,Object>();
|
||||
//This is the old technique of getting class intersections
|
||||
PageDao pageDao = vreq.getWebappDaoFactory().getPageDao();
|
||||
Map<String, Object> classIntersectionsMap = getClassIntersectionsMap(pageDao, pageUri);
|
||||
|
||||
try{
|
||||
List<String> classes = retrieveClasses(context, classIntersectionsMap);
|
||||
List<String> restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap);
|
||||
log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString());
|
||||
processClassesAndRestrictions(vreq, context, data, classes, restrictClasses);
|
||||
//Also add data service url
|
||||
//Hardcoding for now, need a more dynamic way of doing this
|
||||
data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
|
||||
//this is the class group associated with the data getter utilized for display on menu editing, not the custom one created
|
||||
data.put("classGroupUri", pageDao.getClassGroupPage(pageUri));
|
||||
} catch(Exception ex) {
|
||||
log.error("An error occurred retrieving Vclass Intersection individuals", ex);
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
protected void setTemplateName() {
|
||||
this.restrictClassesTemplateName = "restricted";
|
||||
}
|
||||
|
||||
protected Map<String, Object> getClassIntersectionsMap(PageDao pageDao,
|
||||
String pageUri) {
|
||||
// TODO Auto-generated method stub
|
||||
return pageDao.getClassesAndRestrictionsForPage(pageUri);
|
||||
}
|
||||
|
||||
protected List<String> retrieveClasses(
|
||||
ServletContext context, Map<String, Object> classIntersectionsMap) {
|
||||
List<String> restrictClasses = (List<String>) classIntersectionsMap.get("classes");
|
||||
return restrictClasses;
|
||||
}
|
||||
|
||||
protected List<String> retrieveRestrictClasses(
|
||||
ServletContext context, Map<String, Object> classIntersectionsMap) {
|
||||
List<String> restrictClasses = (List<String>) classIntersectionsMap.get("restrictClasses");
|
||||
return restrictClasses;
|
||||
}
|
||||
|
||||
protected void processClassesAndRestrictions(VitroRequest vreq, ServletContext context,
|
||||
HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
|
||||
processClassesForDisplay(vreq, context, data, classes);
|
||||
processRestrictionClasses(vreq, context, data, restrictClasses);
|
||||
processIntersections(vreq, context, data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
//At this point, data specifices whether or not intersections included
|
||||
private void processIntersections(VitroRequest vreq,
|
||||
ServletContext context, HashMap<String, Object> data) {
|
||||
VClassGroup classesGroup = (VClassGroup) data.get("vClassGroup");
|
||||
List<VClass> vclassList = classesGroup.getVitroClassList();
|
||||
List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses");
|
||||
//if there are restrict classes, then update counts
|
||||
if(restrictClasses.size() > 0) {
|
||||
log.debug("Restriction classes exist");
|
||||
List<VClass> newVClassList = new ArrayList<VClass>();
|
||||
//Iterate through vclasses and get updated counts, iterated and saved in same order as initially included
|
||||
for(VClass v: vclassList) {
|
||||
int oldCount = v.getEntityCount();
|
||||
//Making a copy so as to ensure we don't touch the values in the cache
|
||||
VClass copyVClass = makeCopyVClass(v);
|
||||
int count = retrieveCount(vreq, context, v, restrictClasses);
|
||||
if(oldCount != count) {
|
||||
log.debug("Old count was " + v.getEntityCount() + " and New count for " + v.getURI() + " is " + count);
|
||||
copyVClass.setEntityCount(count);
|
||||
}
|
||||
newVClassList.add(copyVClass);
|
||||
}
|
||||
classesGroup.setVitroClassList(newVClassList);
|
||||
//TODO: Do we need to do this again or will this already be reset?
|
||||
data.put("vClassGroup", classesGroup);
|
||||
}
|
||||
}
|
||||
|
||||
private VClass makeCopyVClass(VClass v) {
|
||||
VClass copyVClass = new VClass(v.getURI());
|
||||
copyVClass.setLocalName(copyVClass.getLocalName());
|
||||
copyVClass.setDisplayRank(v.getDisplayRank());
|
||||
copyVClass.setName(v.getName());
|
||||
copyVClass.setNamespace(v.getNamespace());
|
||||
copyVClass.setEntityCount(v.getEntityCount());
|
||||
return copyVClass;
|
||||
}
|
||||
|
||||
//update class count based on restrict classes
|
||||
private int retrieveCount(VitroRequest vreq, ServletContext context, VClass v, List<VClass> restrictClasses) {
|
||||
//Execute solr query that returns only count of individuals
|
||||
log.debug("Entity count is " + v.getEntityCount());
|
||||
List<String> classUris = new ArrayList<String>();
|
||||
classUris.add(v.getURI());
|
||||
for(VClass r: restrictClasses) {
|
||||
classUris.add(r.getURI());
|
||||
}
|
||||
long count = PageDataGetterUtils.getIndividualCountForIntersection(vreq, context, classUris);
|
||||
return new Long(count).intValue();
|
||||
|
||||
}
|
||||
|
||||
private void processClassesForDisplay(VitroRequest vreq, ServletContext context, HashMap<String, Object> data, List<String> classes) {
|
||||
VClassGroup classesGroup = new VClassGroup();
|
||||
classesGroup.setURI("displayClasses");
|
||||
log.debug("Processing classes that will be displayed");
|
||||
List<VClass> vClasses = new ArrayList<VClass>();
|
||||
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
|
||||
for(String classUri: classes) {
|
||||
//Retrieve vclass from cache to get the count
|
||||
VClass vclass = vcgc.getCachedVClass(classUri);
|
||||
//if not found in cache, possibly due to not being in any class group
|
||||
if(vclass == null) {
|
||||
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
|
||||
}
|
||||
if(vclass != null) {
|
||||
log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount());
|
||||
vClasses.add(vclass);
|
||||
} else {
|
||||
log.debug("Vclass " + classUri + " does not exist in the cache");
|
||||
log.error("Error occurred, vclass does not exist for this uri " + classUri);
|
||||
//Throw exception here
|
||||
}
|
||||
}
|
||||
//Sort these classes
|
||||
Collections.sort(vClasses);
|
||||
log.debug("Sorting complete for V Classes");
|
||||
classesGroup.setVitroClassList(vClasses);
|
||||
log.debug("Returning vitro class list in data for template");
|
||||
//Set vclass group
|
||||
data.put("vClassGroup", classesGroup);
|
||||
}
|
||||
|
||||
private void processRestrictionClasses(VitroRequest vreq, ServletContext context,
|
||||
HashMap<String, Object> data, List<String> restrictClasses) {
|
||||
try {
|
||||
VClassGroup restrictClassesGroup = new VClassGroup();
|
||||
restrictClassesGroup.setURI("restrictClasses");
|
||||
|
||||
List<VClass> restrictVClasses = new ArrayList<VClass>();
|
||||
|
||||
List<String> urlEncodedRestrictClasses = new ArrayList<String>();
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
|
||||
|
||||
if(restrictClasses.size() > 0) {
|
||||
//classes for restriction are not displayed so don't need to include their class individual counts
|
||||
for(String restrictClassUri: restrictClasses) {
|
||||
//Also uses cache to remain consistent with process classes and also allow
|
||||
//vclasses to be returned even if switched to display model, although
|
||||
//uris used within display model editing and not vclass objects
|
||||
VClass vclass = vcgc.getCachedVClass(restrictClassUri);
|
||||
//if not found in cache, possibly due to not being in any class group
|
||||
if(vclass == null) {
|
||||
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(restrictClassUri);
|
||||
}
|
||||
if(vclass != null) {
|
||||
log.debug("Found restrict class and adding to list " + restrictClassUri);
|
||||
restrictVClasses.add(vclass);
|
||||
} else {
|
||||
log.error("Error occurred, vclass does not exist for this uri " + restrictClassUri);
|
||||
}
|
||||
//Assuming utf-8?
|
||||
urlEncodedRestrictClasses.add(URLEncoder.encode(restrictClassUri, "UTF-8"));
|
||||
}
|
||||
|
||||
restrictClassesGroup.setVitroClassList(restrictVClasses);
|
||||
restrictClassesGroup.setIndividualCount(restrictVClasses.size());
|
||||
} else {
|
||||
|
||||
}
|
||||
String[] restrictClassesArray = new String[urlEncodedRestrictClasses.size()];
|
||||
restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray);
|
||||
|
||||
//In case just want uris
|
||||
log.debug("Variable name for including restriction classes " + getRestrictClassesTemplateName());
|
||||
data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ","));
|
||||
data.put("restrictVClasses", restrictVClasses);
|
||||
//not sure if this is useful
|
||||
data.put("restrictVClassGroup", restrictClassesGroup);
|
||||
} catch(Exception ex) {
|
||||
log.error("An error occurred in processing restriction classes ", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
|
||||
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
|
||||
List<VClassGroup> vcgList = vcgc.getGroups();
|
||||
VClassGroup group = null;
|
||||
for( VClassGroup vcg : vcgList){
|
||||
if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
|
||||
group = vcg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){
|
||||
/*This could be for two reasons: one is that the classgroup doesn't exist
|
||||
* The other is that there are no individuals in any of the classgroup's classes */
|
||||
group = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(classGroupUri);
|
||||
if( group != null ){
|
||||
List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
|
||||
.getPublicGroupsWithVClasses(false, true, false);
|
||||
for( VClassGroup vcg : vcgFullList ){
|
||||
if( classGroupUri.equals(vcg.getURI()) ){
|
||||
group = vcg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( group == null ){
|
||||
log.error("Cannot get classgroup '" + classGroupUri + "'");
|
||||
return null;
|
||||
}else{
|
||||
setAllClassCountsToZero(group);
|
||||
}
|
||||
}else{
|
||||
log.error("classgroup " + classGroupUri + " does not exist in the system");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return new VClassGroupTemplateModel(group);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType(){
|
||||
return PageDataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
|
||||
}
|
||||
|
||||
//Get data servuice
|
||||
@Override
|
||||
public String getDataServiceUrl() {
|
||||
return UrlBuilder.getUrl("/dataservice?getSolrIndividualsByVClasses=1&vclassId=");
|
||||
}
|
||||
/**
|
||||
* For processig of JSONObject
|
||||
*/
|
||||
@Override
|
||||
public JSONObject convertToJSON(Map<String, Object> map, VitroRequest vreq) {
|
||||
JSONObject rObj = PageDataGetterUtils.processVclassResultsJSON(map, vreq, true);
|
||||
return rObj;
|
||||
}
|
||||
|
||||
protected static void setAllClassCountsToZero(VClassGroup vcg){
|
||||
for(VClass vc : vcg){
|
||||
vc.setEntityCount(0);
|
||||
}
|
||||
}
|
||||
|
||||
protected static String getAlphaParameter(VitroRequest request){
|
||||
return request.getParameter("alpha");
|
||||
}
|
||||
|
||||
protected static int getPageParameter(VitroRequest request) {
|
||||
String pageStr = request.getParameter("page");
|
||||
if( pageStr != null ){
|
||||
try{
|
||||
return Integer.parseInt(pageStr);
|
||||
}catch(NumberFormatException nfe){
|
||||
log.debug("could not parse page parameter");
|
||||
return 1;
|
||||
}
|
||||
}else{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
//Get template parameter
|
||||
private static String getRestrictClassesTemplateName() {
|
||||
return restrictClassesTemplateName;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
public interface PageDataGetter{
|
||||
Map<String,Object> getData(ServletContext contect, VitroRequest vreq, String pageUri, Map<String, Object> page );
|
||||
|
||||
/** Gets the type that this class applies to */
|
||||
//This has been changed to return the class name for data getter used in menu management
|
||||
String getType();
|
||||
|
||||
//get data service url based on data getter requirements
|
||||
//Get data servuice
|
||||
String getDataServiceUrl();
|
||||
|
||||
/**Convert data to JSONObject based on what's required for the data processing**/
|
||||
JSONObject convertToJSON(Map<String, Object> map, VitroRequest vreq);
|
||||
}
|
||||
|
|
@ -1,339 +0,0 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
|
||||
|
||||
import java.net.URLEncoder;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.PageRecord;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.json.JsonServlet;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
|
||||
|
||||
public class PageDataGetterUtils {
|
||||
protected static final String DATA_GETTER_MAP = "pageTypeToDataGetterMap";
|
||||
private static final Log log = LogFactory.getLog(PageDataGetterUtils.class);
|
||||
|
||||
public static Map<String,Object> getDataForPage(String pageUri, VitroRequest vreq, ServletContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
|
||||
//Based on page type get the appropriate data getter
|
||||
Map<String, Object> page = vreq.getWebappDaoFactory().getPageDao().getPage(pageUri);
|
||||
|
||||
Map<String,Object> data = new HashMap<String,Object>();
|
||||
List<PageDataGetter> dataGetters = getPageDataGetterObjects(vreq, pageUri);
|
||||
for(PageDataGetter getter: dataGetters) {
|
||||
try{
|
||||
Map<String,Object> moreData = null;
|
||||
moreData = getAdditionalData(pageUri, getter.getType(), page, vreq, getter, context);
|
||||
if( moreData != null)
|
||||
data.putAll(moreData);
|
||||
}catch(Throwable th){
|
||||
log.error(th,th);
|
||||
}
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Convert data to JSON for page uri based on type and related datagetters
|
||||
* TODO: How to handle different data getters? Will this replace json fields or add to them?
|
||||
* @throws ClassNotFoundException
|
||||
* @throws IllegalAccessException
|
||||
* @throws InstantiationException
|
||||
*/
|
||||
public static JSONObject covertDataToJSONForPage(String pageUri, Map<String, Object> data, VitroRequest vreq, ServletContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
|
||||
//Get PageDataGetter types associated with pageUri
|
||||
JSONObject rObj = null;
|
||||
List<PageDataGetter> dataGetters = getPageDataGetterObjects(vreq, pageUri);
|
||||
for(PageDataGetter getter: dataGetters) {
|
||||
JSONObject typeObj = null;
|
||||
try{
|
||||
typeObj = getter.convertToJSON(data, vreq);
|
||||
if( typeObj != null) {
|
||||
//Copy over everything from this type Obj to
|
||||
//TODO: Review how to handle duplicate keys, etc.
|
||||
if(rObj != null) {
|
||||
//For now, just nests as separate entry
|
||||
rObj.put(getter.getType(), typeObj);
|
||||
} else {
|
||||
rObj = typeObj;
|
||||
}
|
||||
}
|
||||
|
||||
} catch(Throwable th){
|
||||
log.error(th,th);
|
||||
}
|
||||
}
|
||||
return rObj;
|
||||
}
|
||||
|
||||
public static Map<String,Object> getAdditionalData(
|
||||
String pageUri, String dataGetterName, Map<String, Object> page, VitroRequest vreq, PageDataGetter getter, ServletContext context) {
|
||||
if(dataGetterName == null || dataGetterName.isEmpty())
|
||||
return Collections.emptyMap();
|
||||
|
||||
|
||||
if( getter != null ){
|
||||
try{
|
||||
log.debug("Retrieve data for this data getter for " + pageUri);
|
||||
return getter.getData(context, vreq, pageUri, page);
|
||||
}catch(Throwable th){
|
||||
log.error(th,th);
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
} else {
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
}
|
||||
|
||||
/***
|
||||
* For the page, get the actual Data Getters to be employed.
|
||||
* @throws ClassNotFoundException
|
||||
* @throws IllegalAccessException
|
||||
* @throws InstantiationException
|
||||
*/
|
||||
public static List<PageDataGetter> getPageDataGetterObjects(VitroRequest vreq, String pageUri) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
|
||||
List<PageDataGetter> dataGetterObjects = new ArrayList<PageDataGetter>();
|
||||
|
||||
List<String> dataGetterClassNames = vreq.getWebappDaoFactory().getPageDao().getDataGetterClass(pageUri);
|
||||
if( dataGetterClassNames == null )
|
||||
return Collections.emptyList();
|
||||
|
||||
for(String dgClassName: dataGetterClassNames) {
|
||||
String className = getClassNameFromUri(dgClassName);
|
||||
Class<?> clz = Class.forName(className);
|
||||
|
||||
if( PageDataGetter.class.isAssignableFrom(clz)){
|
||||
PageDataGetter pg = (PageDataGetter) clz.newInstance();
|
||||
dataGetterObjects.add(pg);
|
||||
}// else skip if class does not implement PageDataGetter
|
||||
}
|
||||
|
||||
return dataGetterObjects;
|
||||
}
|
||||
|
||||
//Class URIs returned include "java:" and to instantiate object need to remove java: portion
|
||||
public static String getClassNameFromUri(String dataGetterClassUri) {
|
||||
if( !StringUtils.isEmpty(dataGetterClassUri) && dataGetterClassUri.contains("java:")) {
|
||||
String[] splitArray = dataGetterClassUri.split("java:");
|
||||
if(splitArray.length > 1) {
|
||||
return splitArray[1];
|
||||
}
|
||||
}
|
||||
return dataGetterClassUri;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Individual count for Solr query for intersection of multiple classes
|
||||
*/
|
||||
public static long getIndividualCountForIntersection(VitroRequest vreq, ServletContext context, List<String> classUris) {
|
||||
return IndividualListController.getIndividualCount(classUris, vreq.getWebappDaoFactory().getIndividualDao(), context);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Process results related to VClass or vclasses. Handles both single and multiple vclasses being sent.
|
||||
*/
|
||||
public static JSONObject processVclassResultsJSON(Map<String, Object> map, VitroRequest vreq, boolean multipleVclasses) {
|
||||
JSONObject rObj = new JSONObject();
|
||||
VClass vclass=null;
|
||||
|
||||
try {
|
||||
|
||||
// Properties from ontologies used by VIVO - should not be in vitro
|
||||
DataProperty fNameDp = (new DataProperty());
|
||||
fNameDp.setURI("http://xmlns.com/foaf/0.1/firstName");
|
||||
DataProperty lNameDp = (new DataProperty());
|
||||
lNameDp.setURI("http://xmlns.com/foaf/0.1/lastName");
|
||||
DataProperty preferredTitleDp = (new DataProperty());
|
||||
preferredTitleDp.setURI("http://vivoweb.org/ontology/core#preferredTitle");
|
||||
|
||||
if( log.isDebugEnabled() ){
|
||||
@SuppressWarnings("unchecked")
|
||||
Enumeration<String> e = vreq.getParameterNames();
|
||||
while(e.hasMoreElements()){
|
||||
String name = e.nextElement();
|
||||
log.debug("parameter: " + name);
|
||||
for( String value : vreq.getParameterValues(name) ){
|
||||
log.debug("value for " + name + ": '" + value + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//need an unfiltered dao to get firstnames and lastnames
|
||||
WebappDaoFactory fullWdf = vreq.getUnfilteredWebappDaoFactory();
|
||||
|
||||
String[] vitroClassIdStr = vreq.getParameterValues("vclassId");
|
||||
if ( vitroClassIdStr != null && vitroClassIdStr.length > 0){
|
||||
for(String vclassId: vitroClassIdStr) {
|
||||
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassId);
|
||||
if (vclass == null) {
|
||||
log.error("Couldn't retrieve vclass ");
|
||||
throw new Exception ("Class " + vclassId + " not found");
|
||||
}
|
||||
}
|
||||
}else{
|
||||
log.error("parameter vclassId URI parameter expected ");
|
||||
throw new Exception("parameter vclassId URI parameter expected ");
|
||||
}
|
||||
List<String> vclassIds = Arrays.asList(vitroClassIdStr);
|
||||
//if single vclass expected, then include vclass. This relates to what the expected behavior is, not size of list
|
||||
if(!multipleVclasses) {
|
||||
//currently used for ClassGroupPage
|
||||
rObj.put("vclass",
|
||||
new JSONObject().put("URI",vclass.getURI())
|
||||
.put("name",vclass.getName()));
|
||||
} else {
|
||||
//For now, utilize very last VClass (assume that that is the one to be employed)
|
||||
//TODO: Find more general way of dealing with this
|
||||
//put multiple ones in?
|
||||
if(vclassIds.size() > 0) {
|
||||
int numberVClasses = vclassIds.size();
|
||||
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(numberVClasses - 1));
|
||||
rObj.put("vclass", new JSONObject().put("URI",vclass.getURI())
|
||||
.put("name",vclass.getName()));
|
||||
}
|
||||
// rObj.put("vclasses", new JSONObject().put("URIs",vitroClassIdStr)
|
||||
// .put("name",vclass.getName()));
|
||||
}
|
||||
if (vclass != null) {
|
||||
|
||||
rObj.put("totalCount", map.get("totalCount"));
|
||||
rObj.put("alpha", map.get("alpha"));
|
||||
|
||||
List<Individual> inds = (List<Individual>)map.get("entities");
|
||||
log.debug("Number of individuals returned from request: " + inds.size());
|
||||
JSONArray jInds = new JSONArray();
|
||||
for(Individual ind : inds ){
|
||||
JSONObject jo = new JSONObject();
|
||||
jo.put("URI", ind.getURI());
|
||||
jo.put("label",ind.getRdfsLabel());
|
||||
jo.put("name",ind.getName());
|
||||
jo.put("thumbUrl", ind.getThumbUrl());
|
||||
jo.put("imageUrl", ind.getImageUrl());
|
||||
jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq));
|
||||
|
||||
jo.put("mostSpecificTypes", JsonServlet.getMostSpecificTypes(ind,fullWdf));
|
||||
jo.put("preferredTitle", JsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf));
|
||||
|
||||
jInds.put(jo);
|
||||
}
|
||||
rObj.put("individuals", jInds);
|
||||
|
||||
JSONArray wpages = new JSONArray();
|
||||
//Made sure that PageRecord here is SolrIndividualListController not IndividualListController
|
||||
List<PageRecord> pages = (List<PageRecord>)map.get("pages");
|
||||
for( PageRecord pr: pages ){
|
||||
JSONObject p = new JSONObject();
|
||||
p.put("text", pr.text);
|
||||
p.put("param", pr.param);
|
||||
p.put("index", pr.index);
|
||||
wpages.put( p );
|
||||
}
|
||||
rObj.put("pages",wpages);
|
||||
|
||||
JSONArray jletters = new JSONArray();
|
||||
List<String> letters = Controllers.getLetters();
|
||||
for( String s : letters){
|
||||
JSONObject jo = new JSONObject();
|
||||
jo.put("text", s);
|
||||
jo.put("param", "alpha=" + URLEncoder.encode(s, "UTF-8"));
|
||||
jletters.put( jo );
|
||||
}
|
||||
rObj.put("letters", jletters);
|
||||
}
|
||||
} catch(Exception ex) {
|
||||
log.error("Error occurred in processing JSON object", ex);
|
||||
}
|
||||
return rObj;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copied from JSONServlet as expect this to be related to VitroClassGroup
|
||||
*/
|
||||
public static JSONObject processVClassGroupJSON(VitroRequest vreq, ServletContext context, VClassGroup vcg) {
|
||||
JSONObject map = new JSONObject();
|
||||
try {
|
||||
ArrayList<JSONObject> classes = new ArrayList<JSONObject>(vcg.size());
|
||||
for( VClass vc : vcg){
|
||||
JSONObject vcObj = new JSONObject();
|
||||
vcObj.put("name", vc.getName());
|
||||
vcObj.put("URI", vc.getURI());
|
||||
vcObj.put("entityCount", vc.getEntityCount());
|
||||
classes.add(vcObj);
|
||||
}
|
||||
map.put("classes", classes);
|
||||
map.put("classGroupName", vcg.getPublicName());
|
||||
map.put("classGroupUri", vcg.getURI());
|
||||
|
||||
} catch(Exception ex) {
|
||||
log.error("Error occurred in processing VClass group ", ex);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
//Get All VClass Groups information
|
||||
//Used within menu management and processing
|
||||
//TODO: Check if more appropriate location possible
|
||||
public static List<HashMap<String, String>> getClassGroups(HttpServletRequest req) {
|
||||
//Wanted this to be
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(req);
|
||||
List<VClassGroup> vcgList = vcgc.getGroups();
|
||||
//For now encoding as hashmap with label and URI as trying to retrieve class group
|
||||
//results in errors for some reason
|
||||
List<HashMap<String, String>> classGroups = new ArrayList<HashMap<String, String>>();
|
||||
for(VClassGroup vcg: vcgList) {
|
||||
HashMap<String, String> hs = new HashMap<String, String>();
|
||||
hs.put("publicName", vcg.getPublicName());
|
||||
hs.put("URI", vcg.getURI());
|
||||
classGroups.add(hs);
|
||||
}
|
||||
return classGroups;
|
||||
}
|
||||
|
||||
//Return data getter type to be employed in display model
|
||||
public static String generateDataGetterTypeURI(String dataGetterClassName) {
|
||||
return "java:" + dataGetterClassName;
|
||||
}
|
||||
|
||||
//TODO: Check whether this needs to be put here or elsewhere, as this is data getter specific
|
||||
//with respect to class groups
|
||||
//Need to use VClassGroupCache to retrieve class group information - this is the information returned from "for class group"
|
||||
public static void getClassGroupForDataGetter(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData) {
|
||||
//Get the class group from VClassGroup, this is the same as the class group for the class group page data getter
|
||||
//and the associated class group (not custom) for individuals datagetter
|
||||
String classGroupUri = (String) pageData.get("classGroupUri");
|
||||
VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(req);
|
||||
VClassGroup group = vcgc.getGroup(classGroupUri);
|
||||
|
||||
templateData.put("classGroup", group);
|
||||
templateData.put("associatedPage", group.getPublicName());
|
||||
templateData.put("associatedPageURI", group.getURI());
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue