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

NIHVIVO-803 ReorderController doesn't need to set datatype explicitly, because it's done by the data property statement insertion method

Browse source
This commit is contained in:
rjy7 2010-08-20 21:18:12 +00:00
parent 15aeaaa2ae
commit ff1e62c0a9
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java
View file

@ -2,19 +2,14 @@
package edu.cornell.mannlib.vitro.webapp.controller.edit;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@ -74,14 +69,6 @@ public class ReorderController extends PrimitiveRdfEdit {
return;
}
DataPropertyDao dpDao = wadf.getDataPropertyDao();
if( dpDao == null) {
errorMsg = "No DataPropertyDao available";
log.error(errorMsg);
doError(response, errorMsg, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
}
//check permissions
//TODO: (bdc34)This is not yet implemented, must check the IDs against the policies for permissons before doing an edit!
// rjy7 This should be inherited from the superclass
@ -92,9 +79,6 @@ public class ReorderController extends PrimitiveRdfEdit {
return;
}
DataProperty dprop = dpDao.getDataPropertyByURI(rankPredicate);
String rangeDatatype = dprop.getRangeDatatypeURI();
// This may not be the most efficient way. Should we instead build up a Model of retractions and additions, so
// we only hit the database once?
int counter = 1;
@ -102,10 +86,9 @@ public class ReorderController extends PrimitiveRdfEdit {
// Retract all existing rank statements for this individual
dpsDao.deleteDataPropertyStatementsForIndividualByDataProperty(individualUri, rankPredicate);
// Then add the new rank statement for this individuals
DataPropertyStatement dps = new DataPropertyStatementImpl(individualUri, rankPredicate, String.valueOf(counter));
dps.setDatatypeURI(rangeDatatype);
dpsDao.insertNewDataPropertyStatement(dps);
// Then add the new rank statement for this individual
// insertNewDataPropertyStatement will insert the rangeDatatype of the property, so we don't need to set that here.
dpsDao.insertNewDataPropertyStatement(new DataPropertyStatementImpl(individualUri, rankPredicate, String.valueOf(counter)));
counter++;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
View file

@ -291,7 +291,7 @@ public class AutocompleteController extends FreemarkerHttpServlet implements Sea
boolQuery.add(wildcardQuery, BooleanClause.Occur.SHOULD);
log.debug("Name query is: " + boolQuery.toString());
; } catch (ParseException e) {
} catch (ParseException e) {
log.error(e, e);
}