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

code corrections for Permanent URI and merge individual method.

Browse source
This commit is contained in:
ass92 2010-07-13 19:18:52 +00:00
parent a4438d4007
commit ef86bd7875
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -972,6 +972,7 @@ public class JenaIngestController extends BaseEditController {
Random random = new Random(); Random random = new Random();
boolean resourcePresent=true; boolean resourcePresent=true;
OntModel vitroJenaModel = (OntModel) getServletContext().getAttribute("baseOntModel"); OntModel vitroJenaModel = (OntModel) getServletContext().getAttribute("baseOntModel");
vitroJenaModel.enterCriticalSection(Lock.WRITE);
log.info("Going into loop"); log.info("Going into loop");
Resource res = null; Resource res = null;
do{ do{
@ -984,6 +985,7 @@ public class JenaIngestController extends BaseEditController {
}while(resourcePresent); }while(resourcePresent);
log.info("url assigned"); log.info("url assigned");
res.removeAll((Property)null); res.removeAll((Property)null);
vitroJenaModel.leaveCriticalSection();
return uri; return uri;
} }
private String doMerge(String uri1, String uri2,HttpServletResponse response){ private String doMerge(String uri1, String uri2,HttpServletResponse response){
@ -991,16 +993,19 @@ public class JenaIngestController extends BaseEditController {
Resource res1 = vitroJenaModel.getResource(uri1); Resource res1 = vitroJenaModel.getResource(uri1);
Resource res2 = vitroJenaModel.getResource(uri2); Resource res2 = vitroJenaModel.getResource(uri2);
String result = null; String result = null;
vitroJenaModel.enterCriticalSection(Lock.WRITE);
StmtIterator stmtItr1 = vitroJenaModel.listStatements(res1,(Property)null,(RDFNode)null); StmtIterator stmtItr1 = vitroJenaModel.listStatements(res1,(Property)null,(RDFNode)null);
StmtIterator stmtItr2 = vitroJenaModel.listStatements(res2,(Property)null,(RDFNode)null); StmtIterator stmtItr2 = vitroJenaModel.listStatements(res2,(Property)null,(RDFNode)null);
if(!stmtItr1.hasNext()){ if(!stmtItr1.hasNext()){
result = "resource 1 not present"; result = "resource 1 not present";
res1.removeAll((Property)null); res1.removeAll((Property)null);
vitroJenaModel.leaveCriticalSection();
return result; return result;
} }
else if(!stmtItr2.hasNext()){ else if(!stmtItr2.hasNext()){
result = "resource 2 not present"; result = "resource 2 not present";
res2.removeAll((Property)null); res2.removeAll((Property)null);
vitroJenaModel.leaveCriticalSection();
return result; return result;
} }
@ -1020,6 +1025,7 @@ public class JenaIngestController extends BaseEditController {
} }
} }
res2.removeAll((Property)null); res2.removeAll((Property)null);
vitroJenaModel.leaveCriticalSection();
response.setContentType("RDF/XML-ABBREV"); response.setContentType("RDF/XML-ABBREV");
try{ try{
OutputStream outStream = response.getOutputStream(); OutputStream outStream = response.getOutputStream();