Changeset 1944

Timestamp:

02/13/17 20:06:04 (7 years ago)

Author:

nanardon

Message:

Fix search when multiple subref are given as filter

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (5 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -974 +974 @@
             }
         }
+        my $attrKey = $attr;
 
         if ($attrref) {
@@ -981 +982 @@
             };
 
+            $attrKey .= '.' . $attrref;
             my @results = $base->search_objects($otype, "$attrref$operator$val");
             $base->log(LA_DEBUG, "Sub search %s res: %s", $otype, join(', ', @results));
 
             if (!@results) {
-                $results->{$attr} ||= {};
+                $results->{$attrKey} ||= {};
                 next;
             }
@@ -994 +996 @@
         my @results = $class->_search_uniq_filter($base, $attr, $operator, $val);
 
-        $results->{$attr} ||= {};
-        $results->{$attr}{$_} = 1 foreach (@results) 
+        $base->log(LA_DEBUG, "Search result: %s: %s", $attr, join(' ', @results));
+        $results->{$attrKey} ||= {};
+        $results->{$attrKey}{$_} = 1 foreach (@results);
     }
 
@@ -1004 +1007 @@
     foreach my $attr (keys %{ $results }) {
         my @values = keys %mresults;
-        foreach (@values) {
-            $results->{$attr}{$_} or delete($mresults{$_});
+        foreach my $value (sort(@values)) {
+            if (!$results->{$attr}{$value}) {
+                delete($mresults{$value});
+            }
         }
     }
 
     # We add to result aliases pointing to these object:
-    if(keys %mresults && !$noalias) {
+    if(scalar(keys %mresults) && !$noalias) {
         my @alias = $class->_search_uniq_filter($base, 'oalias', '=', join('||', keys %mresults));
         foreach(@alias) {
@@ -1032 +1037 @@
 
     my @values = split(/([\|\&]+)/, $value);
+
+    $base->log(LA_DEBUG, "Uniq search for " . $class->type . "->$attr $operator (%s)", join(' ', @values));
+
     return unless(@values);
-
-    $base->log(LA_DEBUG, "Uniq search for " . $class->type . "->$attr $operator (%s)", join(' ', @values));
     
     # We detect if we can do a very quick search: