Changeset 16917

Timestamp:

Mar 10, 2008, 3:30:37 PM (18 years ago)

Author:

eugene

Message:

allow dvodb to be abstract name or file

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.79 2008-02-29 02:45:24 price Exp $
+# $Id: Config.pm,v 1.80 2008-03-11 01:30:37 eugene Exp $
 
 package PS::IPP::Config;
@@ -885 +885 @@
     my $catdir = metadataLookupStr($tessellations, $tess_id);
     unless (defined $catdir) {
-        carp "Can't find tessellation identifier $tess_id in TESSELLATIONS in site configuration.\n";
-        exit($PS_EXIT_CONFIG_ERROR);
+        print "Can't find tessellation identifier $tess_id in TESSELLATIONS in site configuration, assuming it is a filename.\n";
+        return $tess_id;
     }
 
@@ -919 +919 @@
     my $catdir = metadataLookupStr($catdirs, $dvodb);
     unless (defined $catdir) {
-        carp "Can't find dvodb identifier $dvodb in DVO.CATDIR in site configuration.\n";
-        exit($PS_EXIT_CONFIG_ERROR);
+        print "Can't find dvodb identifier $dvodb in DVO.CATDIR in site configuration, assuming filename\n";
+        return $dvodb;
     }
 
@@ -952 +952 @@
     my $catdir = metadataLookupStr($catdirs, $dvodb);
     unless (defined $catdir) {
-        carp "Can't find dvodb identifier $dvodb in PSASTRO.CATDIR in site configuration.\n";
-        exit($PS_EXIT_CONFIG_ERROR);
+        print "Can't find dvodb identifier $dvodb in PSASTRO.CATDIR in site configuration, assuming filename.\n";
+        return $dvodb;
     }