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

Browse source
This commit is contained in:
hjkhjk54 2011-11-04 14:18:26 +00:00
parent d1ecaccc5b
commit 693ac3db8f
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
View file

@ -139,7 +139,10 @@ public class EditConfigurationUtils {
//is data property or vitro label //is data property or vitro label
public static boolean isDataProperty(String predicateUri, VitroRequest vreq) { public static boolean isDataProperty(String predicateUri, VitroRequest vreq) {
if(predicateUri == null) {
log.debug("Predicate URI is null so not data property");
return false;
}
if(isVitroLabel(predicateUri)) { if(isVitroLabel(predicateUri)) {
return true; return true;
} }
@ -152,6 +155,10 @@ public class EditConfigurationUtils {
} }
//is object property //is object property
public static boolean isObjectProperty(String predicateUri, VitroRequest vreq) { public static boolean isObjectProperty(String predicateUri, VitroRequest vreq) {
if(predicateUri == null) {
log.debug("Predicate URI is null so not object property");
return false;
}
WebappDaoFactory wdf = vreq.getWebappDaoFactory(); WebappDaoFactory wdf = vreq.getWebappDaoFactory();
ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri); ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
DataProperty dp = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri); DataProperty dp = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);

8
webapp/web/edit/editRequestDispatch.jsp
View file

@ -30,9 +30,15 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
//forward to Edit Request Dispatch Controller //forward to Edit Request Dispatch Controller
String queryString = request.getQueryString(); String queryString = request.getQueryString();
//Instead of edit request which is what we'll do later, here we'll forward to Menu Management Controller //Instead of edit request which is what we'll do later, here we'll forward to Menu Management Controller
//response.sendRedirect("editRequestDispatch?" + queryString);
response.sendRedirect(request.getContextPath() + "/editDisplayModel?" + queryString); response.sendRedirect(request.getContextPath() + "/editDisplayModel?" + queryString);
} }
//This is our way fo being able to test the new edit configuration
//TODO: Remove this when testing done
if(request.getParameter("testEdit") != null) {
String queryString = request.getQueryString();
response.sendRedirect(request.getContextPath() + "/editRequestDispatch?" + queryString);
}
/* /*
Decide which form to forward to, set subjectUri, subjectUriJson, predicateUri, and predicateUriJson in request. Decide which form to forward to, set subjectUri, subjectUriJson, predicateUri, and predicateUriJson in request.
Also get the Individual for the subjectUri and put it in the request scope. Also get the Individual for the subjectUri and put it in the request scope.