Index: trunk/ippToPsps/test/fulltest.sh
===================================================================
--- trunk/ippToPsps/test/fulltest.sh	(revision 35225)
+++ trunk/ippToPsps/test/fulltest.sh	(revision 35417)
@@ -1,15 +1,3 @@
 #!/bin/csh -f
-
-set stackqueuename = 0
-if ($#argv > 0) then
-  set stackqueuename = $1
-  echo "stackqueue: $stackqueuename"
-endif
-
-set objectqueuename = 0
-if ($#argv > 0) then
-  set stackqueuename = $1
-  echo "stackqueue: $stackqueuename"
-endif
 
 # a bit crude : get the datadir path by interpollation of the PATH element for psconfig
@@ -24,10 +12,9 @@
 # before running this test, you must have a mysql user:
 # mkgpc1.sh user localhost eam eam
-
 set mkgpc1       = 1
 set initdb       = 1
 set initscratch  = 1
+set initbatch    = 1
 set camqueue     = 1
-set initbatch    = 1
 set cambatch     = 1
 set stackqueue   = 1
@@ -36,8 +23,48 @@
 set objectbatch  = 1
 
+set args    = ""
+
+while ("$1" != "") 
+ switch ("$1")
+  case -mkgpc1
+    set mkgpc1 = 0
+    breaksw;
+  case -initdb
+    set initdb = 0
+    breaksw;
+  case -initscratch
+    set initscratch = 0
+    breaksw;
+  case -initbatch
+    set initbatch = 0
+    breaksw;
+  case -camera
+    set camqueue = 0
+    set cambatch = 0
+    breaksw;
+  case -stack
+    set stackqueue = 0
+    set stackbatch = 0
+    breaksw;
+  case -object
+    set objectqueue = 0
+    set objectbatch = 0
+    breaksw;
+  default:
+    set args=($args $1);
+    breaksw;
+  endsw
+  shift
+end
+
+set stackqueuename = 0
+set objectqueuename = 0
+
 set OUTDIR = "testdata"
 set queuename = "test"
 
 if ($mkgpc1) then
+  echo ""
+  echo " ---- mkgpc1data.dvo : creating the dvo & gpc1 database entries ----"
   mkgpc1data.dvo
 endif
@@ -45,4 +72,6 @@
 # create the ipptopsps database
 if ($initdb) then 
+  echo ""
+  echo " ---- init ipptopsps_test ----"
 
   # does the database already exist?
@@ -55,4 +84,6 @@
 # re-create the ipptopsps database
 if ($initscratch) then 
+  echo ""
+  echo " ---- init ipptopsps_test_scratch ----"
 
   # create the database (ignore failure if it already exists)
@@ -62,6 +93,77 @@
 endif
 
+#  `name` 
+#  `datastore_product` 
+#  `datastore_type` 
+#  `datastore_publish` 
+#  `dvo_label` 
+#  `dvo_location` 
+#  `min_ra` 
+#  `max_ra` 
+#  `min_dec` 
+#  `max_dec` 
+#  `box_size` 
+#  `base_path` 
+#  `data_release` 
+#  `delete_local` 
+#  `delete_datastore` 
+#  `delete_dxlayer` 
+#  `epoch` 
+#  `survey` 
+#  `psps_survey` 
+#  `queue_P2` 
+#  `queue_ST` 
+#  `queue_OB` 
+#  `active` 
+#  `parallel` 
+
+# this is poor : we need to queue something in order to generate an init batch
+# this is because a skychunk carries the info about the datastore used to publish
+# the batch
+if ($initbatch) then
+  echo ""
+  echo " ---- make skychunk for IN batches ----"
+
+  ippjython queue.py -test edit <<EOF
+initbatch
+test_ds
+IPP_PSPS
+0
+none
+none
+0
+0
+0
+0
+2
+none
+0
+0
+1
+1
+2012-12-10 00:00:00.0
+3PI
+3PI
+0
+0
+0
+1
+0
+y
+y
+EOF
+
+  echo ""
+  echo " ---- create init batch ----"
+
+  rm -rf $OUTDIR/IN
+  ippjython loader.py -test initbatch init
+endif
+
 # this code is sensitive to a previously existing database?
 if ($camqueue) then
+  echo ""
+  echo " ---- queue P2 batches ----"
+
   ippjython queue.py -test edit <<EOF
 $queuename
@@ -94,10 +196,8 @@
 endif
 
-if ($initbatch) then
-  rm -rf $OUTDIR/IN
-  ippjython loader.py -test $queuename init
-endif
-
 if ($cambatch) then
+  echo ""
+  echo " ---- load P2 batches ----"
+
   rm -rf $OUTDIR/P2
   ippjython loader.py -test $queuename once
@@ -106,4 +206,7 @@
 # this code is sensitive to a previously existing database?
 if ($stackqueue) then
+  echo ""
+  echo " ---- queue ST batches ----"
+
   if ($stackqueuename == 0) then
     set stackqueuename = $queuename\_stk
@@ -140,4 +243,7 @@
 
 if ($stackbatch) then
+  echo ""
+  echo " ---- load ST batches ----"
+
   if ($stackqueuename == 0) then
     set stackqueuename = $queuename\_stk
@@ -149,4 +255,7 @@
 # this code is sensitive to a previously existing database?
 if ($objectqueue) then
+  echo ""
+  echo " ---- queue OB batches ----"
+
   if ($objectqueuename == 0) then
     set objectqueuename = $queuename\_obj
@@ -183,4 +292,7 @@
 
 if ($objectbatch) then
+  echo ""
+  echo " ---- load OB batches ----"
+
   if ($objectqueuename == 0) then
     set objectqueuename = $queuename\_obj