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

VIVO-212 Rename WADF access methods on VitroRequest

Browse source 
Use the term Unfiltered instead of Full, for consistency with other places in Vitro.
This commit is contained in:
j2blake 2013-07-18 13:29:24 -04:00
parent b1fc49bc05
commit d667f63632
3 changed files with 12 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
View file

@ -3,14 +3,10 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -23,12 +19,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
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.dao.jena.QueryUtils;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
public class ManageGrantsForIndividualController extends FreemarkerHttpServlet { public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
@ -52,11 +46,7 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
body.put("subjectUri", subjectUri); body.put("subjectUri", subjectUri);
if (vreq.getAssertionsWebappDaoFactory() != null) { vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
vcDao = vreq.getAssertionsWebappDaoFactory().getVClassDao();
} else {
vcDao = vreq.getFullWebappDaoFactory().getVClassDao();
}
HashMap<String, List<Map<String,String>>> grants = getGrants(subjectUri, vreq); HashMap<String, List<Map<String,String>>> grants = getGrants(subjectUri, vreq);
log.debug("grants = " + grants); log.debug("grants = " + grants);
@ -104,7 +94,7 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
RDFNode subclassUri= soln.get("subclass"); RDFNode subclassUri= soln.get("subclass");
if ( subclassUri != null ) { if ( subclassUri != null ) {
String subclassUriStr = soln.get("subclass").toString(); String subclassUriStr = soln.get("subclass").toString();
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr); VClass vClass = vcDao.getVClassByURI(subclassUriStr);
String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName()); String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
if(!subclassToGrants.containsKey(subclass)) { if(!subclassToGrants.containsKey(subclass)) {
subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information

18
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
View file

@ -3,14 +3,10 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -23,12 +19,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
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.dao.jena.QueryUtils;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet { public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet {
@ -52,11 +46,7 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet
body.put("subjectUri", subjectUri); body.put("subjectUri", subjectUri);
if (vreq.getAssertionsWebappDaoFactory() != null) { vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
vcDao = vreq.getAssertionsWebappDaoFactory().getVClassDao();
} else {
vcDao = vreq.getFullWebappDaoFactory().getVClassDao();
}
HashMap<String, List<Map<String,String>>> people = getPeople(subjectUri, vreq); HashMap<String, List<Map<String,String>>> people = getPeople(subjectUri, vreq);
log.debug("people = " + people); log.debug("people = " + people);
@ -100,7 +90,7 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet
RDFNode subclassUri= soln.get("subclass"); RDFNode subclassUri= soln.get("subclass");
if ( subclassUri != null ) { if ( subclassUri != null ) {
String subclassUriStr = soln.get("subclass").toString(); String subclassUriStr = soln.get("subclass").toString();
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr); VClass vClass = vcDao.getVClassByURI(subclassUriStr);
String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName()); String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
if(!subclassToPeople.containsKey(subclass)) { if(!subclassToPeople.containsKey(subclass)) {
subclassToPeople.put(subclass, new ArrayList<Map<String,String>>()); subclassToPeople.put(subclass, new ArrayList<Map<String,String>>());

18
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
View file

@ -3,14 +3,10 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -23,12 +19,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
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.dao.jena.QueryUtils;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
public class ManagePublicationsForIndividualController extends FreemarkerHttpServlet { public class ManagePublicationsForIndividualController extends FreemarkerHttpServlet {
@ -52,11 +46,7 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
body.put("subjectUri", subjectUri); body.put("subjectUri", subjectUri);
if (vreq.getAssertionsWebappDaoFactory() != null) { vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
vcDao = vreq.getAssertionsWebappDaoFactory().getVClassDao();
} else {
vcDao = vreq.getFullWebappDaoFactory().getVClassDao();
}
HashMap<String, List<Map<String,String>>> publications = getPublications(subjectUri, vreq); HashMap<String, List<Map<String,String>>> publications = getPublications(subjectUri, vreq);
log.debug("publications = " + publications); log.debug("publications = " + publications);
@ -103,7 +93,7 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
RDFNode subclassUri= soln.get("subclass"); RDFNode subclassUri= soln.get("subclass");
if ( subclassUri != null ) { if ( subclassUri != null ) {
String subclassUriStr = soln.get("subclass").toString(); String subclassUriStr = soln.get("subclass").toString();
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr); VClass vClass = vcDao.getVClassByURI(subclassUriStr);
subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName()); subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
} }
else { else {