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

NIHVIVO-1557 RDF export issue fix.

Browse source
This commit is contained in:
ass92 2011-01-03 04:21:47 +00:00
parent d1394e7b33
commit 8ff55fe7d9
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
View file

@ -90,7 +90,7 @@ public class JenaExportController extends BaseEditController {
String ontologyURI = vreq.getParameter("ontologyURI"); String ontologyURI = vreq.getParameter("ontologyURI");
Model model = null; Model model = null;
OntModel ontModel = ModelFactory.createOntologyModel();
boolean limitToInferred = false; boolean limitToInferred = false;
Model inferenceModel = null; Model inferenceModel = null;
@ -128,6 +128,21 @@ public class JenaExportController extends BaseEditController {
model = xutil.extractTBox(dataset, ontologyURI, ASSERTIONS_GRAPH); model = xutil.extractTBox(dataset, ontologyURI, ASSERTIONS_GRAPH);
} }
}
else if("full".equals(subgraphParam)){
if("inferred".equals(assertedOrInferredParam)){
ontModel = xutil.extractTBox(dataset, ontologyURI,INFERENCE_GRAPH);
ontModel.addSubModel(xutil.extractABox(dataset, INFERENCE_GRAPH));
}
else if("full".equals(assertedOrInferredParam)){
ontModel = xutil.extractTBox(dataset, ontologyURI, FULL_GRAPH);
ontModel.addSubModel(xutil.extractABox(dataset, FULL_GRAPH));
}
else{
ontModel = xutil.extractTBox(dataset, ontologyURI, ASSERTIONS_GRAPH);
ontModel.addSubModel(xutil.extractABox(dataset, ASSERTIONS_GRAPH));
}
} }
if ( formatParam == null ) { if ( formatParam == null ) {
@ -156,7 +171,10 @@ public class JenaExportController extends BaseEditController {
// 2010-11-02 workaround for the fact that ARP now always seems to // 2010-11-02 workaround for the fact that ARP now always seems to
// try to parse N3 using strict Turtle rules. Avoiding headaches // try to parse N3 using strict Turtle rules. Avoiding headaches
// by always serializing out as Turtle instead of using N3 sugar. // by always serializing out as Turtle instead of using N3 sugar.
model.write( outStream, "N3".equals(formatParam) ? "TTL" : formatParam ); if(!"full".equals(subgraphParam))
model.write( outStream, "N3".equals(formatParam) ? "TTL" : formatParam );
else
ontModel.writeAll(outStream, "N3".equals(formatParam) ? "TTL" : formatParam, null );
outStream.flush(); outStream.flush();
outStream.close(); outStream.close();
} catch (IOException ioe) { } catch (IOException ioe) {