lib/awk/ldap2csv.awk

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index 3f28b29162d0130b6384049e7e6bd51eaf5fd94c..1dd21da62f7a02f3eacf4f3362be4d57bc771c47 100644 (file)
--- a/etc/profile.d/ldap.sh
+++ b/etc/profile.d/ldap.sh
@@ -79,16 +79,3 @@ ldapsearch_csv() {
   #slapcat -a "$filter" -o ldif-wrap=no | awk -F': ' '\
   ldapsearch -LLLx "$filter" $@ -o ldif-wrap=no | awk -f $NB_ROOT/lib/awk/ldap2csv.awk
 }
-
-# NB 14.11.17 ldap_objectclasses() {
-# NB 14.11.17   slapcat -o ldif-wrap=999 -b cn=config -a '(&(objectClass=olcSchemaConfig))' | awk '\
-# NB 14.11.17 /^olcObjectClasses:.*MUST/ {\
-# NB 14.11.17 gsub(/^[^\)]+\([^\(]+ NAME ./,"",$0);\
-# NB 14.11.17 gsub(/. DESC .* MUST \(/," MUST (",$0);\
-# NB 14.11.17 gsub(/Z\).*$/,"",$0);\
-# NB 14.11.17 gsub(/Z\$ /,"",$0);\
-# NB 14.11.17 print $0;\
-# NB 14.11.17 }
-# NB 14.11.17 /^zaza/ {print $0}
-# NB 14.11.17 '
-# NB 14.11.17 }

diff --git a/lib/awk/ldap2csv.awk b/lib/awk/ldap2csv.awk
index d6a72c5e1262443398f4d378b1c0c73353aa20e5..c49134e071675430bdd298677d8a5a677cf94d65 100644 (file)
--- a/lib/awk/ldap2csv.awk
+++ b/lib/awk/ldap2csv.awk
@@ -40,13 +40,11 @@ BEGIN {
 !/^(objectClass_): / {
 
   field = $1
-  #sub(/[ \r\n]+$/,"",$0)
   sub(/^.*?: /,"",$0) 
+  sub(/\t/,"  ",$0)
+  sub(/[ \r\n]+$/,"",$0)
 
   if (field in h && h[field] != "") {
-#concat = h[field]"|"$0
-#print ">"concat
-    #h[field] = h[field]"|"$2$3$4$5$6$7$8$9
     h[field] = h[field]""CONCAT""$0
   } else {
     h[field] = $0