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

NIHVIVO-2540 Fixed compile errors in 3 jsps.

Browse source
This commit is contained in:
ryounes 2011-04-25 17:27:05 +00:00
parent ac55760a5a
commit e7e9507d58
3 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
webapp/web/edit/forms/datapropStmtDelete.jsp
View file

@ -59,9 +59,8 @@
Model model = (Model)application.getAttribute("jenaOntModel"); Model model = (Model)application.getAttribute("jenaOntModel");
String vitroNsProp = vreq.getParameter("vitroNsProp"); 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() ){ if( log.isDebugEnabled() ){
log.debug("attempting to delete dataPropertyStatement: subjectURI <" + dps.getIndividualURI() +">"); log.debug("attempting to delete dataPropertyStatement: subjectURI <" + dps.getIndividualURI() +">");
@ -84,21 +83,8 @@
//do the delete //do the delete
if( request.getParameter("y") != null ) { if( request.getParameter("y") != null ) {
if( isVitroNsProp ){
OntModel writeModel = (new StandardModelSelector()).getModel(request, application); wdf.getDataPropertyStatementDao().deleteDataPropertyStatement(dps);
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);
}
%> %>
<%-- grab the predicate URI and trim it down to get the Local Name so we can send the user back to the appropriate property --%> <%-- grab the predicate URI and trim it down to get the Local Name so we can send the user back to the appropriate property --%>

15
webapp/web/edit/forms/rdfsLabelForm.jsp
View file

@ -5,6 +5,7 @@
<%@ page import="com.hp.hpl.jena.rdf.model.Literal"%> <%@ page import="com.hp.hpl.jena.rdf.model.Literal"%>
<%@ page import="com.hp.hpl.jena.rdf.model.Model"%> <%@ 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.beans.Individual"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%>
@ -48,7 +49,7 @@
Individual subject = (Individual)vreq.getAttribute("subject"); Individual subject = (Individual)vreq.getAttribute("subject");
if( subject == null ) { 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"); Model model = (Model)application.getAttribute("jenaOntModel");
@ -61,22 +62,22 @@
rangeDatatypeUri = dps.getDatatypeURI(); rangeDatatypeUri = dps.getDatatypeURI();
if (rangeDatatypeUri == null) { 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 { } 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(); rangeLang = dps.getLanguage();
if( rangeLang == null ) { 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 = ""; rangeLang = "";
} else { } 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 { } else {
log.debug("No incoming vitro namespace property statement for property "+predicateUri+"; adding a new statement"); log.debug("No incoming rdfs:label statement for property "+predicateUri+"; adding a new statement");
rangeDatatypeUri = FrontEndEditingUtils.getVitroNsPropDatatypeUri(predicateUri); rangeDatatypeUri = XSD.xstring.getURI();
} }
String rangeDatatypeUriJson = rangeDatatypeUri == null ? "" : MiscWebUtils.escape(rangeDatatypeUri); String rangeDatatypeUriJson = rangeDatatypeUri == null ? "" : MiscWebUtils.escape(rangeDatatypeUri);

2
webapp/web/edit/n3Delete.jsp
View file

@ -58,7 +58,7 @@
List<String> errorMessages = new ArrayList<String>(); List<String> errorMessages = new ArrayList<String>();
EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request,queryParameters); EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
if( editConfig == null ){ if( editConfig == null ){
%><jsp:forward page="/edit/messages/noEditConfigFound.jsp"/><% %><jsp:forward page="/edit/messages/noEditConfigFound.jsp"/><%
} }