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

NIHVIVO-1722, NIHVIVO-1380 Some refactoring of code that creates a link to an individual's rdf

Browse source
This commit is contained in:
rjy7 2011-01-16 14:23:38 +00:00
parent 86ba0ea192
commit a3a5f361d5
2 changed files with 23 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,7 +184,7 @@ public class IndividualController extends FreemarkerHttpServlet {
private String getRdfLinkTag(IndividualTemplateModel itm) { private String getRdfLinkTag(IndividualTemplateModel itm) {
String linkTag = null; String linkTag = null;
String linkedDataUrl = itm.getLinkedDataUrl(); String linkedDataUrl = itm.getRdfUrl(false);
if (linkedDataUrl != null) { if (linkedDataUrl != null) {
linkTag = "<link rel=\"alternate\" type=\"application/rdf+xml\" href=\"" + linkTag = "<link rel=\"alternate\" type=\"application/rdf+xml\" href=\"" +
linkedDataUrl + "\" /> "; linkedDataUrl + "\" /> ";
@ -200,10 +200,7 @@ public class IndividualController extends FreemarkerHttpServlet {
individual.setKeywords(iwDao.getKeywordsForIndividualByMode(individual.getURI(),"visible")); individual.setKeywords(iwDao.getKeywordsForIndividualByMode(individual.getURI(),"visible"));
individual.sortForDisplay(); individual.sortForDisplay();
//setup highlighter for search terms return new IndividualTemplateModel(individual, vreq);
//checkForSearch(vreq, individual);
return new IndividualTemplateModel(individual, vreq, LoginStatusBean.getBean(vreq));
} }
// Determine whether the individual has a custom display template based on its class membership. // Determine whether the individual has a custom display template based on its class membership.
@ -413,9 +410,9 @@ public class IndividualController extends FreemarkerHttpServlet {
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/([^/]*)$");
private static Pattern RDF_PARAM = Pattern.compile("rdf"); public static final Pattern RDFXML_FORMAT = Pattern.compile("rdfxml");
private static Pattern N3_PARAM = Pattern.compile("n3"); public static final Pattern N3_FORMAT = Pattern.compile("n3");
private static Pattern TTL_PARAM = Pattern.compile("ttl"); 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
@ -428,15 +425,15 @@ public class IndividualController extends FreemarkerHttpServlet {
// Check for url param specifying format // Check for url param specifying format
String formatParam = (String) vreq.getParameter("format"); String formatParam = (String) vreq.getParameter("format");
if (formatParam != null) { if (formatParam != null) {
m = RDF_PARAM.matcher(formatParam); m = RDFXML_FORMAT.matcher(formatParam);
if ( m.matches() ) { if ( m.matches() ) {
return new ContentType(RDFXML_MIMETYPE); return new ContentType(RDFXML_MIMETYPE);
} }
m = N3_PARAM.matcher(formatParam); m = N3_FORMAT.matcher(formatParam);
if( m.matches() ) { if( m.matches() ) {
return new ContentType(N3_MIMETYPE); return new ContentType(N3_MIMETYPE);
} }
m = TTL_PARAM.matcher(formatParam); m = TTL_FORMAT.matcher(formatParam);
if( m.matches() ) { if( m.matches() ) {
return new ContentType(TTL_MIMETYPE); return new ContentType(TTL_MIMETYPE);
} }
@ -572,27 +569,6 @@ public class IndividualController extends FreemarkerHttpServlet {
return newModel; return newModel;
} }
private void checkForSearch(HttpServletRequest req, Individual ent) {
if (req.getSession().getAttribute("LastQuery") != null) {
VitroQueryWrapper qWrap = (VitroQueryWrapper) req.getSession()
.getAttribute("LastQuery");
if (qWrap.getRequestCount() > 0 && qWrap.getQuery() != null) {
VitroQuery query = qWrap.getQuery();
//set query text so we can get it in JSP
req.setAttribute("querytext", query.getTerms());
//setup highlighting for output
StringProcessorTag.putStringProcessorInRequest(req, qWrap.getHighlighter());
qWrap.setRequestCount(qWrap.getRequestCount() - 1);
} else {
req.getSession().removeAttribute("LastQuery");
}
}
}
private Pattern badrequest= Pattern.compile(".*([&\\?=]|\\.\\.).*"); private Pattern badrequest= Pattern.compile(".*([&\\?=]|\\.\\.).*");
public String getViewFromRequest(HttpServletRequest request){ public String getViewFromRequest(HttpServletRequest request){

26
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
View file

@ -2,7 +2,8 @@
package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
import java.util.List; import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -31,10 +32,10 @@ public class IndividualTemplateModel extends BaseTemplateModel {
protected LoginStatusBean loginStatusBean = null; protected LoginStatusBean loginStatusBean = null;
private EditingPolicyHelper policyHelper = null; private EditingPolicyHelper policyHelper = null;
public IndividualTemplateModel(Individual individual, VitroRequest vreq, LoginStatusBean loginStatusBean) { public IndividualTemplateModel(Individual individual, VitroRequest vreq) {
this.individual = individual; this.individual = individual;
this.vreq = vreq; this.vreq = vreq;
this.loginStatusBean = loginStatusBean; this.loginStatusBean = LoginStatusBean.getBean(vreq);
// Needed for getting portal-sensitive urls. Remove if multi-portal support is removed. // Needed for getting portal-sensitive urls. Remove if multi-portal support is removed.
this.urlBuilder = new UrlBuilder(vreq.getPortal()); this.urlBuilder = new UrlBuilder(vreq.getPortal());
@ -80,14 +81,12 @@ public class IndividualTemplateModel extends BaseTemplateModel {
return thumbUrl == null ? null : getUrl(thumbUrl); return thumbUrl == null ? null : getUrl(thumbUrl);
} }
public String getLinkedDataUrl() { public String getRdfUrl() {
String defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace(); return getRdfUrl(true);
String uri = getUri();
return uri.startsWith(defaultNamespace) ? uri + "/" + getLocalName() + ".rdf" : null;
} }
// Used to create a link to a display of the individual's rdf. // Used to create a link to generate the individual's rdf.
public String getRdfUrl() { public String getRdfUrl(boolean checkExternalNamespaces) {
String individualUri = getUri(); String individualUri = getUri();
String profileUrl = getProfileUrl(); String profileUrl = getProfileUrl();
@ -105,12 +104,15 @@ public class IndividualTemplateModel extends BaseTemplateModel {
// An RDF url is not defined for an externally linked namespace. The data does not reside // An RDF url is not defined for an externally linked namespace. The data does not reside
// in the current system, and the external system may not accept a request for rdf. // in the current system, and the external system may not accept a request for rdf.
if (vreq.getWebappDaoFactory().getApplicationDao().isExternallyLinkedNamespace(namespace)) { if (checkExternalNamespaces && vreq.getWebappDaoFactory()
.getApplicationDao()
.isExternallyLinkedNamespace(namespace)) {
return null; return null;
} }
// http://some.other.namespace/n2345?format=application/rdf+xml // http://some.other.namespace/n2345?format=rdfxml
return UrlBuilder.addParams(profileUrl, "format", "rdf"); // ** RY Not sure it is correct to return this for the <link> element
return UrlBuilder.addParams(profileUrl, "format", "rdfxml");
} }