svn commit: rev 47619 - in incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db: . jdbm

[ak...@apache.org]

Author: akarasulu
Date: Thu Sep 30 20:21:04 2004
New Revision: 47619

Modified:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ExpressionEvaluator.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmIndex.java
Log:
Fixed missmatch in schemas all is aligned now and compiles.


Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ExpressionEvaluator.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ExpressionEvaluator.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ExpressionEvaluator.java	Thu Sep 30 20:21:04 2004
@@ -23,8 +23,9 @@
 
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.filter.BranchNode;
-import org.apache.eve.schema.NormalizerRegistry;
-import org.apache.eve.schema.ComparatorRegistry;
+
+import org.apache.eve.schema.OidRegistry;
+import org.apache.eve.schema.AttributeTypeRegistry;
 
 
 /**
@@ -61,20 +62,21 @@
      * evaluator which will be created.
      *
      * @param db the database this evaluator operates upon
-     * @param normalizerRegistry the normalizer reg used for value normalization
-     * @param comparatorRegistry the comparator reg used for value comparison
+     * @param oidRegistry the oid reg used for attrID to oid resolution
+     * @param attributeTypeRegistry the attribtype reg used for value comparison
      */
     public ExpressionEvaluator( Database db,
-                                NormalizerRegistry normalizerRegistry,
-                                ComparatorRegistry comparatorRegistry )
+                                OidRegistry oidRegistry,
+                                AttributeTypeRegistry attributeTypeRegistry )
     {
         ScopeEvaluator scopeEvaluator = null;
         SubstringEvaluator substringEvaluator = null;
 
         scopeEvaluator = new ScopeEvaluator( db );
-        substringEvaluator = new SubstringEvaluator( db, normalizerRegistry );
-        leafEvaluator = new LeafEvaluator( db, scopeEvaluator,
-            normalizerRegistry, comparatorRegistry, substringEvaluator );
+        substringEvaluator = new SubstringEvaluator( db, oidRegistry,
+            attributeTypeRegistry );
+        leafEvaluator = new LeafEvaluator( db, oidRegistry,
+            attributeTypeRegistry, scopeEvaluator, substringEvaluator );
     }
 
 

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java	Thu Sep 30 20:21:04 2004
@@ -472,7 +472,7 @@
         BigInteger ancestorId = null;    // Id of an alias entry relative
 
         // Access aliasedObjectName, normalize it and generate the Name 
-        normalizer = oneAliasIdx.getAttribute().getNormalizer();
+        normalizer = oneAliasIdx.getAttribute().getEquality().getNormalizer();
         targetDn = new LdapName( ( String ) normalizer.normalize( aliasTarget ) );
            
         /*

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmIndex.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmIndex.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmIndex.java	Thu Sep 30 20:21:04 2004
@@ -330,7 +330,7 @@
      */    
     private void initTables() throws NamingException
     {
-        Comparator comp = attribute.getComparator(); 
+        Comparator comp = attribute.getEquality().getComparator();
         
         /*
          * The forward key/value map stores attribute values to master table 
@@ -718,7 +718,7 @@
 
         if ( null == normalized ) 
         {
-            normalized = attribute.getNormalizer().normalize( attrVal );
+            normalized = attribute.getEquality().getNormalizer().normalize( attrVal );
 
             // Double map it so if we use an already normalized
             // value we can get back the same normalized value.