Changeset 29936

Timestamp:

02/07/08 13:34:29 (2 years ago)

Author:

atchertchian

Message:

NXP-2051: make it possible to query an ldap directory with substring search subfinal or subany (fwd from r29934)

Files:

• org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/examples/default-ldap-users-directory-bundle.xml (modified) (1 diff)
• org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPDirectoryDescriptor.java (modified) (4 diffs)
• org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPSession.java (modified) (4 diffs)
• org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPSubstringMatchType.java (copied) (copied from org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPSubstringMatchType.java)

org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/examples/default-ldap-users-directory-bundle.xml

@@ -65 +65 @@
-      <searchScope>onelevel</searchScope>
-
+      <!-- using 'subany', search will match *toto*. use 'subfinal' to
+        match *toto and 'subinitial' to match toto*. subinitial is the
+        default  behaviour-->
+      <substringMatchType>subany</substringMatchType>
+
-      <readOnly>false</readOnly>
-

org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPDirectoryDescriptor.java

@@ -28 +28 @@
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import org.nuxeo.common.xmap.annotation.XNode;
-import org.nuxeo.common.xmap.annotation.XNodeList;
@@ -39 +41 @@
-public class LDAPDirectoryDescriptor {
-
+    public static final Log log = LogFactory.getLog(LDAPDirectoryDescriptor.class);
+
-    public static final int defaultSearchScope = SearchControls.ONELEVEL_SCOPE;
-
@@ -74 +78 @@
-
-    public int searchScope;
+
+    public String substringMatchType;
-
-    @XNode("creationBaseDn")
@@ -195 +201 @@
-    }
-
+    public String getSubstringMatchType() {
+        return substringMatchType;
+    }
+
+    @XNode("substringMatchType")
+    public void setSubstringMatchType(String substringMatchType) {
+        if (substringMatchType == null) {
+            // default behaviour
+            this.substringMatchType = LDAPSubstringMatchType.SUBINITIAL;
+        } else if (LDAPSubstringMatchType.SUBINITIAL.equals(substringMatchType)
+                || LDAPSubstringMatchType.SUBFINAL.equals(substringMatchType)
+                || LDAPSubstringMatchType.SUBANY.equals(substringMatchType)) {
+            this.substringMatchType = substringMatchType;
+        } else {
+            log.error("Invalid substring match type: " + substringMatchType
+                    + ". Valid options: subinitial, subfinal, subany");
+            this.substringMatchType = LDAPSubstringMatchType.SUBINITIAL;
+        }
+    }
+
-    public String getName() {
-        return name;

org.nuxeo.ecm.platform/trunk/nuxeo-platform-directory-ldap/src/main/java/org/nuxeo/ecm/directory/ldap/LDAPSession.java

@@ -96 +96 @@
-    protected final Map<String, Field> schemaFieldMap;
-
+    protected final String substringMatchType;
+
-    public LDAPSession(LDAPDirectory directory, DirContext dirContext) {
-        this.directory = directory;
@@ -105 +107 @@
-        sid = String.valueOf(SIDGenerator.next());
-        searchBaseDn = directory.getConfig().getSearchBaseDn();
+        substringMatchType = directory.getConfig().getSubstringMatchType();
-    }
-
@@ -376 +379 @@
-            String[] filterArgs = new String[filter.size()];
-
+            if (fulltext == null) {
+                fulltext = Collections.emptySet();
+            }
+
-            int index = 0;
-            for (String fieldName : filter.keySet()) {
@@ -393 +400 @@
-                    currentFilter.append("!(" + backendFieldName + "=*)");
-                } else if ("".equals(fieldValue)) {
+                    if (fulltext.contains(fieldName)) {
+                        currentFilter.append(backendFieldName + "=*");
+                    } else {
+                        currentFilter.append(backendFieldName + "=");
+                    }
+                } else {
-                    currentFilter.append(backendFieldName + "=");
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                currentFilter.append(")");