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

NIHVIVO-2701 Reorganized code dealing with linked data requests so the requests that should result in a 303 redirect are handled separately from those that shouldn't.

Browse source
This commit is contained in:
ryounes 2011-06-17 16:39:06 +00:00
parent 996cb3be85
commit d03c677e7f
1 changed files with 99 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

79
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -114,7 +114,7 @@ public class IndividualController extends FreemarkerHttpServlet {
return doNotFound(vreq); return doNotFound(vreq);
} }
ContentType rdfFormat = checkForLinkedDataRequest(url, vreq); ContentType rdfFormat = checkUrlForLinkedDataRequest(url, vreq);
if( rdfFormat != null ){ if( rdfFormat != null ){
return doRdf(vreq, individual, rdfFormat); return doRdf(vreq, individual, rdfFormat);
} }
@ -472,14 +472,18 @@ public class IndividualController extends FreemarkerHttpServlet {
* to a GET request because it can only send bytes and not things. The server * to a GET request because it can only send bytes and not things. The server
* sends a 303, to mean "you asked for something I cannot send you, but I can * sends a 303, to mean "you asked for something I cannot send you, but I can
* send you this other stream of bytes about that thing." * send you this other stream of bytes about that thing."
* In the case of a request like http://vivo.cornell.edu/individual/n1234/n1234.rdf, * In the case of a request like http://vivo.cornell.edu/individual/n1234/n1234.rdf
* or http://vivo.cornell.edu/individual/n1234?format=rdfxml,
* the request is for a set of bytes rather than an individual, so no 303 is needed. * the request is for a set of bytes rather than an individual, so no 303 is needed.
*/ */
private static Pattern URI_PATTERN = Pattern.compile("^/individual/([^/]*)$"); private static Pattern URI_PATTERN = Pattern.compile("^/individual/([^/]*)$");
private String checkForRedirect(String url, VitroRequest vreq) { private String checkForRedirect(String url, VitroRequest vreq) {
String formatParam = (String) vreq.getParameter("format");
if ( formatParam == null ) {
Matcher m = URI_PATTERN.matcher(url); Matcher m = URI_PATTERN.matcher(url);
if ( m.matches() && m.groupCount() == 1 ) { if ( m.matches() && m.groupCount() == 1 ) {
ContentType c = checkForLinkedDataRequest(url, vreq); ContentType c = checkAcceptHeaderForLinkedDataRequest(url, vreq);
if ( c != null ) { if ( c != null ) {
String redirectUrl = "/individual/" + m.group(1) + "/" + m.group(1) ; String redirectUrl = "/individual/" + m.group(1) + "/" + m.group(1) ;
if ( RDFXML_MIMETYPE.equals( c.getMediaType() ) ) { if ( RDFXML_MIMETYPE.equals( c.getMediaType() ) ) {
@ -492,31 +496,59 @@ public class IndividualController extends FreemarkerHttpServlet {
} }
//else redirect to HTML representation //else redirect to HTML representation
return "display/" + m.group(1); return "display/" + m.group(1);
}else{ }
}
return null; return null;
} }
protected ContentType checkAcceptHeaderForLinkedDataRequest(String url, VitroRequest vreq) {
try {
/*
* Check the accept header. This request will trigger a
* redirect with a 303 ("see also"), because the request is for
* an individual but the server can only provide a set of bytes.
*/
String acceptHeader = vreq.getHeader("accept");
if (acceptHeader != null) {
String ctStr = ContentType.getBestContentType(
ContentType.getTypesAndQ(acceptHeader),
getAcceptedContentTypes());
if (ctStr!=null && (
RDFXML_MIMETYPE.equals(ctStr) ||
N3_MIMETYPE.equals(ctStr) ||
TTL_MIMETYPE.equals(ctStr) ))
return new ContentType(ctStr);
} }
} catch (Throwable th) {
log.error("Problem while checking accept header " , th);
}
return null;
}
public static final Pattern RDFXML_FORMAT = Pattern.compile("rdfxml");
public static final Pattern N3_FORMAT = Pattern.compile("n3");
public static final Pattern TTL_FORMAT = Pattern.compile("ttl");
private static Pattern RDF_REQUEST = Pattern.compile("^/individual/([^/]*)/\\1.rdf$"); private static Pattern RDF_REQUEST = Pattern.compile("^/individual/([^/]*)/\\1.rdf$");
private static Pattern N3_REQUEST = Pattern.compile("^/individual/([^/]*)/\\1.n3$"); private static Pattern N3_REQUEST = Pattern.compile("^/individual/([^/]*)/\\1.n3$");
private static Pattern TTL_REQUEST = Pattern.compile("^/individual/([^/]*)/\\1.ttl$"); private static Pattern TTL_REQUEST = Pattern.compile("^/individual/([^/]*)/\\1.ttl$");
private static Pattern HTML_REQUEST = Pattern.compile("^/display/([^/]*)$"); private static Pattern HTML_REQUEST = Pattern.compile("^/display/([^/]*)$");
public static final Pattern RDFXML_FORMAT = Pattern.compile("rdfxml");
public static final Pattern N3_FORMAT = Pattern.compile("n3");
public static final Pattern TTL_FORMAT = Pattern.compile("ttl");
/** /**
* @return null if this is not a linked data request, returns content type if it is a * @return null if this is not a linked data request, returns content type if it is a
* linked data request. * linked data request.
* These are Vitro-specific ways of requesting rdf, unrelated to semantic web standards.
* They do not trigger a redirect with a 303, because the request is for a set of bytes
* rather than an individual.
*/ */
protected ContentType checkForLinkedDataRequest(String url, VitroRequest vreq ) { protected ContentType checkUrlForLinkedDataRequest(String url, VitroRequest vreq ) {
try {
Matcher m; Matcher m;
/* /*
* Check for url param specifying format. * Check for url param specifying format.
* Example: http://vivo.cornell.edu/individual/n23?format=rdfxml * Example: http://vivo.cornell.edu/individual/n23?format=rdfxml
* This request will trigger a redirect with a 303.
*/ */
String formatParam = (String) vreq.getParameter("format"); String formatParam = (String) vreq.getParameter("format");
if (formatParam != null) { if (formatParam != null) {
@ -535,30 +567,10 @@ public class IndividualController extends FreemarkerHttpServlet {
} }
/* /*
* Check the accept header. This request will trigger a * Check for parts of URL that indicate request for RDF. Examples:
* redirect with a 303, because the request is for an individual
* but the server can only provide a set of bytes.
*/
String acceptHeader = vreq.getHeader("accept");
if (acceptHeader != null) {
String ctStr = ContentType.getBestContentType(
ContentType.getTypesAndQ(acceptHeader),
getAcceptedContentTypes());
if (ctStr!=null && (
RDFXML_MIMETYPE.equals(ctStr) ||
N3_MIMETYPE.equals(ctStr) ||
TTL_MIMETYPE.equals(ctStr) ))
return new ContentType(ctStr);
}
/*
* Check for parts of URL that indicate request for RDF
* http://vivo.cornell.edu/individual/n23/n23.rdf * http://vivo.cornell.edu/individual/n23/n23.rdf
* http://vivo.cornell.edu/individual/n23/n23.n3 * http://vivo.cornell.edu/individual/n23/n23.n3
* http://vivo.cornell.edu/individual/n23/n23.ttl * http://vivo.cornell.edu/individual/n23/n23.ttl
* This request will not trigger a redirect and 303, because
* the request is for a set of bytes rather than an individual.
*/ */
m = RDF_REQUEST.matcher(url); m = RDF_REQUEST.matcher(url);
if( m.matches() ) { if( m.matches() ) {
@ -573,9 +585,6 @@ public class IndividualController extends FreemarkerHttpServlet {
return ContentType.TURTLE; return ContentType.TURTLE;
} }
} catch (Throwable th) {
log.error("problem while checking accept header " , th);
}
return null; return null;
} }