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

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

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

Log Message:
-----------
More pre-processing of the id 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 22:15:19 UTC (rev 803)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2011-04-25 22:27:59 UTC (rev 804)
@@ -53,8 +53,9 @@
         	url = createSearchUrl(req);
         }
         else {
+        	String substr = pathInfo.replaceAll(".*/", "");
             try {
-	            NamespacedGUID namespacedGUID = new NamespacedGUID(pathInfo);
+	            NamespacedGUID namespacedGUID = new NamespacedGUID(substr);
 	            TreebaseIDString tbID = namespacedGUID.getTreebaseIDString();
 	        	String serializationFormat = createSerializationFormat(req);	            
 	            if ( hasWebPage(tbID.getClass()) && ! TreebaseUtil.isEmpty(serializationFormat) ) {
@@ -75,7 +76,7 @@
 	            	url = createResourceUrl(namespacedGUID, req);
 	            }
             } catch ( MalformedTreebaseIDString e ) {
-            	res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad ID string from path info '" + pathInfo + "' message: " + e.getMessage());
+            	res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad ID string from path info '" + substr + "' message: " + e.getMessage());
             } catch ( ObjectNotFoundException e ) {        	        	
             	res.sendError(HttpServletResponse.SC_NOT_FOUND, "Object not found: " + e.getMessage());
             }	            


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