Changeset 1791

Timestamp:

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

Author:

nanardon

Message:

Allow recursive masse data fetching

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Stat.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (5 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -90 +90 @@
 
     $c->stash->{template} = 'login/index.tt';
+    return 0;
 }
 

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}}, $_);

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

@@ -639 +639 @@
 
 sub attributes_summary {
-    my ($class, $base, $attribute) = @_;
+    my ($class, $base, $dotAttribute) = @_;
+
+    my ($attribute, $recursiveAttr) = $dotAttribute =~ /(\w+)(?:\.(.*))?/;
+    
     my $attr = $base->attribute($class->type, $attribute) or do {
         $base->log(LA_ERR, "Cannot instantiate %s attribute", $attribute);
@@ -676 +679 @@
 
     my %values;
-    while (my $res = $sth->fetchrow_hashref) {
-        $values{$res->{value}} = 1 if ($res->{value});
+    if ($recursiveAttr) {
+        my $otype = $attr->reference or do {
+            $base->log(LA_ERR, "Cannot do recursive search, no ref for attribute %s", $attribute);
+            return;
+        };
+        my %parentRes = $base->attributes_summary_by_object($otype, $recursiveAttr) or return;
+
+        while (my $res = $sth->fetchrow_hashref) {
+            defined($res->{value}) or next;
+            $values{ $parentRes{ $res->{value} } } = 1;
+        }
+    } else {
+        while (my $res = $sth->fetchrow_hashref) {
+            $values{$res->{value}} = 1 if ($res->{value});
+        }
     }
     sort keys %values
@@ -689 +705 @@
 
 sub attributes_summary_by_object {
-    my ($class, $base, $attribute) = @_;
+    my ($class, $base, $dotAttribute) = @_;
+
+    my ($attribute, $recursiveAttr) = $dotAttribute =~ /(\w+)(?:\.(.*))?/;
+
     my $attr = $base->attribute($class->type, $attribute) or do {
         $base->log(LA_ERR, "Cannot instantiate %s attribute", $attribute);
@@ -702 +721 @@
         return;
     }
+
     if ($attr->{managed}) {
         return $class->SUPER::attributes_summary_by_object($base, $attribute);
@@ -726 +746 @@
 
     my %values;
-    while (my $res = $sth->fetchrow_hashref) {
-        defined($res->{value}) or next;
-        push(@{ $values{ $res->{name} } }, $res->{value});
+    if ($recursiveAttr) {
+        my $otype = $attr->reference or do {
+            $base->log(LA_ERR, "Cannot do recursive search, no ref for attribute %s", $attribute);
+            return;
+        };
+        my %parentRes = $base->attributes_summary_by_object($otype, $recursiveAttr) or return;
+
+        while (my $res = $sth->fetchrow_hashref) {
+            defined($res->{value}) or next;
+            push(@{ $values{ $res->{name} } }, @{ $parentRes{ $res->{value} } || []});
+        }
+    } else {
+        while (my $res = $sth->fetchrow_hashref) {
+            defined($res->{value}) or next;
+            push(@{ $values{ $res->{name} } }, $res->{value});
+        }
     }
     %values