Changeset 2263 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.pm

Timestamp:

Aug 30, 2017, 5:07:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix the merge of YAML conf files in pb_conf_cache
(Up to 3 levels of keys for now)

File:

• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -70 +70 @@
 my $pbos = shift;
 my $ptr = undef; # returned value pointer on the hash of filters
-my $h;
+my $lh;
 
 pb_log(2,"Entering pb_get_filters - pbpkg: $pbpkg - pbos: ".Dumper($pbos)."\n");
@@ -108 +108 @@
     foreach my $f (@ffiles) {
         pb_log(3,"DEBUG processing filter file $f\n");
-        $h = pb_conf_cache($f,$h);
-    }
-    $ptr = $h->{"filter"};
+        $lh = pb_conf_cache($f,$lh);
+        pb_log(2, "filter hash is:\n".Dumper($lh)."\n");
+    }
+    $ptr = $lh->{"filter"};
 
     # TODO: find a place to document it. Why not in this file as pod and also documenting filters ?
     # Handle transform
-    if (defined $h->{transform}) {
-        while (my ($out_key,$spec) = each %{$h->{transform}}) {
+    if (defined $lh->{transform}) {
+        while (my ($out_key,$spec) = each %{$lh->{transform}}) {
             die "Unknown transform for $out_key '$spec' expected <out-key> <transform>" unless $spec =~ /^([\w\-]+)\s+(.+)$/;
             my ($in_key, $expr) = ($1, $2);