Changeset 1791 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Stat.pm

Timestamp:

06/24/16 12:20:47 (8 years ago)

Author:

nanardon

Message:

Allow recursive masse data fetching

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Stat.pm (modified) (2 diffs)

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

@@ -94 +94 @@
 
     my $op = $self->_get_attributes('aggregateFunction');
-    if (my $attr = $self->base->attribute($otype, $attribute)) {
-        if (my $obj = $attr->reference) {
-            if (my @reffilter = $self->_get_attributes('refFilter')) {
-                $reffiltered = {};
-                foreach ($self->base->search_objects($obj, @reffilter)) {
-                    $reffiltered->{$_} = 1;
-                }
-            }
-        }
-        if ($self->_get_attributes('refall') && $attr->has_values_list && !$op) {
-            foreach ($attr->can_values) {
+
+    my ($refOtype, $refAttr) = ($otype, undef);
+
+    foreach (split(/\./, $attribute)) {
+        if (my $attr = $self->base->attribute($refOtype, $_)) {
+            if (my $obj = $attr->reference) {
+                ($refOtype, $refAttr) = ($obj, $attr);
+            } else {
+                ($refOtype, $refAttr) = (undef, undef);
+            }
+        }
+    }
+
+    if ($refAttr && $refOtype) {
+        if (my @reffilter = $self->_get_attributes('refFilter')) {
+            $reffiltered = {};
+            foreach ($self->base->search_objects($refOtype, @reffilter)) {
+                $reffiltered->{$_} = 1;
+            }
+        }
+        if ($self->_get_attributes('refall') && $refAttr->has_values_list && !$op) {
+            foreach ($refAttr->can_values) {
                 if ($reffiltered && !$reffiltered->{$_}) {
                     next;
@@ -136 +147 @@
                 next;
             }
-            $_ ||= '(none)';
+            defined($_) && $_ ne '' or $_ = '(none)';
             if ($op) {
                 push(@{$aggdata{$id}}, $_);