Changeset 834

Timestamp:

03/19/10 03:27:54 (14 years ago)

Author:

nanardon

Message:

• allow to several filters to build list, filters are merged, eg:

filter1=foo=bar
filter2=baz=tux
will perform seearch users having foo atributes set to bar, than adding user having baz set to tux (like OR).
Any keywords begining by 'filter' can be used

Location:

LATMOS-Accounts

Files:

• bin/la-sync-list (modified) (1 diff)
• sample/list.cfg (modified) (1 diff)

LATMOS-Accounts/bin/la-sync-list

@@ -63 +63 @@
         $content{$_} = 1;
     }
-    foreach my $id (sort $labase->search_objects(
-            $listcfg->val($list, 'objects', 'user'),
-            $listcfg->val($list, 'filter'),
-        )) {
+    my %ids;
+    foreach my $param ($listcfg->Parameters($list)) {
+        $param =~ /^filter/ or next;
+
+        foreach my $id (sort $labase->search_objects(
+                $listcfg->val($list, 'objects', 'user'),
+                $listcfg->val($list, $param),)) {
+            $ids{$id} = 1;
+        }
+    }
+    foreach my $id (sort keys %ids) {
         if (!$cache{$otype}{$fmt}{$id}) {
             my $obj = $labase->get_object(

LATMOS-Accounts/sample/list.cfg

@@ -24 +24 @@
 filter=company=LATMOS
 filter=mail=*
+filter2=company~Novimet
+filter2=contratType=heberges
+filter2=mail=*
 
 [sitevlb]