Revision: 2213
http://archive-access.svn.sourceforge.net/archive-access/?rev=2213&view=rev
Author: alexoz
Date: 2008-03-03 20:41:20 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
* HibernateRuleDao.java
Changed to use new SURT tokenizer.
*HibernateRuleDaoTest.java
Minor cleanup of imports.
Modified Paths:
--------------
trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java
trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java
Modified: trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java 2008-03-04 04:40:21 UTC (rev 2212)
+++ trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/model/HibernateRuleDao.java 2008-03-04 04:41:20 UTC (rev 2213)
@@ -3,9 +3,8 @@
import java.util.Collection;
import java.util.List;
-import org.apache.commons.httpclient.URIException;
import org.archive.accesscontrol.RuleDao;
-import org.archive.surt.SURTTokenizer2;
+import org.archive.surt.NewSurtTokenizer;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -59,17 +58,13 @@
// add the root SURT
rules.addAll(getRulesWithExactSurt("("));
- // now pull out all of the requested branch and a path to the root
- SURTTokenizer2 tok = SURTTokenizer2.newFromSURT(surt);
- while (true) {
- String search = tok.nextSearch();
- if (search == null) break;
-
- if (!search.endsWith(SURTTokenizer2.EXACT_SUFFIX)) {
- rules.addAll(getRulesWithExactSurt(search));
+ boolean first = true;
+ for (String search: new NewSurtTokenizer(surt).getSearchList()) {
+ if (first) {
+ first = false;
+ rules.addAll(getRulesWithSurtPrefix(search));
} else {
- rules.addAll(getRulesWithSurtPrefix(search.substring(0, search.length() - 1)));
- tok.nextSearch(); // skip the duplicate exact-match
+ rules.addAll(getRulesWithExactSurt(search));
}
}
Modified: trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java 2008-03-04 04:40:21 UTC (rev 2212)
+++ trunk/archive-access/projects/access-control/oracle/src/test/java/org/archive/accesscontrol/model/HibernateRuleDaoTest.java 2008-03-04 04:41:20 UTC (rev 2213)
@@ -1,9 +1,6 @@
package org.archive.accesscontrol.model;
-import java.util.Iterator;
import java.util.List;
-import java.util.SortedSet;
-
import org.archive.accesscontrol.model.HibernateRuleDao;
import org.archive.accesscontrol.model.Rule;
import org.archive.accesscontrol.model.RuleChange;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
