UPD: Allow 2-level wildcard pages

[gigi.git] / src / org / cacert / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 6af640ead48ddf2b83a8a2905f8415ff46c6d85d..09daf6df3ccb4c3b4d9142075ca36e9a677250b5 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -249,6 +249,17 @@ public class Gigi extends HttpServlet {
         int idx = pathInfo.lastIndexOf('/');
         pathInfo = pathInfo.substring(0, idx);
 
+        page = pages.get(pathInfo + "/*");
+        if (page != null) {
+            return page;
+        }
+
+        idx = pathInfo.lastIndexOf('/');
+        if (idx == -1) {
+            return null;
+        }
+        pathInfo = pathInfo.substring(0, idx);
+
         page = pages.get(pathInfo + "/*");
         if (page != null) {
             return page;