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

NIHVIVO-1376 made change to get the default output working when there is no accept header set for the client browser.

Browse source
This commit is contained in:
ass92 2011-01-13 16:35:16 +00:00
parent 01e6cf274c
commit 16d6346f06
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityURLController.java
View file

@ -58,12 +58,17 @@ public void doGet (HttpServletRequest req, HttpServletResponse res) throws IOExc
if(Pattern.compile("^/entityurl/$").matcher(url).matches()){ if(Pattern.compile("^/entityurl/$").matcher(url).matches()){
String redirectURL = null; String redirectURL = null;
if ( RDFXML_MIMETYPE.equals(contentType.getMediaType())) if(contentType!=null){
redirectURL = "/entityurl/entityurl.rdf"; if ( RDFXML_MIMETYPE.equals(contentType.getMediaType()))
else if( N3_MIMETYPE.equals(contentType.getMediaType())) redirectURL = "/entityurl/entityurl.rdf";
redirectURL = "/entityurl/entityurl.n3"; else if( N3_MIMETYPE.equals(contentType.getMediaType()))
else if ( TTL_MIMETYPE.equals(contentType.getMediaType())) redirectURL = "/entityurl/entityurl.n3";
redirectURL = "/entityurl/entityurl.ttl"; else if ( TTL_MIMETYPE.equals(contentType.getMediaType()))
redirectURL = "/entityurl/entityurl.ttl";
}
else{
redirectURL = "/entityurl/entityrurl.rdf";
}
String hn = req.getHeader("Host"); String hn = req.getHeader("Host");
if (req.isSecure()) { if (req.isSecure()) {
@ -94,8 +99,8 @@ public void doGet (HttpServletRequest req, HttpServletResponse res) throws IOExc
} }
} }
if(contentType != null){ String format = "";
String format = ""; if(contentType != null){
if ( RDFXML_MIMETYPE.equals(contentType.getMediaType())) if ( RDFXML_MIMETYPE.equals(contentType.getMediaType()))
format = "RDF/XML"; format = "RDF/XML";
else if( N3_MIMETYPE.equals(contentType.getMediaType())) else if( N3_MIMETYPE.equals(contentType.getMediaType()))
@ -103,8 +108,12 @@ public void doGet (HttpServletRequest req, HttpServletResponse res) throws IOExc
else if ( TTL_MIMETYPE.equals(contentType.getMediaType())) else if ( TTL_MIMETYPE.equals(contentType.getMediaType()))
format ="TTL"; format ="TTL";
res.setContentType(contentType.getMediaType()); res.setContentType(contentType.getMediaType());
model.write(res.getOutputStream(), format);
} }
else{
res.setContentType(RDFXML_MIMETYPE);
format = "RDF/XML";
}
model.write(res.getOutputStream(), format);
} }
public void doPost (HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException{ public void doPost (HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException{
doGet(req,res); doGet(req,res);