Index: trunk/ippToPsps/test/fulltest.sh
===================================================================
--- trunk/ippToPsps/test/fulltest.sh	(revision 39009)
+++ trunk/ippToPsps/test/fulltest.sh	(revision 39015)
@@ -1,3 +1,8 @@
 #!/bin/csh -f
+
+set dbuser = 'dvo'
+set dbpass = '-pdvo'
+# set dbuser = 'czw'
+# set dbpass = '-pczw'
 
 chmod +x mkgpc1data.dvo mkgpc1.sh
@@ -29,4 +34,9 @@
 set forcedobjqueue = 1
 set forcedobjbatch = 1
+set diffqueue    = 1
+set diffbatch    = 1
+set diffobjqueue = 1
+set diffobjbatch = 1
+
 
 set options = "-test"
@@ -42,5 +52,5 @@
     echo " -XX : turn off features"
     echo " +XX : turn on features"
-    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject"
+    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, stack, forcedwarp, object, forcedobject, diff, diffobj"
     exit 2
   case -all
@@ -59,4 +69,8 @@
     set forcedobjqueue = 0
     set forcedobjbatch = 0
+    set diffqueue = 0
+    set diffbatch = 0
+    set diffobjqueue = 0
+    set diffobjbatch = 0
     breaksw;
   case -mkgpc1
@@ -91,4 +105,12 @@
     set forcedobjqueue = 0
     set forcedobjbatch = 0
+    breaksw;
+  case -diff
+    set diffqueue = 0
+    set diffbatch = 0
+    breaksw;
+  case -diffobj
+    set diffobjqueue = 0
+    set diffobjbatch = 0
     breaksw;
   case -debug
@@ -125,4 +147,8 @@
     set forcedobjqueue = 1
     set forcedobjbatch = 1
+    set diffqueue = 1
+    set diffbatch = 1
+    set diffobjqueue = 1
+    set diffobjbatch = 1
     breaksw;
   case +mkgpc1
@@ -157,4 +183,12 @@
     set forcedobjqueue = 1
     set forcedobjbatch = 1
+    breaksw;
+  case +diff
+    set diffqueue = 1
+    set diffbatch = 1
+    breaksw;
+  case +diffobj
+    set diffobjqueue = 1
+    set diffobjbatch = 1
     breaksw;
   default:
@@ -169,5 +203,5 @@
     echo " -XX : turn off features"
     echo " +XX : turn on features"
-    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject"
+    echo "  features: all, mkgpc1, initdb, initscratch, initbatch, camera, object, stack, forcedwarp, forcedobject, diff, diffobj"
     exit 2
 endif
@@ -179,4 +213,7 @@
 set forcedwarpqueuename = $queuename\_wrp
 set forcedobjqueuename = $queuename\_fwo
+set diffqueuename = $queuename\_dif
+set diffobjqueuename = $queuename\_dio
+
 
 if ($mkgpc1) then
@@ -197,6 +234,6 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
+  mysql -h localhost -u $dbuser $dbpass -e "create database if not exists ipptopsps_test" || exit 3
+  mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3
   echo " ---- init ipptopsps_test: done ----"
 endif
@@ -208,6 +245,6 @@
 
   # create the database (ignore failure if it already exists)
-  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"
+  mysql -h localhost -u $dbuser $dbpass -e "drop database if exists ipptopsps_test_scratch"
+  mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch"
   echo ippjython setupScratchDb.py $options
        ippjython setupScratchDb.py $options < /dev/null
@@ -527,2 +564,108 @@
 endif
 
+
+############################ DF batches ################################
+
+# this code is sensitive to a previously existing database?
+if ($diffqueue) then
+  echo ""
+  echo " ---- queue DF batches ----"
+
+  echo "$diffqueuename  " >  diffbatch.dat # skychunk name
+  echo "test_ds               " >> diffbatch.dat # datastore_product
+  echo "IPP_PSPS              " >> diffbatch.dat # datastore_type
+  echo "0                     " >> diffbatch.dat # datastore_publish
+  echo "catdir.dif            " >> diffbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.dif    " >> diffbatch.dat # dvo_location
+  echo "9                     " >> diffbatch.dat # min_ra
+  echo "11                    " >> diffbatch.dat # max_ra
+  echo "19                    " >> diffbatch.dat # min_dec
+  echo "21                    " >> diffbatch.dat # max_dec
+  echo "2                     " >> diffbatch.dat # box_size
+  echo "$OUTDIR               " >> diffbatch.dat # base_path
+  echo "0                     " >> diffbatch.dat # data_release
+  echo "0                     " >> diffbatch.dat # delete_local
+  echo "1                     " >> diffbatch.dat # delete_datastore
+  echo "1                     " >> diffbatch.dat # delete_dxlayer
+  echo "2012-12-10 00:00:00.0 " >> diffbatch.dat # epoch
+  echo "3PI                   " >> diffbatch.dat # survey
+  echo "3PI                   " >> diffbatch.dat # psps_survey
+  echo "0                     " >> diffbatch.dat # queue_P2
+  echo "0                     " >> diffbatch.dat # queue_ST
+  echo "0                     " >> diffbatch.dat # queue_OB
+  echo "1                     " >> diffbatch.dat # queue_DF
+  echo "0                     " >> diffbatch.dat # queue_DO
+  echo "0                     " >> diffbatch.dat # queue_FW
+  echo "0                     " >> diffbatch.dat # queue_FO
+  echo "1                     " >> diffbatch.dat # active
+  echo "0                     " >> diffbatch.dat # parallel
+  echo "use_new               " >> diffbatch.dat # P2_smf_version
+  echo "any                   " >> diffbatch.dat # ST_cmf_version
+  echo "2000-01-01 00:00:00.0 " >> diffbatch.dat # trange_start
+  echo "2020-01-01 00:00:00.0 " >> diffbatch.dat # trange_end
+  ippjython queue.py $options edit -simtest < diffbatch.dat
+  if ($status) exit 1
+endif
+
+if ($diffbatch) then
+  echo ""
+  echo " ---- load DF batches ----"
+
+  rm -rf $OUTDIR/FW
+  ippjython loader.py $options $diffqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+
+############################ DO batches ################################
+
+# this code is sensitive to a previously existing database?
+if ($diffobjqueue) then
+  echo ""
+  echo " ---- queue do batches ----"
+
+  echo "$diffobjqueuename   " >  diffobjbatch.dat # skychunk name
+  echo "test_ds               " >> diffobjbatch.dat # datastore_product
+  echo "IPP_PSPS              " >> diffobjbatch.dat # datastore_type
+  echo "0                     " >> diffobjbatch.dat # datastore_publish
+  echo "catdir.dif            " >> diffobjbatch.dat # dvo_label
+  echo "$OUTDIR/catdir.dif    " >> diffobjbatch.dat # dvo_location
+  echo "9                     " >> diffobjbatch.dat # min_ra
+  echo "11                    " >> diffobjbatch.dat # max_ra
+  echo "19                    " >> diffobjbatch.dat # min_dec
+  echo "21                    " >> diffobjbatch.dat # max_dec
+  echo "2                     " >> diffobjbatch.dat # box_size
+  echo "$OUTDIR               " >> diffobjbatch.dat # base_path
+  echo "0                     " >> diffobjbatch.dat # data_release
+  echo "0                     " >> diffobjbatch.dat # delete_local
+  echo "1                     " >> diffobjbatch.dat # delete_datastore
+  echo "1                     " >> diffobjbatch.dat # delete_dxlayer
+  echo "2012-12-10 00:00:00.0 " >> diffobjbatch.dat # epoch
+  echo "3PI                   " >> diffobjbatch.dat # survey
+  echo "3PI                   " >> diffobjbatch.dat # psps_survey
+  echo "0                     " >> diffobjbatch.dat # queue_P2
+  echo "0                     " >> diffobjbatch.dat # queue_ST
+  echo "0                     " >> diffobjbatch.dat # queue_OB
+  echo "0                     " >> diffobjbatch.dat # queue_DF
+  echo "1                     " >> diffobjbatch.dat # queue_DO
+  echo "0                     " >> diffobjbatch.dat # queue_FW
+  echo "0                     " >> diffobjbatch.dat # queue_FO
+  echo "1                     " >> diffobjbatch.dat # active
+  echo "0                     " >> diffobjbatch.dat # parallel
+  echo "use_new               " >> diffobjbatch.dat # P2_smf_version
+  echo "any                   " >> diffobjbatch.dat # ST_cmf_version
+  echo "2000-01-01 00:00:00.0 " >> diffobjbatch.dat # trange_start
+  echo "2020-01-01 00:00:00.0 " >> diffobjbatch.dat # trange_end
+  ippjython queue.py $options edit once -simtest < diffobjbatch.dat
+  if ($status) exit
+endif
+
+if ($diffobjbatch) then
+  echo ""
+  echo " ---- load LO batches ----"
+
+  rm -rf $OUTDIR/LO
+
+  ippjython loader.py $options $diffobjqueuename once -simtest < /dev/null
+  if ($status) exit
+endif
+