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

Adding debug message on predicate skip in EditRquestDispatchController

Browse source
This commit is contained in:
briancaruso 2011-12-06 16:28:37 +00:00
parent 78607710de
commit 12fbb1a984
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
View file

@ -20,6 +20,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.beans.Property;
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.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.DirectRedirectResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.DirectRedirectResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
@ -78,6 +80,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
//if edit form needs to be skipped to object instead //if edit form needs to be skipped to object instead
if(isSkipPredicate(vreq)) { if(isSkipPredicate(vreq)) {
log.debug("The predicate is a annotated as a skip.");
return processSkipEditForm(vreq); return processSkipEditForm(vreq);
} }
@ -255,17 +258,15 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
return (isEditOfExistingStmt && (wdf.getObjectPropertyDao().skipEditForm(predicateUri))); return (isEditOfExistingStmt && (wdf.getObjectPropertyDao().skipEditForm(predicateUri)));
} }
//TODO: Implement below correctly or integrate
private ResponseValues processSkipEditForm(VitroRequest vreq) { private ResponseValues processSkipEditForm(VitroRequest vreq) {
String redirectPage = vreq.getContextPath() + "/individual"; ParamMap params = new ParamMap();
String objectUri = EditConfigurationUtils.getObjectUri(vreq); params.put("uri",EditConfigurationUtils.getObjectUri(vreq));
String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); params.put("relatedSubjectUri",EditConfigurationUtils.getSubjectUri(vreq));
String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); params.put("relatingPredicateUri",EditConfigurationUtils.getPredicateUri(vreq));
redirectPage += "uri=" + URLEncoder.encode(objectUri) +
"&relatedSubjectUri=" + URLEncoder.encode(subjectUri) +
"&relatingPredicateUri=" + URLEncoder.encode(predicateUri);
return new RedirectResponseValues(redirectPage, HttpServletResponse.SC_SEE_OTHER);
return new DirectRedirectResponseValues(
UrlBuilder.getUrl(UrlBuilder.Route.INDIVIDUAL, params),
HttpServletResponse.SC_SEE_OTHER);
} }
//Check error conditions //Check error conditions