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

NIHVIVO-1876 csv tool optimization.

Browse source
This commit is contained in:
ass92 2011-01-27 21:14:36 +00:00
parent c01dc9bf65
commit 0f05edf296
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
View file

@ -756,14 +756,13 @@ public class JenaIngestController extends BaseEditController {
else{ else{
destination.add(utils.renameBNodesByPattern(source, namespaceEtc, vreq.getJenaOntModel(), pattern, property)); destination.add(utils.renameBNodesByPattern(source, namespaceEtc, vreq.getJenaOntModel(), pattern, property));
} }
if(csv2rdf){ if(csv2rdf && property!=null){
ClosableIterator closeIt = destination.listSubjects(); ClosableIterator closeIt = destination.listSubjects();
Property prop = ResourceFactory.createProperty(property); Property prop = ResourceFactory.createProperty(property);
try { try {
for (Iterator it = closeIt; it.hasNext();) { for (Iterator it = closeIt; it.hasNext();) {
Resource res = (Resource) it.next(); Resource res = (Resource) it.next();
if (res.isAnon()) { if (res.isAnon()) {
// now we do something hacky to get the same resource in the outModel, since there's no getResourceById();
ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null); ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null);
Statement stmt = null; Statement stmt = null;
try { try {
@ -785,6 +784,21 @@ public class JenaIngestController extends BaseEditController {
csv2rdf = false; csv2rdf = false;
getServletContext().setAttribute("csv2rdf", csv2rdf); getServletContext().setAttribute("csv2rdf", csv2rdf);
} }
else if(csv2rdf && property == null){
ClosableIterator closeIt = destination.listSubjects();
try {
for (Iterator it = closeIt; it.hasNext();) {
Resource res = (Resource) it.next();
if (res.isAnon()) {
destination.removeAll(res,(Property)null,(RDFNode)null);
}
}
} finally {
closeIt.close();
}
csv2rdf = false;
getServletContext().setAttribute("csv2rdf", csv2rdf);
}
} finally { } finally {
destination.leaveCriticalSection(); destination.leaveCriticalSection();