Index: trunk/ippToPsps/test/sastest.sh =================================================================== --- trunk/ippToPsps/test/sastest.sh (revision 38974) +++ trunk/ippToPsps/test/sastest.sh (revision 39004) @@ -32,5 +32,5 @@ set forcedobjbatch = 1 -set debug = "" +set options = "-test" set targ = ($argv) @@ -95,5 +95,8 @@ breaksw; case -debug - set debug = "-debug" + set options = "$options -debug" + breaksw; + case -stilts + set options = "$options -stilts" breaksw; default: @@ -211,5 +214,5 @@ mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch" mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch" - ippjython setupScratchDb.py -test < /dev/null + ippjython setupScratchDb.py $options < /dev/null if ($status) exit 1 endif @@ -233,5 +236,5 @@ echo "0 " >> initbatch.dat # max_dec echo "2 " >> initbatch.dat # box_size - echo "$OUTDIR " >> initbatch.dat # base_path + echo "$OUTDIR " >> initbatch.dat # base_path echo "0 " >> initbatch.dat # data_release echo "0 " >> initbatch.dat # delete_local @@ -254,6 +257,6 @@ echo "2000-01-01 00:00:00.0 " >> initbatch.dat # trange_start echo "2020-01-01 00:00:00.0 " >> initbatch.dat # trange_end - cat initbatch.dat | ippjython queue.py $debug -test edit - if ($status) exit + ippjython queue.py $options edit < initbatch.dat + if ($status) exit 1 echo "" @@ -261,7 +264,9 @@ rm -rf $OUTDIR/IN - ippjython loader.py $debug -test initbatch init < /dev/null - if ($status) exit 1 -endif + ippjython loader.py $options initbatch init < /dev/null + if ($status) exit 1 +endif + +############################ P2 batches ################################ # this code is sensitive to a previously existing database? @@ -270,26 +275,26 @@ echo " ---- queue P2 batches ----" - echo "$queuename " > cambatch.dat # skychunk name - echo "test_ds " >> cambatch.dat # datastore_product - echo "IPP_PSPS " >> cambatch.dat # datastore_type - echo "0 " >> cambatch.dat # datastore_publish - echo "catdir.sas " >> cambatch.dat # dvo_label + echo "$queuename " > cambatch.dat # skychunk name + echo "test_ds " >> cambatch.dat # datastore_product + echo "IPP_PSPS " >> cambatch.dat # datastore_type + echo "0 " >> cambatch.dat # datastore_publish + echo "catdir.sas " >> cambatch.dat # dvo_label echo "$OUTDIR/catdir.sas " >> cambatch.dat # dvo_location - echo "330 " >> cambatch.dat # min_ra - echo "340 " >> cambatch.dat # max_ra - echo "-10 " >> cambatch.dat # min_dec - echo "0 " >> cambatch.dat # max_dec - echo "1 " >> cambatch.dat # box_size - echo "$OUTDIR " >> cambatch.dat # base_path - echo "0 " >> cambatch.dat # data_release - echo "0 " >> cambatch.dat # delete_local - echo "1 " >> cambatch.dat # delete_datastore - echo "1 " >> cambatch.dat # delete_dxlayer + echo "330 " >> cambatch.dat # min_ra + echo "340 " >> cambatch.dat # max_ra + echo "-10 " >> cambatch.dat # min_dec + echo "0 " >> cambatch.dat # max_dec + echo "1 " >> cambatch.dat # box_size + echo "$OUTDIR " >> cambatch.dat # base_path + echo "0 " >> cambatch.dat # data_release + echo "0 " >> cambatch.dat # delete_local + echo "1 " >> cambatch.dat # delete_datastore + echo "1 " >> cambatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> cambatch.dat # epoch - echo "3PI " >> cambatch.dat # survey - echo "3PI " >> cambatch.dat # psps_survey - echo "1 " >> cambatch.dat # queue_P2 - echo "0 " >> cambatch.dat # queue_ST - echo "0 " >> cambatch.dat # queue_OB + echo "3PI " >> cambatch.dat # survey + echo "3PI " >> cambatch.dat # psps_survey + echo "1 " >> cambatch.dat # queue_P2 + echo "0 " >> cambatch.dat # queue_ST + echo "0 " >> cambatch.dat # queue_OB echo "0 " >> cambatch.dat # queue_DF echo "0 " >> cambatch.dat # queue_DO @@ -302,6 +307,6 @@ echo "2000-01-01 00:00:00.0 " >> cambatch.dat # trange_start echo "2020-01-01 00:00:00.0 " >> cambatch.dat # trange_end - cat cambatch.dat | ippjython queue.py $debug -test edit - if ($status) exit + ippjython queue.py $options edit < cambatch.dat + if ($status) exit 1 endif @@ -311,6 +316,6 @@ rm -rf $OUTDIR/P2 - ippjython loader.py $debug -test $queuename once < /dev/null - if ($status) exit + ippjython loader.py $options $queuename once < /dev/null + if ($status) exit 1 endif @@ -323,25 +328,25 @@ echo "$objectqueuename " > objectbatch.dat # skychunk name - echo "test_ds " >> objectbatch.dat # datastore_product - echo "IPP_PSPS " >> objectbatch.dat # datastore_type - echo "0 " >> objectbatch.dat # datastore_publish - echo "catdir.sas " >> objectbatch.dat # dvo_label + echo "test_ds " >> objectbatch.dat # datastore_product + echo "IPP_PSPS " >> objectbatch.dat # datastore_type + echo "0 " >> objectbatch.dat # datastore_publish + echo "catdir.sas " >> objectbatch.dat # dvo_label echo "$OUTDIR/catdir.sas " >> objectbatch.dat # dvo_location - echo "330 " >> objectbatch.dat # min_ra - echo "340 " >> objectbatch.dat # max_ra - echo "-10 " >> objectbatch.dat # min_dec - echo "0 " >> objectbatch.dat # max_dec - echo "2 " >> objectbatch.dat # box_size - echo "$OUTDIR " >> objectbatch.dat # base_path - echo "0 " >> objectbatch.dat # data_release - echo "0 " >> objectbatch.dat # delete_local - echo "1 " >> objectbatch.dat # delete_datastore - echo "1 " >> objectbatch.dat # delete_dxlayer + echo "330 " >> objectbatch.dat # min_ra + echo "340 " >> objectbatch.dat # max_ra + echo "-10 " >> objectbatch.dat # min_dec + echo "0 " >> objectbatch.dat # max_dec + echo "2 " >> objectbatch.dat # box_size + echo "$OUTDIR " >> objectbatch.dat # base_path + echo "0 " >> objectbatch.dat # data_release + echo "0 " >> objectbatch.dat # delete_local + echo "1 " >> objectbatch.dat # delete_datastore + echo "1 " >> objectbatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> objectbatch.dat # epoch - echo "3PI " >> objectbatch.dat # survey - echo "3PI " >> objectbatch.dat # psps_survey - echo "0 " >> objectbatch.dat # queue_P2 - echo "0 " >> objectbatch.dat # queue_ST - echo "1 " >> objectbatch.dat # queue_OB + echo "3PI " >> objectbatch.dat # survey + echo "3PI " >> objectbatch.dat # psps_survey + echo "0 " >> objectbatch.dat # queue_P2 + echo "0 " >> objectbatch.dat # queue_ST + echo "1 " >> objectbatch.dat # queue_OB echo "0 " >> objectbatch.dat # queue_DF echo "0 " >> objectbatch.dat # queue_DO @@ -354,5 +359,5 @@ echo "2000-01-01 00:00:00.0 " >> objectbatch.dat # trange_start echo "2020-01-01 00:00:00.0 " >> objectbatch.dat # trange_end - cat objectbatch.dat | ippjython queue.py $debug -test edit once + ippjython queue.py $options edit once < objectbatch.dat if ($status) exit endif @@ -364,5 +369,5 @@ rm -rf $OUTDIR/OB - ippjython loader.py $debug -test $objectqueuename once < /dev/null + ippjython loader.py $options $objectqueuename once < /dev/null if ($status) exit endif @@ -375,26 +380,26 @@ echo " ---- queue ST batches ----" - echo "$stackqueuename " > stackbatch.dat # skychunk name - echo "test_ds " >> stackbatch.dat # datastore_product - echo "IPP_PSPS " >> stackbatch.dat # datastore_type - echo "0 " >> stackbatch.dat # datastore_publish - echo "catdir.sas " >> stackbatch.dat # dvo_label + echo "$stackqueuename " > stackbatch.dat # skychunk name + echo "test_ds " >> stackbatch.dat # datastore_product + echo "IPP_PSPS " >> stackbatch.dat # datastore_type + echo "0 " >> stackbatch.dat # datastore_publish + echo "catdir.sas " >> stackbatch.dat # dvo_label echo "$OUTDIR/catdir.sas " >> stackbatch.dat # dvo_location - echo "332.0 " >> stackbatch.dat # min_ra - echo "334.5 " >> stackbatch.dat # max_ra - echo "-1 " >> stackbatch.dat # min_dec - echo "+1 " >> stackbatch.dat # max_dec - echo "1 " >> stackbatch.dat # box_size - echo "$OUTDIR " >> stackbatch.dat # base_path - echo "0 " >> stackbatch.dat # data_release - echo "0 " >> stackbatch.dat # delete_local - echo "1 " >> stackbatch.dat # delete_datastore - echo "1 " >> stackbatch.dat # delete_dxlayer + echo "332.0 " >> stackbatch.dat # min_ra + echo "334.5 " >> stackbatch.dat # max_ra + echo "-1 " >> stackbatch.dat # min_dec + echo "+1 " >> stackbatch.dat # max_dec + echo "1 " >> stackbatch.dat # box_size + echo "$OUTDIR " >> stackbatch.dat # base_path + echo "0 " >> stackbatch.dat # data_release + echo "0 " >> stackbatch.dat # delete_local + echo "1 " >> stackbatch.dat # delete_datastore + echo "1 " >> stackbatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> stackbatch.dat # epoch - echo "3PI " >> stackbatch.dat # survey - echo "3PI " >> stackbatch.dat # psps_survey - echo "0 " >> stackbatch.dat # queue_P2 - echo "1 " >> stackbatch.dat # queue_ST - echo "0 " >> stackbatch.dat # queue_OB + echo "3PI " >> stackbatch.dat # survey + echo "3PI " >> stackbatch.dat # psps_survey + echo "0 " >> stackbatch.dat # queue_P2 + echo "1 " >> stackbatch.dat # queue_ST + echo "0 " >> stackbatch.dat # queue_OB echo "0 " >> stackbatch.dat # queue_DF echo "0 " >> stackbatch.dat # queue_DO @@ -407,5 +412,5 @@ echo "2000-01-01 00:00:00.0 " >> stackbatch.dat # trange_start echo "2020-01-01 00:00:00.0 " >> stackbatch.dat # trange_end - cat stackbatch.dat | ippjython queue.py $debug -test edit + ippjython queue.py $options edit < stackbatch.dat if ($status) exit 1 endif @@ -416,5 +421,5 @@ rm -rf $OUTDIR/ST - ippjython loader.py $debug -test $stackqueuename once < /dev/null + ippjython loader.py $options $stackqueuename once < /dev/null if ($status) exit 1 endif @@ -428,25 +433,25 @@ echo "$forcedwarpqueuename " > forcebatch.dat # skychunk name - echo "test_ds " >> forcebatch.dat # datastore_product - echo "IPP_PSPS " >> forcebatch.dat # datastore_type - echo "0 " >> forcebatch.dat # datastore_publish - echo "catdir.sas " >> forcebatch.dat # dvo_label + echo "test_ds " >> forcebatch.dat # datastore_product + echo "IPP_PSPS " >> forcebatch.dat # datastore_type + echo "0 " >> forcebatch.dat # datastore_publish + echo "catdir.sas " >> forcebatch.dat # dvo_label echo "$OUTDIR/catdir.sas " >> forcebatch.dat # dvo_location - echo "332.0 " >> forcebatch.dat # min_ra - echo "334.5 " >> forcebatch.dat # max_ra - echo "-1 " >> forcebatch.dat # min_dec - echo "+1 " >> forcebatch.dat # max_dec - echo "2 " >> forcebatch.dat # box_size - echo "$OUTDIR " >> forcebatch.dat # base_path - echo "0 " >> forcebatch.dat # data_release - echo "0 " >> forcebatch.dat # delete_local - echo "1 " >> forcebatch.dat # delete_datastore - echo "1 " >> forcebatch.dat # delete_dxlayer + echo "332.0 " >> forcebatch.dat # min_ra + echo "334.5 " >> forcebatch.dat # max_ra + echo "-1 " >> forcebatch.dat # min_dec + echo "+1 " >> forcebatch.dat # max_dec + echo "2 " >> forcebatch.dat # box_size + echo "$OUTDIR " >> forcebatch.dat # base_path + echo "0 " >> forcebatch.dat # data_release + echo "0 " >> forcebatch.dat # delete_local + echo "1 " >> forcebatch.dat # delete_datastore + echo "1 " >> forcebatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> forcebatch.dat # epoch - echo "3PI " >> forcebatch.dat # survey - echo "3PI " >> forcebatch.dat # psps_survey - echo "0 " >> forcebatch.dat # queue_P2 - echo "0 " >> forcebatch.dat # queue_ST - echo "0 " >> forcebatch.dat # queue_OB + echo "3PI " >> forcebatch.dat # survey + echo "3PI " >> forcebatch.dat # psps_survey + echo "0 " >> forcebatch.dat # queue_P2 + echo "0 " >> forcebatch.dat # queue_ST + echo "0 " >> forcebatch.dat # queue_OB echo "0 " >> forcebatch.dat # queue_DF echo "0 " >> forcebatch.dat # queue_DO @@ -459,5 +464,5 @@ echo "2000-01-01 00:00:00.0 " >> forcebatch.dat # trange_start echo "2020-01-01 00:00:00.0 " >> forcebatch.dat # trange_end - ippjython queue.py $debug -test edit < forcebatch.dat + ippjython queue.py $options edit < forcebatch.dat if ($status) exit 1 endif @@ -468,5 +473,5 @@ rm -rf $OUTDIR/FW - ippjython loader.py $debug -test $forcedwarpqueuename once < /dev/null + ippjython loader.py $options $forcedwarpqueuename once < /dev/null if ($status) exit endif @@ -480,25 +485,25 @@ echo "$forcedobjqueuename " > forcedobjectbatch.dat # skychunk name - echo "test_ds " >> forcedobjectbatch.dat # datastore_product - echo "IPP_PSPS " >> forcedobjectbatch.dat # datastore_type - echo "0 " >> forcedobjectbatch.dat # datastore_publish - echo "catdir.sas " >> forcedobjectbatch.dat # dvo_label + echo "test_ds " >> forcedobjectbatch.dat # datastore_product + echo "IPP_PSPS " >> forcedobjectbatch.dat # datastore_type + echo "0 " >> forcedobjectbatch.dat # datastore_publish + echo "catdir.sas " >> forcedobjectbatch.dat # dvo_label echo "$OUTDIR/catdir.sas " >> forcedobjectbatch.dat # dvo_location - echo "332.0 " >> forcedobjectbatch.dat # min_ra - echo "334.5 " >> forcedobjectbatch.dat # max_ra - echo "-1 " >> forcedobjectbatch.dat # min_dec - echo "+1 " >> forcedobjectbatch.dat # max_dec - echo "2 " >> forcedobjectbatch.dat # box_size - echo "$OUTDIR " >> forcedobjectbatch.dat # base_path - echo "0 " >> forcedobjectbatch.dat # data_release - echo "0 " >> forcedobjectbatch.dat # delete_local - echo "1 " >> forcedobjectbatch.dat # delete_datastore - echo "1 " >> forcedobjectbatch.dat # delete_dxlayer + echo "332.0 " >> forcedobjectbatch.dat # min_ra + echo "334.5 " >> forcedobjectbatch.dat # max_ra + echo "-1 " >> forcedobjectbatch.dat # min_dec + echo "+1 " >> forcedobjectbatch.dat # max_dec + echo "2 " >> forcedobjectbatch.dat # box_size + echo "$OUTDIR " >> forcedobjectbatch.dat # base_path + echo "0 " >> forcedobjectbatch.dat # data_release + echo "0 " >> forcedobjectbatch.dat # delete_local + echo "1 " >> forcedobjectbatch.dat # delete_datastore + echo "1 " >> forcedobjectbatch.dat # delete_dxlayer echo "2012-12-10 00:00:00.0 " >> forcedobjectbatch.dat # epoch - echo "3PI " >> forcedobjectbatch.dat # survey - echo "3PI " >> forcedobjectbatch.dat # psps_survey - echo "0 " >> forcedobjectbatch.dat # queue_P2 - echo "0 " >> forcedobjectbatch.dat # queue_ST - echo "0 " >> forcedobjectbatch.dat # queue_OB + echo "3PI " >> forcedobjectbatch.dat # survey + echo "3PI " >> forcedobjectbatch.dat # psps_survey + echo "0 " >> forcedobjectbatch.dat # queue_P2 + echo "0 " >> forcedobjectbatch.dat # queue_ST + echo "0 " >> forcedobjectbatch.dat # queue_OB echo "0 " >> forcedobjectbatch.dat # queue_DF echo "0 " >> forcedobjectbatch.dat # queue_DO @@ -511,5 +516,5 @@ echo "2000-01-01 00:00:00.0 " >> forcedobjectbatch.dat # trange_start echo "2020-01-01 00:00:00.0 " >> forcedobjectbatch.dat # trange_end - ippjython queue.py $debug -test edit once -simtest < forcedobjectbatch.dat + ippjython queue.py $options edit once -simtest < forcedobjectbatch.dat if ($status) exit endif @@ -521,5 +526,5 @@ rm -rf $OUTDIR/LO - ippjython loader.py $debug -test $forcedobjqueuename once -simtest < /dev/null + ippjython loader.py $options $forcedobjqueuename once -simtest < /dev/null if ($status) exit endif