Changeset 2154 in ProjectBuilder

Timestamp:

Dec 23, 2016, 4:25:49 AM (8 years ago)

Author:

Bruno Cornec

Message:

Fix conf file analysis:

• pb_conf_get_if now returns the value and theone for default if it doesn't exist. pb_conf_get inherits it
• Fix pb_conf_add_last_in_hash by analyzing correctly the 2 hashes without taking in account default values

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (5 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -29 +29 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_print pb_conf_get_all pb_conf_get_hash pb_conf_cache);
+our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_get_all pb_conf_get_hash pb_conf_cache);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -156 +156 @@
     return($lh) if (defined $pbconffiles{$cf});
     
-    # Add the new one at the end
+    # The new conf file overload values already managed
     my $num = keys %pbconffiles;
     pb_log(2,"DEBUG: pb_conf_cache of $cf at position $num\n");
@@ -317 +317 @@
 sub pb_conf_get_if {
 
-return(pb_conf_get_in_hash_if($h,@_));
+my @param = @_;
+my @return = pb_conf_get_in_hash_if($h,@_);
+my $proj = undef;
+
+if (not defined $ENV{'PBPROJ'}) {
+    $proj = "unknown";
+} else {
+    $proj = $ENV{'PBPROJ'};
+}
+
+foreach my $i (0..$#param) {
+    if (not defined $return[$i]->{$proj}) {
+        $return[$i]->{$proj} = $return[$i]->{'default'} if (defined $return[$i]->{'default'});
+    }
+}
+return(@return);
 }
 
@@ -342 +357 @@
 # Everything is returned via @h
 # @h contains the values overloading what @ptr may contain.
-my @h = pb_conf_get_if(@params);
+my @h = pb_conf_get_in_hash_if($h,@params);
 my @ptr = pb_conf_get_in_hash_if($ptr,@params);
 
@@ -349 +364 @@
 
 pb_log(2,"DEBUG: pb_conf_add_last_in_hash params: ".Dumper(@params)."\n");
-pb_log(2,"DEBUG: pb_conf_add_last_in_hash hash: ".Dumper(@h)."\n");
-pb_log(2,"DEBUG: pb_conf_add_last_in_hash input: ".Dumper(@ptr)."\n");
+pb_log(2,"DEBUG: pb_conf_add_last_in_hash current hash: ".Dumper(@h)."\n");
+pb_log(2,"DEBUG: pb_conf_add_last_in_hash new inputs: ".Dumper(@ptr)."\n");
 
 foreach my $i (0..$#params) {
     $p1 = $h[$i];
     $p2 = $ptr[$i];
-    # Always try to take the param from h 
+    # Always try to take the param from h in priority
     # in order to mask what could be defined already in ptr
     if (not defined $p2) {
         # exit if no p1 either
         next if (not defined $p1);
-        # No ref in p2 so use p1
-        $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));
     } else {
         # Ref found in p2
         if (not defined $p1) {
             # No ref in p1 so use p2's value
-            $p2->{$ENV{'PBPROJ'}} = $p2->{'default'} if ((not defined $p2->{$ENV{'PBPROJ'}}) && (defined $p2->{'default'}));
             $p1 = $p2;
         } else {
             # Both are defined - handling the overloading
-            if (not defined $p1->{'default'}) {
-                if (defined $p2->{'default'}) {
-                    $p1->{'default'} = $p2->{'default'};
-                }
-            }
-
+            # Now copy back into p1 all p2 content
+            # as p1 content always has priority over p2
             if (not defined $p1->{$ENV{'PBPROJ'}}) {
                 if (defined $p2->{$ENV{'PBPROJ'}}) {
                     $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}};
-                } else {
-                    $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if (defined $p1->{'default'});
                 }
             }
             # Now copy back into p1 all p2 content which doesn't exist in p1
-            # p1 content always has priority over p2
+            # # p1 content always has priority over p2
             foreach my $k (keys %$p2) {
                 $p1->{$k} = $p2->{$k} if (not defined $p1->{$k});