diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index 6a2dba03e..a843a894e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -17,10 +17,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URI; import java.net.URISyntaxException; -import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -38,8 +36,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.mindswap.pellet.exceptions.InconsistentOntologyException; -import org.mindswap.pellet.jena.PelletReasonerFactory; +import org.semanticweb.owlapi.reasoner.InconsistentOntologyException; import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.OntModel; @@ -837,12 +834,7 @@ public class JenaIngestController extends BaseEditController { private long doExecuteSparql(VitroRequest vreq) { OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel(); - OntModel source = null; - if ("pellet".equals(vreq.getParameter("reasoning"))) { - source = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC); - } else { - source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM); - } + OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM); String[] sourceModel = vreq.getParameterValues("sourceModelName"); for (int i=0; i { - - Collator collator; - - public CollationSort(VitroRequest vreq) { - this.collator = vreq.getCollator(); - } - - @Override - public int compare(String s1, String s2) { - return collator.compare(s1, s2); - } - - } - public static Model getModel(String name, HttpServletRequest request) { return getModelMaker(request).getModel(name); } diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp index d02f8ea2f..06aba09c6 100644 --- a/webapp/web/jenaIngest/sparqlConstruct.jsp +++ b/webapp/web/jenaIngest/sparqlConstruct.jsp @@ -174,17 +174,5 @@ PREFIX <%=prefixText%>: <<%=urlText%>><%}}%> <% } %> - - - - -

include pellet reasoning

-
-
-
- -

- include Pellet OWL-DL reasoning

-
-
+ +