Changeset 23747 for trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Apr 8, 2009, 12:21:43 PM (17 years ago)

Author:

Paul Price

Message:

Adding default names for {CHIP.NAME} and {CELL.NAME}.

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (2 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1001 +1001 @@
     $filename =~ s/\{OUTPUT\}/$output/;
     if ($filename =~ /\{CHIP\.NAME\}/) {
-        unless (defined $component) {
-            carp "Programming error";
-            return undef;
-        }
-        $filename =~ s/\{CHIP\.NAME\}/$component/;
-        $filename =~ s/\{CELL\.NAME\}/$component/;
+        my ($chip, $cell) = ($component, $component); # Chip and cell names
+        $chip = "fpa" unless defined $chip;
+        $cell = "chip" unless defined $cell;
+        $filename =~ s/\{CHIP\.NAME\}/$chip/;
+        $filename =~ s/\{CELL\.NAME\}/$cell/;
     }
 
@@ -1043 +1042 @@
 
     if ($extname =~ /\{CHIP\.NAME\}/) {
-        unless (defined $component) {
-            carp "Programming error";
-            return undef;
-        }
-        $extname =~ s/\{CHIP\.NAME\}/$component/;
+        my $chip = $component;  # Chip name
+        $chip = "fpa" unless defined $chip;
+        $extname =~ s/\{CHIP\.NAME\}/$chip/;
     }