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

code for file download added.

Browse source
This commit is contained in:
ass92 2010-07-14 21:03:58 +00:00
parent 00261a8a5c
commit 05a69a4c30
1 changed files with 18 additions and 4 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/JenaIngestController.java
View file

@ -104,7 +104,7 @@ public class JenaIngestController extends BaseEditController {
private static final String GENERATE_TBOX_JSP = "/jenaIngest/generateTBox.jsp"; private static final String GENERATE_TBOX_JSP = "/jenaIngest/generateTBox.jsp";
private static final String PERMANENT_URI = "/jenaIngest/permanentURI.jsp"; private static final String PERMANENT_URI = "/jenaIngest/permanentURI.jsp";
private static final String MERGE_INDIVIDUALS = "/jenaIngest/mergeIndividuals.jsp"; private static final String MERGE_INDIVIDUALS = "/jenaIngest/mergeIndividuals.jsp";
private static final String MERGE_RESULT = "/templates/edit/specific/merge_result.jsp"; private static final String MERGE_RESULT = "/jenaIngest/merge_result.jsp";
private static final String SPARQL_CONSTRUCT_CLASS = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#SPARQLCONSTRUCTQuery"; private static final String SPARQL_CONSTRUCT_CLASS = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#SPARQLCONSTRUCTQuery";
private static final String SPARQL_QUERYSTR_PROP = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#queryStr"; private static final String SPARQL_QUERYSTR_PROP = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#queryStr";
private static final String RENAME_RESOURCE = "/jenaIngest/renameResource.jsp"; private static final String RENAME_RESOURCE = "/jenaIngest/renameResource.jsp";
@ -478,6 +478,20 @@ public class JenaIngestController extends BaseEditController {
} }
} }
else if("mergeResult".equals(actionStr)){
Model lmodel = (Model)request.getSession().getAttribute("leftoverModel");
response.setContentType("RDF/XML-ABBREV");
try{
OutputStream outStream = response.getOutputStream();
outStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes());
lmodel.write( outStream,"RDF/XML-ABBREV");
outStream.flush();
outStream.close();
}
catch(IOException ioe){
throw new RuntimeException(ioe);
}
}
else { else {
request.setAttribute("title","Ingest Menu"); request.setAttribute("title","Ingest Menu");
@ -1042,18 +1056,18 @@ public class JenaIngestController extends BaseEditController {
} }
res2.removeAll((Property)null); res2.removeAll((Property)null);
vitroJenaModel.leaveCriticalSection(); vitroJenaModel.leaveCriticalSection();
response.setContentType("RDF/XML-ABBREV"); /*response.setContentType("RDF/XML-ABBREV");
try{ try{
OutputStream outStream = response.getOutputStream(); OutputStream outStream = response.getOutputStream();
outStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes()); outStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes());
leftoverModel.write( outStream,"RDF/XML-ABBREV"); leftoverModel.write( outStream,"RDF/XML-ABBREV");
request.getSession().setAttribute("leftoverModel", leftoverModel);
outStream.flush(); outStream.flush();
outStream.close(); outStream.close();
} }
catch(IOException ioe){ catch(IOException ioe){
throw new RuntimeException(ioe); throw new RuntimeException(ioe);
} }*/
request.getSession().setAttribute("leftoverModel", leftoverModel);
result = "merging done for " + counter + " statements."; result = "merging done for " + counter + " statements.";
return result; return result;