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

NIHVIVO-149 Mechanism for modifying vitro namespace properties based on data property editing

Browse source 
NIHVIVO-142 Added edit link to name field on individual page; currently routes to a dummy page
This commit is contained in:
rjy7 2010-03-11 18:59:11 +00:00
parent 7c8fa0f544
commit 30663a3932
9 changed files with 643 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
webapp/web/edit/editDatapropStmtRequestDispatch.jsp
View file

@ -70,21 +70,26 @@
Individual subject = wdf.getIndividualDao().getIndividualByURI(subjectUri);
if( subject == null ) {
log.error("Could not find subject Individual '"+subjectUri+"' in model");
throw new Error("editDatapropStmtRequest.jsp: Could not find subject Individual in model: '" + subjectUri + "'");
throw new Error("editDatapropStmtRequestDispatch.jsp: Could not find subject Individual in model: '" + subjectUri + "'");
}
vreq.setAttribute("subject", subject);
DataProperty dataproperty = wdf.getDataPropertyDao().getDataPropertyByURI( predicateUri );
if( dataproperty == null ) {
log.error("Could not find data property '"+predicateUri+"' in model");
throw new Error("editDatapropStmtRequest.jsp: Could not find DataProperty in model: " + predicateUri);
if( dataproperty == null) {
// We must have either a dataproperty or a custom form
// A custom form is used for a vitro namespace property
if (formParam == null) {
log.error("Could not find data property '"+predicateUri+"' in model");
throw new Error("editDatapropStmtRequest.jsp: Could not find DataProperty in model: " + predicateUri);
}
}
else {
vreq.setAttribute("predicate", dataproperty);
}
vreq.setAttribute("predicate", dataproperty);
String url= "/edit/editDatapropStmtRequestDispatch.jsp"; //I'd like to get this from the request but...
vreq.setAttribute("formUrl", url + "?" + vreq.getQueryString());
String datapropKeyStr = vreq.getParameter("datapropKey");
int dataHash = 0;
if( datapropKeyStr != null ){
@ -99,7 +104,7 @@
DataPropertyStatement dps = null;
if( dataHash != 0) {
dps = RdfLiteralHash.getDataPropertyStmtByHash( subject ,dataHash);
dps = RdfLiteralHash.getDataPropertyStmtByHash(subject, dataHash);
if (dps==null) {
log.error("No match to existing data property \""+predicateUri+"\" statement for subject \""+subjectUri+"\" via key "+datapropKeyStr);
@ -112,7 +117,7 @@
if( log.isDebugEnabled() ){
log.debug("predicate for DataProperty from request is " + dataproperty.getURI() + " with rangeDatatypeUri of '" + dataproperty.getRangeDatatypeURI() + "'");
if( dps == null )
log.debug("no exisitng DataPropertyStatement statement was found, making a new statemet");
log.debug("no existng DataPropertyStatement statement was found, making a new statemet");
else{
log.debug("Found an existing DataPropertyStatement");
String msg = "existing datapropstmt: ";
@ -141,7 +146,7 @@
} else {
form = DEFAULT_DATA_FORM;
}
vreq.setAttribute("form" ,form);
vreq.setAttribute("form", form);
} else {
vreq.setAttribute("form", formParam);
}