diff --git a/webapp/web/edit/forms/datapropStmtDelete.jsp b/webapp/web/edit/forms/datapropStmtDelete.jsp index 6786cea6e..211f64822 100644 --- a/webapp/web/edit/forms/datapropStmtDelete.jsp +++ b/webapp/web/edit/forms/datapropStmtDelete.jsp @@ -59,9 +59,8 @@ Model model = (Model)application.getAttribute("jenaOntModel"); String vitroNsProp = vreq.getParameter("vitroNsProp"); - boolean isVitroNsProp = vitroNsProp != null && vitroNsProp.equals("true") ? true : false; - DataPropertyStatement dps = RdfLiteralHash.getPropertyStmtByHash(subject, predicateUri, dataHash, model, isVitroNsProp); + DataPropertyStatement dps = RdfLiteralHash.getPropertyStmtByHash(subject, predicateUri, dataHash, model); if( log.isDebugEnabled() ){ log.debug("attempting to delete dataPropertyStatement: subjectURI <" + dps.getIndividualURI() +">"); @@ -84,21 +83,8 @@ //do the delete if( request.getParameter("y") != null ) { - if( isVitroNsProp ){ - OntModel writeModel = (new StandardModelSelector()).getModel(request, application); - writeModel.enterCriticalSection(Lock.WRITE); - try{ - writeModel.getBaseModel().notifyEvent(new EditEvent(editorUri,true)); - writeModel.remove( - writeModel.getResource(subjectUri), - writeModel.getProperty(predicateUri), - writeModel.createTypedLiteral(dps.getData(), dps.getDatatypeURI())); - }finally{ - writeModel.leaveCriticalSection(); - } - }else{ - wdf.getDataPropertyStatementDao().deleteDataPropertyStatement(dps); - } + + wdf.getDataPropertyStatementDao().deleteDataPropertyStatement(dps); %> <%-- grab the predicate URI and trim it down to get the Local Name so we can send the user back to the appropriate property --%> diff --git a/webapp/web/edit/forms/rdfsLabelForm.jsp b/webapp/web/edit/forms/rdfsLabelForm.jsp index df987c0bb..410254a31 100644 --- a/webapp/web/edit/forms/rdfsLabelForm.jsp +++ b/webapp/web/edit/forms/rdfsLabelForm.jsp @@ -5,6 +5,7 @@ <%@ page import="com.hp.hpl.jena.rdf.model.Literal"%> <%@ page import="com.hp.hpl.jena.rdf.model.Model"%> +<%@ page import="com.hp.hpl.jena.vocabulary.XSD"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%> @@ -48,7 +49,7 @@ Individual subject = (Individual)vreq.getAttribute("subject"); if( subject == null ) { - throw new Error("In defaultVitroNsPropForm.jsp, could not find subject " + subjectUri); + throw new Error("In rdfsLabelForm.jsp, could not find subject " + subjectUri); } Model model = (Model)application.getAttribute("jenaOntModel"); @@ -61,22 +62,22 @@ rangeDatatypeUri = dps.getDatatypeURI(); if (rangeDatatypeUri == null) { - log.debug("no range datatype uri set on vitro namespace property statement for property " + predicateUri + "in defaultVitroNsPropForm.jsp"); + log.debug("no range datatype uri set on rdfs:label statement for property " + predicateUri + "in rdfsLabelForm.jsp"); } else { - log.debug("range datatype uri of [" + rangeDatatypeUri + "] on vitro namespace property statement for property " + predicateUri + "in defaultVitroNsPropForm.jsp"); + log.debug("range datatype uri of [" + rangeDatatypeUri + "] on rdfs:label statement for property " + predicateUri + "in rdfsLabelForm.jsp"); } rangeLang = dps.getLanguage(); if( rangeLang == null ) { - log.debug("no language attribute on vitro namespace property statement for property " + predicateUri + "in defaultVitroNsPropForm.jsp"); + log.debug("no language attribute on rdfs:label statement for property " + predicateUri + "in rdfsLabelForm.jsp"); rangeLang = ""; } else { - log.debug("language attribute of ["+rangeLang+"] on vitro namespace property statement for property " + predicateUri + "in defaultVitroNsPropForm.jsp"); + log.debug("language attribute of ["+rangeLang+"] on rdfs:label statement for property " + predicateUri + "in rdfsLabelForm.jsp"); } } else { - log.debug("No incoming vitro namespace property statement for property "+predicateUri+"; adding a new statement"); - rangeDatatypeUri = FrontEndEditingUtils.getVitroNsPropDatatypeUri(predicateUri); + log.debug("No incoming rdfs:label statement for property "+predicateUri+"; adding a new statement"); + rangeDatatypeUri = XSD.xstring.getURI(); } String rangeDatatypeUriJson = rangeDatatypeUri == null ? "" : MiscWebUtils.escape(rangeDatatypeUri); diff --git a/webapp/web/edit/n3Delete.jsp b/webapp/web/edit/n3Delete.jsp index 78ddcb1e8..7f74b88c6 100644 --- a/webapp/web/edit/n3Delete.jsp +++ b/webapp/web/edit/n3Delete.jsp @@ -58,7 +58,7 @@ List errorMessages = new ArrayList(); - EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request,queryParameters); + EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request); if( editConfig == null ){ %><% }