[Treebase-guts] SF.net SVN: treebase:[496] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/PhyloWSController.java

[<rv...@us...>]

Revision: 496
          http://treebase.svn.sourceforge.net/treebase/?rev=496&view=rev
Author:   rvos
Date:     2010-02-12 07:21:53 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
Added placeholder method for content-negotiation

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-02-12 04:41:13 UTC (rev 495)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2010-02-12 07:21:53 UTC (rev 496)
@@ -106,24 +106,25 @@
             	url = domain + createSearchUrl(pathComponents[pathComponents.length-2],req);
             } else {
 	            String rawNamespacedGUID = pathComponents[pathComponents.length-1];
-	            if ( rawNamespacedGUID.startsWith("uBio:") ) {
+	            if ( rawNamespacedGUID.startsWith("uBio:") ) { // XXX be polite, use real URL
 	            	url = uBioBaseUrl + rawNamespacedGUID.substring("uBio:".length());
 	            }
-	            else if ( rawNamespacedGUID.startsWith("NCBI:") ) {
+	            else if ( rawNamespacedGUID.startsWith("NCBI:") ) { // XXX be polite, use real URL
 	            	url = ncbiBaseUrl + rawNamespacedGUID.substring("NCBI:".length());
 	            }            
 	            else {
 		            NamespacedGUID namespacedGUID = new NamespacedGUID(rawNamespacedGUID);
 		            TreebaseIDString tbID = namespacedGUID.getTreebaseIDString();
 		            if ( hasWebPage(pathComponents) ) {
-		            	if ( TreebaseUtil.isEmpty(req.getParameter(format)) ) {
+		            	String serializationFormat = createSerializationFormat(req);
+		            	if ( TreebaseUtil.isEmpty(serializationFormat) ) {
 		            		url = domain + "/treebase-web/search/study/anyObjectAsRDF.html?namespacedGUID=" + namespacedGUID.toString();
 		            	}
-		            	else if ( req.getParameter(format).equals("html") ) {
+		            	else if ( serializationFormat.equals("html") ) {
 		            		url = domain + createUrl(tbID.getTypePrefix(),tbID.getId(),req);
 		            	}
 		            	else {
-		            		url = domain + createDownloadUrl(tbID.getTypePrefix(),tbID.getId(),req.getParameter(format));
+		            		url = domain + createDownloadUrl(tbID.getTypePrefix(),tbID.getId(),serializationFormat);
 		            	}
 		            }
 		            else {
@@ -145,6 +146,16 @@
         return null;
 	}
 	
+	/**
+	 * This is a placeholder method that might parse accept headers for content-negotiation
+	 * one day
+	 * @param request
+	 * @return
+	 */
+	private String createSerializationFormat(HttpServletRequest request) {
+		return request.getParameter(format);
+	}
+	
 	private String createSearchUrl(String path,HttpServletRequest request) {
 		StringBuilder sb = new StringBuilder();
 		sb


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.