Changeset 418

Timestamp:

2008-06-22 19:18:57 (5 years ago)

Author:

jgou

Message:

some minor improvements to support browsers adding a question mark on a post without parameters

Location:

trunk/samples/kauri-dbforms-sample/src/main

Files:

• java/org/kauriproject/samples/dbforms/BusinessRestlet.java (modified) (4 diffs)
• kauri/router.groovy (modified) (1 diff)

trunk/samples/kauri-dbforms-sample/src/main/java/org/kauriproject/samples/dbforms/BusinessRestlet.java

@@ -45 +45 @@
 public class BusinessRestlet extends Restlet {
 
-    private static final Pattern PERSON_PATTERN = Pattern.compile("^/person/([\\d]+)\\??.*$");
-    private static final Pattern ADDRESS_PATTERN = Pattern.compile("^/address/([\\d]+)\\??.*$");
-    private static final Pattern GENERIC_PATTERN = Pattern.compile("^/([^/]+)/(?:([\\d]+))?(?:\\?.*)?$");
+    private static final Pattern GENERIC_PATTERN = Pattern.compile("^/([^/?]+)/(?:([\\d]+))?(?:\\?.*)?$");
 
     private static final String rootURI = "km:/jpaRestlet/";
@@ -166 +164 @@
     private void handleGet(Request request, Response response) {
         String path = request.getResourceRef().getRemainingPart();
-        Matcher personMatcher = PERSON_PATTERN.matcher(path);
-        Matcher addressMatcher = ADDRESS_PATTERN.matcher(path);
-        String templateLocation = "kms:/public" + path + ".xml";
-
+        if (path.endsWith("?")) {
+            path = path.substring(0, path.length() - 1);
+        }
+        Matcher matcher = GENERIC_PATTERN.matcher(path);
+        String templateLocation;
         Map<String, Object> map = new HashMap<String, Object>();
         if (path.equals("/addresses")) {
@@ -176 +175 @@
                 map.put("addressList", object);
             }
+            templateLocation = "kms:/public/addresses.xml";
         } else if (path.equals("/persons")) {
             Object object = doInnerRequest("person", MediaType.APPLICATION_JAVA_OBJECT);
@@ -181 +181 @@
                 map.put("personList", object);
             }
-        } else if (path.equals("/person") || path.equals("/address")) {
-            map.put("jsondata", null);
-        } else if (personMatcher.matches()) {
-            String uri = "person/" + personMatcher.group(1);
+            templateLocation = "kms:/public/persons.xml";
+        } else if (matcher.matches()) {
+            String uri = matcher.group(1) + "/" + matcher.group(2);
             JSONObject jso = (JSONObject) doInnerRequest(uri, MediaType.APPLICATION_JSON);
             map.put("jsondata", jso);
-            templateLocation = "kms:/public/person.xml";
-        } else if (addressMatcher.matches()) {
-            String uri = "address/" + addressMatcher.group(1);
-            JSONObject jso = (JSONObject) doInnerRequest(uri, MediaType.APPLICATION_JSON);
-            map.put("jsondata", jso);
-            templateLocation = "kms:/public/address.xml";
+            templateLocation = "kms:/public/" + matcher.group(1) + ".xml";
+        } else {
+            map.put("jsondata", null);
+            templateLocation = "kms:/public/" + path + ".xml";
         }
 

trunk/samples/kauri-dbforms-sample/src/main/kauri/router.groovy

@@ -3 +3 @@
 builder.router(context: moduleContext) {
     template(uri: "/", template: "kms:/public/index.xml",
-            mediaType: "text/html", postAttach : { route -> route.getTemplate().setMatchingMode(Template.MODE_EQUALS) })
+            mediaType: "text/html", postAttach : { route -> route.getTemplate().setMatchingMode(Template.MODE_STARTS_WITH) })
     
     /* template(uri: "/template/{templateId}", template: "kms:/public/{templateId}.xml",