Changeset 18736 for trunk/pstamp/test/testdquery.pl

Timestamp:

Jul 25, 2008, 11:24:38 AM (18 years ago)

Author:

bills

Message:

query_id is not required. If not supplied take the value in the input

File:

• trunk/pstamp/test/testdquery.pl (modified) (4 diffs)

trunk/pstamp/test/testdquery.pl

@@ -15 +15 @@
 
 
-my ($req_name, $input, $fs_name, $verbose, $save_temps);
+my ($query_id, $input, $fs_name, $verbose, $save_temps);
 
 GetOptions(
     'input|i=s'     => \$input,
-    'req_name|r=s'  => \$req_name,
+    'query_id|q=s'  => \$query_id,
     'verbose|v'     => \$verbose,
     'save-temps'    => \$save_temps,
@@ -26 +26 @@
 ) or pod2usage( 2 );
 
-die "--req_name is required\n" if ! $req_name;
+die "--query_id is required\n" if ! $query_id;
 
 my $dsreg = can_run("dsreg") or die "cant'f find dsreg";
 my $detect_query_create = can_run("./detect_query_create") or die "cant'f find detect_query_create";
 
-$fs_name = $req_name;
+$fs_name = $query_id;
 
 my $req_file;
@@ -37 +37 @@
 my $datapath;
 if ($save_temps) {
-    $req_file = "${req_name}.fits";
+    $req_file = "${query_id}.fits";
     $datapath = ".";
 } else {
-    ($RFH, $req_file) = tempfile("/tmp/${req_name}.fits.XXXX", UNLINK => 1);
+    ($RFH, $req_file) = tempfile("/tmp/${query_id}.fits.XXXX", UNLINK => 1);
     die "failed to create tempfile" if !$RFH;
     $datapath = "/";
@@ -60 +60 @@
     if (!-e $query_txt_file);
 
-my $create_cmd = "$detect_query_create -i $query_txt_file -o $req_file -q $req_name";
+my $create_cmd = "$detect_query_create -i $query_txt_file -o $req_file -q $query_id";
 
 my $reg_cmd = "echo '$req_file|||table|' | $dsreg --dbname $dbname";