Changeset 256

Timestamp:

06/23/09 18:39:30 (15 years ago)

Author:

nanardon

Message:

• extend search to allow exact match

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm (modified) (2 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -246 +246 @@
 
 sub search {
-    my ($class, $base, %filter) = @_;
+    my ($class, $base, @filter) = @_;
     my @results;
+    my @parsed_filter;
+    while (my $item = shift(@filter)) {
+        # attr=foo => no extra white space !
+        # \W is false, it is possible to have two char
+        my ($attr, $mode, $val) = $item =~ /^(\w+)(?:(\W)(.+))?$/ or next;
+        if (!$mode) {
+            $mode = '~';
+            $val = shift(@filter);
+        }
+        push(
+            @parsed_filter,
+            {
+                attr => $attr,
+                mode => $mode,
+                val  => $val,
+            }
+        );
+    }
     foreach my $id ($base->list_objects($class->type)) {
         my $obj = $base->get_object($class->type, $id);
         my $match = 1;
-        foreach my $field (keys %filter) {
-            my $value = $filter{$field};
-            $base->get_field_name($class->type, $field, 'r') or next;
-            my $fval = $obj->get_c_field($field) || '';
+        foreach my $field (@parsed_filter) {
+            my $value = $field->{val};
+            $base->get_field_name($class->type, $field->{attr}, 'r') or next;
+            my $fval = $obj->get_c_field($field->{attr}) || '';
             if ($value eq '*') {
                 if ($fval eq '') {
@@ -265 +283 @@
                     last;
                 }
-            } elsif ($fval !~ m/\Q$value\E/i) {
-                $match = 0;
-                last;
+            } elsif ($field->{mode} eq '=') {
+                if ($fval ne $value) {
+                    $match = 0;
+                    last;
+                }
+            } elsif($field->{mode} eq '~') {
+                if ($fval !~ m/\Q$value\E/i) {
+                    $match = 0;
+                    last;
+                }
             }
         }