archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access: [2208] trunk/archive-access/projects/ access-control/oracle/src/main/java/org/archive/accesscontrol/webui/ AdminController.java

[<al...@us...>]

Revision: 2208
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2208&view=rev
Author:   alexoz
Date:     2008-02-27 03:28:06 -0800 (Wed, 27 Feb 2008)

Log Message:
-----------
* AdminController.java
Include list of subnodes in page.

Modified Paths:
--------------
    trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java

Modified: trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java	2008-02-27 11:27:17 UTC (rev 2207)
+++ trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java	2008-02-27 11:28:06 UTC (rev 2208)
@@ -8,9 +8,11 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
@@ -20,6 +22,7 @@
 import org.archive.accesscontrol.model.HibernateRuleDao;
 import org.archive.accesscontrol.model.Rule;
 import org.archive.accesscontrol.model.RuleSet;
+import org.archive.surt.NewSurtTokenizer;
 import org.archive.surt.SURTTokenizer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.ModelAndView;
@@ -51,9 +54,11 @@
     
     protected ModelAndView ruleList(String surt, Long editingRuleId, HttpServletRequest request,
             HttpServletResponse response) throws Exception {
+        int surtSegments = new NewSurtTokenizer(surt).toList().size();
         Map<String, Object> model = new HashMap<String, Object>();
         RuleSet rules = ruleDao.getRuleTree(surt);
         ArrayList<DisplayRule> ruleList = new ArrayList<DisplayRule>();
+        ArrayList<String> childSurts = new ArrayList<String>();
         
         for (Rule rule: rules) {
             int comparison = rule.getSurt().compareTo(surt);
@@ -62,13 +67,24 @@
                 displayRule.setEditing(rule.getId().equals(editingRuleId));
                 ruleList.add(displayRule);
             } else {
-                // lowerRules.add(rule);
+                try {
+                String segment = new NewSurtTokenizer(rule.getSurt())
+                            .toList().get(surtSegments);
+                    if (!childSurts.contains(segment)) {
+                        childSurts.add(segment);
+                    }
+                } catch (IndexOutOfBoundsException e) {
+                }
             }
         }
         Collections.sort(ruleList);
         
+        ArrayList<String> childSurtsList = new ArrayList<String>(childSurts);
+        Collections.sort(childSurtsList);
+        
         model.put("rules", ruleList);
         model.put("surt", surt);
+        model.put("childSurts", childSurtsList);
         model.put("encodedSurt", URLEncoder.encode(surt, "utf-8"));
         model.put("breadcrumbs", SurtNode.nodesFromSurt(surt));
         model.put("editingRuleId", request.getParameter("edit"));


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

[Archive-access-cvs] SF.net SVN: archive-access: [2223] trunk/archive-access/projects/ access-control/oracle/src/main/java/org/archive/accesscontrol/webui/ AdminController.java

[<al...@us...>]

Revision: 2223
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2223&view=rev
Author:   alexoz
Date:     2008-03-20 17:58:37 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
AdminController.java
* Added a few cleanups to SURTs and allow URLs to be entered as an alternative.

Modified Paths:
--------------
    trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java

Modified: trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java	2008-03-14 03:23:05 UTC (rev 2222)
+++ trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java	2008-03-21 00:58:37 UTC (rev 2223)
@@ -19,6 +19,8 @@
 import org.archive.accesscontrol.model.Rule;
 import org.archive.accesscontrol.model.RuleSet;
 import org.archive.surt.NewSurtTokenizer;
+import org.archive.util.ArchiveUtils;
+import org.archive.util.SURT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
@@ -52,9 +54,40 @@
         }
         return ruleList(surt, editingRuleId, request, response);
     }
+
+    /**
+     * Return true if the given string appears to be a SURT.
+     * @param s
+     * @return
+     */
+    protected boolean isSurt(String s) {
+        return s.charAt(0) == '(' || s.indexOf("://") == s.indexOf("://(");
+    }
     
+    /**
+     * Perform a several cleanups on the given surt:
+     *   * Convert a URL to a SURT
+     *   * Add a trailing slash to SURTs of the form: http://(...)
+     * @param surt
+     * @return
+     */
+    protected String cleanSurt(String surt) {
+        if (!isSurt(surt)) {
+            surt = ArchiveUtils.addImpliedHttpIfNecessary(surt);
+            surt = SURT.fromURI(surt);
+        }
+        
+        if (surt.endsWith(",)") && surt.indexOf(")") == surt.length()-1) {
+            surt = surt + "/";
+        }
+        
+        return surt;
+    }
+    
     protected ModelAndView ruleList(String surt, Long editingRuleId, HttpServletRequest request,
             HttpServletResponse response) throws Exception {
+        
+        surt = cleanSurt(surt);        
         int surtSegments = new NewSurtTokenizer(surt).toList().size();
         Map<String, Object> model = new HashMap<String, Object>();
         RuleSet rules = ruleDao.getRuleTree(surt);


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