Changeset 26232 for main

Timestamp:

2012-09-20T14:39:43+12:00 (12 years ago)

Author:

sjm84

Message:

CL names can now be specified with either dots or slashes in URLs e.g. cl1.2 or cl1/2

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/URLFilter.java

@@ -216 +216 @@
                         gRequest.setParameter(GSParams.DOCUMENT, segments[i + 1]);
 
-                        additionalParameters = new String[] { GSParams.ACTION};
-                        defaultParamValues = new String[] { "d"};
+                        additionalParameters = new String[] { GSParams.ACTION };
+                        defaultParamValues = new String[] { "d" };
                         //additionalParameters = new String[] { GSParams.ACTION, GSParams.DOCUMENT_TYPE };
                         //defaultParamValues = new String[] { "d", "hierarchy" };
@@ -283 +283 @@
                         for (int j = 1; (i + j) < segments.length; j++)
                         {
-                            if (!segments[i + j].matches("^(CL|cl)?\\d+$"))
-                            {
-                                break;
-                            }
-
-                            if (j > 1)
+                            String currentSegment = segments[i + j].replace("CL", "").replace("cl", "");
+                            if (currentSegment.contains("."))
+                            {
+                                String[] subsegments = currentSegment.split("\\.");
+                                for (String subsegment : subsegments)
+                                {
+                                    subsegment = subsegment.replace("CL", "").replace("cl", "");
+
+                                    if (cl.length() > 0)
+                                    {
+                                        cl += ".";
+                                    }
+
+                                    if (subsegment.length() > 0)
+                                    {
+                                        cl += subsegment;
+                                    }
+                                }
+                                continue;
+                            }
+                            if (!currentSegment.matches("^(CL|cl)?\\d+$"))
+                            {
+                                continue;
+                            }
+
+                            if (cl.length() > 0)
                             {
                                 cl += ".";
                             }
 
-                            cl += segments[i + j].replace("CL", "").replace("cl", "");
+                            cl += currentSegment;
                         }