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

NIHVIVO-3972 preventing prefix collision in RDFUploadController

Browse source
This commit is contained in:
brianjlowe 2012-09-26 20:04:00 +00:00
parent 6314cd364d
commit d7605de8d2
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
View file

@ -38,6 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils; import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils;
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph;
import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent;
import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest; import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
@ -102,6 +103,11 @@ public class RDFUploadController extends JenaIngestController {
? getABoxModel(request.getSession(), getServletContext()) ? getABoxModel(request.getSession(), getServletContext())
: ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); : ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
log.info(uploadModel.getNsPrefixMap().size());
for (String key : uploadModel.getNsPrefixMap().keySet()) {
log.info(key + " => " + uploadModel.getNsPrefixMap().get(key));
}
/* ********************* GET RDF by URL ********************** */ /* ********************* GET RDF by URL ********************** */
String RDFUrlStr = request.getParameter("rdfUrl"); String RDFUrlStr = request.getParameter("rdfUrl");
if (RDFUrlStr != null && RDFUrlStr.length() > 0) { if (RDFUrlStr != null && RDFUrlStr.length() > 0) {
@ -412,16 +418,10 @@ public class RDFUploadController extends JenaIngestController {
} }
private OntModel getABoxModel(HttpSession session, ServletContext ctx) { private OntModel getABoxModel(HttpSession session, ServletContext ctx) {
if (session != null RDFService rdfService = RDFServiceUtils.getRDFServiceFactory(ctx).getRDFService();
&& session.getAttribute("baseOntModelSelector") Model abox = RDFServiceGraph.createRDFServiceModel(
instanceof OntModelSelector) { new RDFServiceGraph(rdfService, JenaDataSourceSetupBase.JENA_DB_MODEL));
return ((OntModelSelector) return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, abox);
session.getAttribute("baseOntModelSelector"))
.getABoxModel();
} else {
return ((OntModelSelector)
ctx.getAttribute("baseOntModelSelector")).getABoxModel();
}
} }
private OntModel getTBoxModel(HttpSession session, ServletContext ctx) { private OntModel getTBoxModel(HttpSession session, ServletContext ctx) {