Revision: 2220
http://archive-access.svn.sourceforge.net/archive-access/?rev=2220&view=rev
Author: alexoz
Date: 2008-03-13 19:54:06 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
* RulesController.java
Allow retrieving rules that start with a scheme.
Modified Paths:
--------------
trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/oracle/RulesController.java
Modified: trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/oracle/RulesController.java
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/oracle/RulesController.java 2008-03-13 06:34:03 UTC (rev 2219)
+++ trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/oracle/RulesController.java 2008-03-14 02:54:06 UTC (rev 2220)
@@ -241,6 +241,7 @@
* @throws URIException
*/
public ModelAndView getRuleTree(String surt) throws URIException {
+ System.out.println("*** getRuleTree: " + surt);
return new ModelAndView(view, "object", ruleDao.getRuleTree(surt));
}
@@ -267,10 +268,16 @@
ruleDao.deleteAllRules();
return null;
}
- } else if (idParam.startsWith("(")) { // GET /rules/(some,surt,)
+ }
+
+ Long id = null;
+ try {
+ id = new Long(idParam);
+ } catch (NumberFormatException e) {}
+
+ if (id == null) { // GET /rules/(some,surt,)
return getRuleNode(idParam);
} else {
- Long id = new Long(idParam);
if (request.getMethod().equals("GET")) { // GET /rules/:id
return getRule(id);
} else if (request.getMethod().equals("PUT")) { // PUT /rules/:id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
