Changeset 10699

Timestamp:

Dec 13, 2006, 3:29:58 PM (19 years ago)

Author:

jhoblitt

Message:

improve error checking in define_camera()

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.19 2006-12-08 19:58:32 price Exp $
+# $Id: Config.pm,v 1.20 2006-12-14 01:29:58 jhoblitt Exp $
 
 package PS::IPP::Config;
@@ -68 +68 @@
     my $camera_list = _mdLookupMD($self->{_ipprc}, 'CAMERAS'); # List of cameras
     my $filename = _mdLookupStr($camera_list, $name); # Filename of camera configuration
+    croak "Unable to find configuration file for camera $name\n"
+        if not defined $filename;
+
     my @path = split /:/, $self->{path}; # List of paths to try
     my $found;                  # Found it?
@@ -77 +80 @@
         }
     }
-    croak "Unable to find camera configuration file $filename\n" if not defined $found;
+    croak "Unable to find camera configuration file $filename\n"
+        if not defined $found;
 
     # Read the file
@@ -85 +89 @@
     $self->{camera} = $parser->parse( join '', @contents); # The parsed metadata config
 
+    # XXX why isn't just $self being returned here? -JH
     return defined $self->{camera};
 }