Changeset 1462

Timestamp:

11/04/15 09:30:22 (9 years ago)

Author:

nanardon

Message:

Add avg/count aggregate function to stat, allow unset value to be count

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Stat.pm (modified) (4 diffs)
• objects.pm (modified) (1 diff)

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

@@ -44 +44 @@
             lastStatId => { },
             aggregateFunction => {
-                can_values => sub { qw(sum) },
-            }
+                can_values => sub { qw(sum avg count) },
+            },
+            nullValue => { },
         }
     )
@@ -63 +64 @@
     my $reffiltered = undef;
 
+    my $op = $self->_get_attributes('aggregateFunction');
     if (my $attr = $self->base->attribute($otype, $attribute)) {
         if (my $obj = $attr->reference) {
@@ -72 +74 @@
             }
         }
-        if ($self->_get_attributes('refall') && $attr->has_values_list) {
+        if ($self->_get_attributes('refall') && $attr->has_values_list && !$op) {
             foreach ($attr->can_values) {
                 if ($reffiltered && !$reffiltered->{$_}) {
@@ -93 +95 @@
     my %results = $self->base->attributes_summary_by_object($otype, $attribute);
 
-    my $op = $self->_get_attributes('aggregateFunction');
+    my $nullValue = $self->_get_attributes('nullValue');
+    my %aggdata;
     foreach my $id (keys %results) {
         $filtered{ $id } or next;
         foreach (@{ $results{ $id }}) {
-            if ($reffiltered && !$reffiltered->{$_}) {
+            next unless (defined($_) || $nullValue);
+            if ($_ && $reffiltered && !$reffiltered->{$_}) {
                 next;
             }
+            $_ ||= '(none)';
             if ($op) {
-                if ($op eq 'sum') {
-                    $stats{$id} ||= 0;
-                    $stats{$id} += $_;
-                }
+                push(@{$aggdata{$id}}, $_);
             } else {
                 $stats{ $_ } ||= 0;
                 $stats{ $_ }++;
+            }
+        }
+    }
+    if ($op) {
+        foreach my $key (keys %aggdata) {
+            if ($op eq 'sum') {
+                my $sum = 0;
+                $sum += $_ foreach (@{ $aggdata{$key} });
+                $stats{ $key } = $sum;
+            }
+            elsif ($op eq 'count') {
+                $stats{ $key } = scalar(@{ $aggdata{$key} });
+            }
+            elsif ($op eq 'average') {
+                my $sum = 0;
+                $sum += $_ foreach (@{ $aggdata{$key} });
+                $stats{ $key } = $sum / scalar(@{ $aggdata{$key} });
             }
         }

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

@@ -634 +634 @@
             )
             : sprintf(
-                q{select name, value from %s join %s on %s.ikey = %s.okey where attr = ?} . ($base->{wexported} ? '' : ' and "exported" = true'),
+                q{select name, value from %s left join %s on %s.ikey = %s.okey and attr = ?} . ($base->{wexported} ? '' : ' and "exported" = true'),
                 $base->db->quote_identifier($class->_object_table),
                 $base->db->quote_identifier($class->_object_table .