Changeset 40483 for branches/czw_branch/20170908/ippScripts/scripts/ipp_filename.pl

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• ippScripts/scripts/ipp_filename.pl (modified) (2 diffs)

branches/czw_branch/20170908/ippScripts/scripts/ipp_filename.pl

@@ -10 +10 @@
 #print "$ENV{'PATH'}\n";
 #print "$ENV{'PERL5LIB'}\n";
+#print "NEB_SERVER: $ENV{'NEB_SERVER'}<br>\n";
 
-# CZW: This is a horrible hack, but I don't want to have to debug all of ippMonitor to figure out why it's not working.
+# EAM: check for missing NEB_SERVER and exit with an error
 unless (defined($ENV{'NEB_SERVER'})) {
-    $ENV{'NEB_SERVER'} = 'http://nebserver.ipp.ifa.hawaii.edu:80/nebulous';
+    print "NEB_SERVER not defined in ipp_filename.pl\n";
+    exit (5);
 }
-
+if ($ENV{'NEB_SERVER'} eq "") {
+    print "NEB_SERVER not set in ipp_filename.pl\n";
+    exit (6);
+}
 
 use PS::IPP::Config;
@@ -52 +57 @@
 
 my $realname = $ipprc->file_resolve( $filename, $touch );
+if (not defined $realname) {
+    print "nebulous file $filename not found\n";
+    exit (1);
+}
+
 print "$realname\n";