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

merging fix for imports loading NIHVIVO-1174 into trunk

Browse source
This commit is contained in:
bjl23 2010-09-28 18:45:45 +00:00
parent 1af3b71b0b
commit 3d897303f1
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.ModelMaker;
@ -113,12 +114,11 @@ public class RDFUploadController extends BaseEditController {
String uploadDesc ="";
Model tempModel = null;
OntModel tempModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
/* ********************* GET RDF by URL ********************** */
String RDFUrlStr = request.getParameter("rdfUrl");
if (RDFUrlStr != null && RDFUrlStr.length() > 0) {
tempModel = ModelFactory.createDefaultModel();
try {
tempModel.read(RDFUrlStr, languageStr); // languageStr may be null and default would be RDF/XML
uploadDesc = verb + " RDF from " + RDFUrlStr;
@ -133,7 +133,6 @@ public class RDFUploadController extends BaseEditController {
/* **************** upload RDF from POST ********************* */
if( fileStreams.get("rdfStream") != null && fileStreams.get("rdfStream").size() > 0 ){
FileItem rdfStream = fileStreams.get("rdfStream").get(0);
tempModel = ModelFactory.createDefaultModel();
try {
tempModel.read( rdfStream.getInputStream(), null, languageStr);
uploadDesc = verb + " RDF from file " + rdfStream.getName();