Changeset 296 for tools

Timestamp:

04/16/09 09:54:22 (11 months ago)

Author:

anton

Message:

Better URL parsing

Files:

• tools/routingservice/branches/wrs-2.0/src/WRS.java (modified) (5 diffs)

tools/routingservice/branches/wrs-2.0/src/WRS.java

@@ -256 +256 @@
                         }
                 };
-                component.getDefaultHost().attach("/", restlet);
+                component.getDefaultHost().attach("/{version}/{profile}/{service}", restlet);
                 component.start();
 
@@ -266 +266 @@
                         InvalidTemplateException
         {
-                String url = req.getResourceRef().getRemainingPart().split("\\?")[0];
                 // http://<servicedomain>:<port>/<version>/<profile>/<service>.<format>?<input>={<data>}
-                String urlSplit[] = url.split("/");
-
-                byte urlIndex = 0;
-                String cVersion = urlSplit[urlIndex];
+                
+                String cVersion = (String) req.getAttributes().get("version");
 
                 if (!this.conf.getVersion().equals(cVersion))
@@ -278 +275 @@
                 }
 
-                // Next token (assumed to be profile name)
-                ++urlIndex;
-
-                String pName = urlSplit[urlIndex];
+                String pName = (String) req.getAttributes().get("profile");
                 Profile cProfile = this.profiles.get(pName);
 
@@ -289 +283 @@
                 }
 
-                // Next token (assumed to be service.format)
-                ++urlIndex;
-
-                String sName = urlSplit[urlIndex].split("\\.")[0];
+                String sName = ((String) req.getAttributes().get("service")).split("\\.")[0];
                 ArrayList csList = (ArrayList) cProfile.getServices().get(sName);
                 // TODO implement a rule
@@ -302 +293 @@
                 }
 
-                String tName = urlSplit[urlIndex].split("\\.")[1].split("\\?")[0];
+                String tName = ((String) req.getAttributes().get("service")).split("\\.")[1];
+
                 Template cTemplate = cService.getTemplates().get(tName);