Changeset 11400

Timestamp:

Jan 29, 2007, 2:41:06 PM (19 years ago)

Author:

Paul Price

Message:

Removing debugging print statements.

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.23 2007-01-11 22:13:05 eugene Exp $
+# $Id: Config.pm,v 1.24 2007-01-30 00:41:06 price Exp $
 
 package PS::IPP::Config;
@@ -49 +49 @@
     my $camera = shift;         # Camera name
 
+    unless (defined $class) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     # Get location of ipprc file
     my $name;                   # Name of ipprc file
@@ -83 +88 @@
     my $self = shift;           # Configuration object
     my $name = shift;           # Camera name
+
+    unless (defined $self and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
 
     my $camera_list = _mdLookupMD($self->{_ipprc}, 'CAMERAS'); # List of cameras
@@ -118 +128 @@
     my $name = shift;           # datapath name
 
+    unless (defined $self and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     my $path_list = _mdLookupMD($self->{_ipprc}, 'DATAPATH'); # List of paths
     my $pathname = _mdLookupStr($path_list, $name); # Path of interest
@@ -129 +144 @@
     my $self = shift;           # Configuration object
     my $name = shift;           # raw name
+
+    unless (defined $self and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
 
     my $uri = URI->new($name) or die "Unable to parse URI: $name\n"; # URI
@@ -163 +183 @@
     my $self = shift;           # Configuration object
     my $name = shift;           # raw name
+
+    unless (defined $self and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
 
     $name = File::Spec->canonpath( $name); # Clean up
@@ -214 +239 @@
     my $filter = shift;         # Filter name, for extra qualification; optional
 
+    unless (defined $self and defined $name and defined $type) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     my $camera = $self->{camera}; # Camera configuration
     unless (defined $camera) {
@@ -267 +297 @@
     my $component = shift;      # For replacing {CHIP.NAME} and {CELL.NAME}
 
+    unless (defined $self and defined $name and defined $output) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     my $camera = $self->{camera}; # Camera configuration
     unless (defined $camera) {
@@ -292 +327 @@
 
     $filename =~ s/\{OUTPUT\}/$output/;
-    $filename =~ s/\{CHIP\.NAME\}/$component/;
-    $filename =~ s/\{CELL\.NAME\}/$component/;
+    if ($filename =~ /\{CHIP\.NAME\}/) {
+        unless (defined $component) {
+            carp "Programming error";
+            exit($PS_EXIT_PROG_ERROR);
+        }
+        $filename =~ s/\{CHIP\.NAME\}/$component/;
+        $filename =~ s/\{CELL\.NAME\}/$component/;
+    }
 
     return $filename;
@@ -321 +362 @@
     my $name = shift;           # Name of item to look up
 
+    unless (defined $mdc and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     # Iterate through the array of hashes
     foreach my $item (@$mdc) {
@@ -339 +385 @@
     my $name = shift;           # Name of item to look ip
 
+    unless (defined $mdc and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     # Iterate through the array of hashes
     foreach my $item (@$mdc) {
@@ -357 +408 @@
     my $mdc = shift;            # Metadata config to look up
     my $name = shift;           # Name of item to look ip
+
+    unless (defined $mdc and defined $name) {
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
 
     # Iterate through the array of hashes