Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[562] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/PhyloWSController.java
|
From: <rv...@us...> - 2010-03-12 23:29:59
|
Revision: 562
http://treebase.svn.sourceforge.net/treebase/?rev=562&view=rev
Author: rvos
Date: 2010-03-12 23:29:53 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
Removed runtime-computed domain name and server port, which no longer work with the new tomcat configuration (would now compute "localhost"). Using relative URLs instead.
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2010-03-12 23:27:28 UTC (rev 561)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2010-03-12 23:29:53 UTC (rev 562)
@@ -26,11 +26,28 @@
private PhyloTreeService mPhyloTreeService;
private StudyService mStudyService;
private static String format = "format";
+
+ /*
+ * this array is used to identify whether a path fragment maps to an object
+ * for which web pages are available. Maybe this should be an enum or a map
+ * instead.
+ */
private static String[] classesWithPages = { "tree", "study", "matrix" };
+ /**
+ * Given an object prefix ("tree", "study" or "matrix") and an object ID, constructs
+ * a relative URL to an HTML page about that object.
+ * @param prefix identifies either studies, matrices or trees
+ * @param objectId is the primary key for the requested object
+ * @param request is the servlet request, which we need to check for reviewer access
+ * @return a relative URL to an HTML page, or an empty string
+ * @throws Exception
+ */
private String createUrl(String prefix, Long objectId,HttpServletRequest request) throws Exception {
String url = "";
StringBuffer base = new StringBuffer("/treebase-web/search/study");
+
+ // requested object is a study
if ( prefix.equals(TreebaseIDString.getPrefixForClass(Study.class)) ) {
Study study = getStudyService().findByID(objectId);
if ( study == null ) {
@@ -54,6 +71,8 @@
.toString();
}
}
+
+ // requested object is a matrix
else if ( prefix.equals(TreebaseIDString.getPrefixForClass(Matrix.class)) ) {
Matrix matrix = getMatrixService().findByID(objectId);
if ( matrix == null ) {
@@ -67,6 +86,8 @@
.append(objectId)
.toString();
}
+
+ // requested object is a tree
else if ( prefix.equals(TreebaseIDString.getPrefixForClass(PhyloTree.class)) ) {
PhyloTree phyloTree = getPhyloTreeService().findByID(objectId);
if ( phyloTree == null ) {
@@ -87,7 +108,7 @@
throws Exception {
res.setContentType("text/plain");
String url = null;
- String domain = "http://" + req.getServerName() + ":" + req.getServerPort();
+ //String domain = "http://" + req.getServerName() + ":" + req.getServerPort();
if ( ! TreebaseUtil.isEmpty(req.getParameter(Constants.X_ACCESS_CODE)) ) {
req.getSession().setAttribute(
Constants.X_ACCESS_CODE,
@@ -103,7 +124,8 @@
}
String[] pathComponents = pathInfo.split("/");
if ( pathComponents[pathComponents.length-1].equals("find") ) {
- url = domain + createSearchUrl(pathComponents[pathComponents.length-2],req);
+ //url = domain + createSearchUrl(pathComponents[pathComponents.length-2],req);
+ url = createSearchUrl(pathComponents[pathComponents.length-2],req);
} else {
String rawNamespacedGUID = pathComponents[pathComponents.length-1];
if ( rawNamespacedGUID.startsWith("uBio:") ) { // XXX be polite, use real URL
@@ -118,17 +140,17 @@
if ( hasWebPage(pathComponents) ) {
String serializationFormat = createSerializationFormat(req);
if ( TreebaseUtil.isEmpty(serializationFormat) ) {
- url = domain + "/treebase-web/search/study/anyObjectAsRDF.html?namespacedGUID=" + namespacedGUID.toString();
+ url = "/treebase-web/search/study/anyObjectAsRDF.rdf?namespacedGUID=" + namespacedGUID.toString();
}
else if ( serializationFormat.equals("html") ) {
- url = domain + createUrl(tbID.getTypePrefix(),tbID.getId(),req);
+ url = createUrl(tbID.getTypePrefix(),tbID.getId(),req);
}
else {
- url = domain + createDownloadUrl(tbID.getTypePrefix(),tbID.getId(),serializationFormat);
+ url = createDownloadUrl(tbID.getTypePrefix(),tbID.getId(),serializationFormat);
}
}
else {
- url = domain + "/treebase-web/search/study/anyObjectAsRDF.html?namespacedGUID=" + namespacedGUID.toString();
+ url = "/treebase-web/search/study/anyObjectAsRDF.rdf?namespacedGUID=" + namespacedGUID.toString();
}
}
}
@@ -157,9 +179,8 @@
}
private String createSearchUrl(String path,HttpServletRequest request) {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder("/treebase-web/search/");
sb
- .append("/treebase-web/search/")
.append(path)
.append("Search.html?query=")
.append(request.getParameter("query"))
@@ -170,6 +191,12 @@
return sb.toString();
}
+ /**
+ * Given an array of path fragments, returns whether an HTML web page
+ * exists for the type of object the fragments map onto
+ * @param pathComponents
+ * @return true of web page exists, false otherwise
+ */
private boolean hasWebPage(String[] pathComponents) {
for ( int i = ( pathComponents.length - 1 ); i >= 0; i-- ) {
for ( int j = 0; j < classesWithPages.length; j++ ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
