Changeset 11637 for branches

Timestamp:

11/11/08 16:21:55 (8 weeks ago)

Author:

javier.amor.garcia@…

Message:

fixed reportUrls to manage moduels with multiple tableInfos refs #1152

Files:

• branches/pop-proxy-branch/ebox/src/EBox/LogObserver.pm (modified) (3 diffs)

branches/pop-proxy-branch/ebox/src/EBox/LogObserver.pm

@@ -13 +13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
+#
 # Class: EBox::LogObserver
 #
@@ -25 +24 @@
 use strict;
 use warnings;
+
+use Perl6::Junction qw(any);
 
 sub new 
@@ -183 +184 @@
       my $rawUrl = "/ebox/Logs/Index?selected=$index&refresh=1";
 
-#    my $tableInfo = $self->tableInfo();
-    if (not $tableInfo->{consolidate}) {
-        push @urls, [ domain => $tableInfo->{name},  raw => $rawUrl, ];
-        next;
+
+      if (not $tableInfo->{consolidate}) {
+          push @urls, [ domain => $tableInfo->{name},  raw => $rawUrl, ];
+          next;
+      }
+      
+      my @consolidateTables = keys %{ $tableInfo->{consolidate} };
+      
+      
+      my @reportComposites = grep {
+          ((ref $_) =~ m/::Report::/) and 
+              ($self->_compositeUsesDbTable($_, \@consolidateTables) )
+      } @{ $self->composites };
+
+
+      
+      (ref $self) =~  m/::(.*?)$/;;
+      my $urlModName= $1;
+
+      my $first = 1;
+      foreach my $comp (@reportComposites) {
+          my $compName = $comp->name();
+          my @compUrls =(
+                         domain => $tableInfo->{name},
+                         summary => "/ebox/$urlModName/Composite/$compName",
+                      );
+          if ($first) {
+              push @compUrls, (raw => $rawUrl );
+              $first =0;
+          }    
+          else {
+              push @compUrls, ( raw => undef);
+          }
+          
+          push @urls, \@compUrls;
+      }
+      
+      if (not @reportComposites) {
+          push @urls, [ domain => $tableInfo->{name},  raw => $rawUrl, ];
+          
+      }
+      
+      
+      
+  }
+
+    return \@urls;
+}
+
+
+sub _compositeUsesDbTable
+{
+    my ($self, $composite, $dbTables_r) = @_;
+    
+    my $usesDbTable = 0;
+    foreach my $component (@{ $composite->components() } ) {
+        if ($component->can('dbTableName')) {
+            if ($component->dbTableName() eq any( @{ $dbTables_r } )) {
+                $usesDbTable = 1;
+            }
+
+            last;
+        }
     }
 
-    my @reportComposites = grep {
-        (ref $_) =~ m/::Report::/;
-    } @{ $self->composites };
-
-    (ref $self) =~  m/::(.*?)$/;;
-    my $urlModName= $1;
-
-    my $first = 1;
-    foreach my $comp (@reportComposites) {
-        my $compName = $comp->name();
-        my @compUrls =(
-                       domain => $tableInfo->{name},
-                       summary => "/ebox/$urlModName/Composite/$compName",
-                      );
-        if ($first) {
-            push @compUrls, (raw => $rawUrl );
-            $first =0;
-        }    
-        else {
-            push @compUrls, ( raw => undef);
-        }
-
-        push @urls, \@compUrls;
-      }
-      
-      if (not @reportComposites) {
-        push @urls, [ domain => $tableInfo->{name},  raw => $rawUrl, ];
-        
-      }
-
- 
-
-    }
-
-
-
-    
-
-    return \@urls;
-}
-
+    return $usesDbTable;
+}