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

NIHVIVO-2460 Simplified the controller for Solr-based RDF generation on individual list page. Since it only needs to generate RDF/XML, removed code supporting other formats.

Browse source
This commit is contained in:
ryounes 2011-05-24 17:34:34 +00:00
parent 9236ba0099
commit f2b67b1263
2 changed files with 6 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

85
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java
View file

@ -1,8 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.controller; package edu.cornell.mannlib.vitro.webapp.controller;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -10,8 +8,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.ScoreDoc;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.QueryResponse;
@ -27,59 +23,25 @@ import com.hp.hpl.jena.vocabulary.RDF;
import edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames; import edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames;
import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup; import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
import edu.cornell.mannlib.vitro.webapp.web.ContentType;
public class IndividualListRdfController extends VitroHttpServlet { public class IndividualListRdfController extends VitroHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(IndividualListRdfController.class.getName()); private static final Log log = LogFactory.getLog(IndividualListRdfController.class.getName());
private static final String PATH = "listrdf";
private static final String FILENAME = PATH;
public static final String URL = "/" + PATH + "/";
public static final int ENTITY_LIST_CONTROLLER_MAX_RESULTS = 30000; public static final int ENTITY_LIST_CONTROLLER_MAX_RESULTS = 30000;
public void doGet (HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { public void doGet (HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
String url = req.getRequestURI().substring(req.getContextPath().length());
ContentType contentType = checkForRequestType(req.getHeader("accept"));
if (url.equals(URL)) {
String redirectURL = URL + FILENAME;
if (contentType!=null) {
if (RDFXML_MIMETYPE.equals(contentType.getMediaType()))
redirectURL += ".rdf";
else if (N3_MIMETYPE.equals(contentType.getMediaType()))
redirectURL += ".n3";
else if (TTL_MIMETYPE.equals(contentType.getMediaType()))
redirectURL += ".ttl";
} else {
redirectURL += ".rdf";
}
String hn = req.getHeader("Host");
if (req.isSecure()) {
res.setHeader("Location", res.encodeURL("https://" + hn
+ req.getContextPath() + redirectURL));
log.info("doRedirect by using HTTPS");
} else {
res.setHeader("Location", res.encodeURL("http://" + hn
+ req.getContextPath() + redirectURL));
log.info("doRedirect by using HTTP");
}
res.setStatus(HttpServletResponse.SC_SEE_OTHER);
return;
}
// Make the query // Make the query
String classUri = (String) getServletContext().getAttribute("classuri"); String classUri = (String) getServletContext().getAttribute("classuri");
String queryStr = VitroLuceneTermNames.RDFTYPE + ":\"" + classUri + "\""; String queryStr = VitroLuceneTermNames.RDFTYPE + ":\"" + classUri + "\"";
SolrQuery query = new SolrQuery(queryStr); SolrQuery query = new SolrQuery(queryStr);
query.setStart(0) query.setStart(0)
.setRows(ENTITY_LIST_CONTROLLER_MAX_RESULTS) .setRows(ENTITY_LIST_CONTROLLER_MAX_RESULTS)
.setFields(VitroLuceneTermNames.URI) .setFields(VitroLuceneTermNames.URI);
.setSortField(VitroLuceneTermNames.NAME_LOWERCASE_SINGLE_VALUED, SolrQuery.ORDER.asc); // For now, we're only displaying the url, so no need to sort.
//.setSortField(VitroLuceneTermNames.NAME_LOWERCASE_SINGLE_VALUED);
// Execute the query // Execute the query
SolrServer solr = SolrSetup.getSolrServer(getServletContext()); SolrServer solr = SolrSetup.getSolrServer(getServletContext());
@ -109,51 +71,12 @@ public class IndividualListRdfController extends VitroHttpServlet {
model.add(resource, RDF.type, node); model.add(resource, RDF.type, node);
} }
String format = "";
if(contentType != null){
if ( RDFXML_MIMETYPE.equals(contentType.getMediaType()))
format = "RDF/XML";
else if( N3_MIMETYPE.equals(contentType.getMediaType()))
format = "N3";
else if ( TTL_MIMETYPE.equals(contentType.getMediaType()))
format ="TTL";
res.setContentType(contentType.getMediaType());
}
else{
res.setContentType(RDFXML_MIMETYPE); res.setContentType(RDFXML_MIMETYPE);
format = "RDF/XML"; model.write(res.getOutputStream(), "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);
} }
protected ContentType checkForRequestType(String acceptHeader) {
try {
//check the accept header
if (acceptHeader != null) {
List<ContentType> actualContentTypes = new ArrayList<ContentType>();
actualContentTypes.add(new ContentType( XHTML_MIMETYPE ));
actualContentTypes.add(new ContentType( HTML_MIMETYPE ));
actualContentTypes.add(new ContentType( RDFXML_MIMETYPE ));
actualContentTypes.add(new ContentType( N3_MIMETYPE ));
actualContentTypes.add(new ContentType( TTL_MIMETYPE ));
ContentType best = ContentType.getBestContentType(acceptHeader,actualContentTypes);
if (best!=null && (
RDFXML_MIMETYPE.equals(best.getMediaType()) ||
N3_MIMETYPE.equals(best.getMediaType()) ||
TTL_MIMETYPE.equals(best.getMediaType()) ))
return best;
}
}
catch (Throwable th) {
log.error("problem while checking accept header " , th);
}
return null;
}
} }

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java
View file

@ -25,7 +25,6 @@ import org.apache.solr.common.SolrDocumentList;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
import edu.cornell.mannlib.vitro.webapp.controller.IndividualListRdfController;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
@ -121,7 +120,7 @@ public class SolrIndividualListController extends FreemarkerHttpServlet {
body.put("subtitle", vclass.getName()); body.put("subtitle", vclass.getName());
} }
body.put("title", title); body.put("title", title);
body.put("rdfUrl", vreq.getContextPath() + IndividualListRdfController.URL); body.put("rdfUrl", vreq.getContextPath() + "/listrdf/" + vclass.getLocalName() + ".rdf");
getServletContext().setAttribute("classuri", vclass.getURI()); getServletContext().setAttribute("classuri", vclass.getURI());
} }