Changeset 39057

Timestamp:

Nov 6, 2015, 10:06:14 AM (11 years ago)

Author:

bills

Message:

use $ipprc->file_resolve() to resolve nebulous paths. Make sure cell
is a valid integer (no leading zero) before passing it to stilts.

File:

• trunk/tools/bills/joinstackcmf (modified) (3 diffs)

trunk/tools/bills/joinstackcmf

@@ -16 +16 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
+use PS::IPP::Config 1.01 qw( :standard );
+
+my $ipprc =  PS::IPP::Config->new();
 
 # It wouldn't be too hard to make ota an array and do a list of chips.
@@ -49 +52 @@
 my $infilename = basename($cmf);
 
-my $path;
-if ($cmf =~ /^neb:/) {
-    $path = `neb-locate -p $cmf`;
-    if (!$path) {
-        die "ailed to find location of $cmf\n";
-    }
-    print $path if $verbose;
-    chomp $path;
-} else {
-    $path = $cmf;
+my $path = $ipprc->file_resolve($cmf);;
+if (!$path) {
+    die "ailed to find location of $cmf\n";
 }
 
@@ -76 +72 @@
     (undef, $skycell_id) = split " ", $results;
     (undef, $proj, $cell) = split '\.', $skycell_id;
-    $cell += 0;
-    $proj += 0;
 }
+$cell += 0;
+$proj += 0;
 
 print "$stack_id $skycal_id $skycell_id\n" if $verbose;