From cb4ac3ca184fb1ba4c1b034bc95c72843e64a4cb Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sun, 17 Nov 2013 16:38:34 +0100
Subject: [PATCH] =?UTF-8?q?D'autre=20fa=C3=A7ons=20de=20fournir=20human=5F?=
 =?UTF-8?q?to=5Fldap=20pour=20les=20filtres=20de=20recherches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 filter2.py | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 filter3.py | 48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 filter2.py
 create mode 100644 filter3.py

diff --git a/filter2.py b/filter2.py
new file mode 100644
index 0000000..4af8680
--- /dev/null
+++ b/filter2.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+"""Plus rapide"""
+
+import pyparsing
+
+def simplify(l):
+	if not isinstance(l, list):
+		return l
+	if len(l) == 1: 
+		return simplify(l[0])
+	else:
+		return [simplify(i) for i in l]
+	
+def toprefix(l):
+	if not isinstance(l, list):
+		return l
+	op=l[1]
+	args=[toprefix(i) for i in l if i!=op]
+	return [op]+args
+	
+def prioritize(l):
+	if not isinstance(l, list):
+		return l
+	l=simplify(l)
+	for c in ['!=', '=', '&', '|']:
+		i=0
+		while i<len(l):
+			if l[i] == c:
+				tmp=[prioritize(l[i-1]), l[i], prioritize(l[i+1])]
+				l[i-1]=tmp
+				del(l[i+1])
+				del(l[i])
+				i-=1
+			i+=1
+	return simplify(l)
+	
+def collapse(l):
+	"""retire les parentheses inutiles"""
+	if not isinstance(l, list):
+		return l
+	if not isinstance(l[1], list):
+		return [l[0], collapse(l[1]), collapse(l[2])]
+	if l[0] == l[1][0]:
+		return [l[0], collapse(l[1][1]), collapse(l[1][2]), collapse(l[2])]
+	else:
+		return [l[0], collapse(l[1]), collapse(l[2])]
+		
+		
+def toldapfilter(l):
+	if not isinstance(l, list):
+		return l
+	op=l[0]
+	if op == "=":
+		return "%s=%s" % (l[1], l[2])
+	elif op == "!=":
+		return "!(%s=%s)" % (l[1], l[2])
+	return op + ''.join(['(%s)' % toldapfilter(i) for i in l[1:]])
+
+
+txt = "".join(c for c in pyparsing.printables if c not in '()&|!=')
+expr = pyparsing.nestedExpr("(", ")", pyparsing.Word(txt) | pyparsing.oneOf("& | != ="))
+	
+def human_to_ldap(data):
+	data='(%s)' % data
+	l=expr.parseString(data).asList()
+	return "(%s)" % toldapfilter(collapse(toprefix(prioritize(l))))
+
diff --git a/filter3.py b/filter3.py
new file mode 100644
index 0000000..2989deb
--- /dev/null
+++ b/filter3.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+"""Plus joli"""
+
+import pyparsing
+
+txt = pyparsing.Word("".join(c for c in pyparsing.printables if c not in '=()|&'),exact=1)
+
+ne = pyparsing.Literal('!=')
+eq = pyparsing.Literal('=')
+andop = pyparsing.oneOf('&')
+orop = pyparsing.oneOf('|')
+     
+expr = pyparsing.operatorPrecedence( txt,
+    [
+     (ne, 2, pyparsing.opAssoc.RIGHT),
+     (eq, 2, pyparsing.opAssoc.RIGHT),
+     (andop, 2, pyparsing.opAssoc.LEFT),
+     (orop, 2, pyparsing.opAssoc.LEFT),]
+    )
+
+def simplify(l):
+	if not isinstance(l, list):
+		return l
+	if len(l) == 1: 
+		return simplify(l[0])
+	else:
+		return [simplify(i) for i in l]
+
+def toprefix(l):
+	if not isinstance(l, list):
+		return l
+	op=l[1]
+	args=[toprefix(i) for i in l if i!=op]
+	return [op]+args
+	
+def toldapfilter(l):
+	if not isinstance(l, list):
+		return l
+	op=l[0]
+	if op == "=":
+		return "%s=%s" % (l[1], l[2])
+	elif op == "!=":
+		return "!(%s=%s)" % (l[1], l[2])
+	return op + ''.join(['(%s)' % toldapfilter(i) for i in l[1:]])
+	
+def human_to_ldap(str):
+	return "(%s)" % toldapfilter(toprefix(simplify(expr.parseString(str).asList())))
+