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

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

Revision: 803
          http://treebase.svn.sourceforge.net/treebase/?rev=803&view=rev
Author:   rvos
Date:     2011-04-25 22:15:19 +0000 (Mon, 25 Apr 2011)

Log Message:
-----------
Added more descriptive id parsing error message; not adding null parameters to new redirect string; only pruning one character from query string.

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	2011-04-25 21:54:29 UTC (rev 802)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2011-04-25 22:15:19 UTC (rev 803)
@@ -75,7 +75,7 @@
 	            	url = createResourceUrl(namespacedGUID, req);
 	            }
             } catch ( MalformedTreebaseIDString e ) {
-            	res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad ID string: " + e.getMessage());
+            	res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad ID string from path info '" + pathInfo + "' message: " + e.getMessage());
             } catch ( ObjectNotFoundException e ) {        	        	
             	res.sendError(HttpServletResponse.SC_NOT_FOUND, "Object not found: " + e.getMessage());
             }	            
@@ -127,9 +127,18 @@
 		StringBuffer sb = new StringBuffer(searchBase);
 		sb.append(getSearchPage());
 		Map<String,String> params = new HashMap<String,String>();
-		params.put("query", request.getParameter("query"));
-		params.put("format", createSerializationFormat(request));
-		params.put("recordSchema", request.getParameter("recordSchema"));		
+		String query = request.getParameter("query");
+		if ( ! TreebaseUtil.isEmpty(query) ) {
+			params.put("query", query);
+		}
+		String format = createSerializationFormat(request);
+		if ( ! TreebaseUtil.isEmpty(format) ) {
+			params.put("format", format);
+		}
+		String recordSchema = request.getParameter("recordSchema");
+		if ( ! TreebaseUtil.isEmpty(recordSchema) ) {
+			params.put("recordSchema", recordSchema);	
+		}
 		return createUrl(sb,params,request);
 	}
 
@@ -168,7 +177,7 @@
 			base.append(key).append('=').append(params.get(key)).append('&');
 		}
 		String url = base.toString();
-		return url.substring(0, url.length() - 2 );
+		return url.substring(0, url.length() - 1 );
 	}
 	
 	


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