Index: branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh
===================================================================
--- branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35046)
+++ branches/eam_branches/ipp-20121219/ippToPsps/test/fulltest.sh	(revision 35051)
@@ -2,4 +2,10 @@
 
 set stackqueuename = 0
+if ($#argv > 0) then
+  set stackqueuename = $1
+  echo "stackqueue: $stackqueuename"
+endif
+
+set objectqueuename = 0
 if ($#argv > 0) then
   set stackqueuename = $1
@@ -19,13 +25,15 @@
 # mkgpc1.sh user localhost eam eam
 
-set mkgpc1      = 1
-set initdb      = 1
-set mkdummy     = 1
-set initscratch = 1
-set initbatch   = 1
-set camqueue    = 1
-set cambatch    = 1
+set mkgpc1      = 0
+set initdb      = 0
+set mkdummy     = 0
+set initscratch = 0
+set initbatch   = 0
+set camqueue    = 0
+set cambatch    = 0
 set stackqueue  = 0
 set stackbatch  = 0
+set objectqueue  = 1
+set objectbatch  = 1
 
 set OUTDIR = "testdata"
@@ -105,5 +113,5 @@
 19
 21
-1
+2
 $OUTDIR
 0
@@ -149,5 +157,5 @@
 19
 21
-1
+2
 $OUTDIR
 0
@@ -175,2 +183,44 @@
 endif
 
+# this code is sensitive to a previously existing database?
+if ($objectqueue) then
+  if ($objectqueuename == 0) then
+    set objectqueuename = $queuename\_obj
+  endif
+  ippjython queue.py edit <<EOF
+$objectqueuename
+test_ds
+IPP_PSPS
+0
+catdir.stk
+$OUTDIR/catdir.stk
+9
+11
+19
+21
+2
+$OUTDIR
+0
+0
+1
+1
+2012-12-10 00:00:00.0
+3PI
+3PI
+0
+0
+1
+1
+y
+y
+EOF
+endif
+
+if ($objectbatch) then
+  if ($objectqueuename == 0) then
+    set objectqueuename = $queuename\_obj
+  endif
+  rm -rf $OUTDIR/OB
+  ippjython loader.py $objectqueuename once
+endif
+
Index: branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo
===================================================================
--- branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 35046)
+++ branches/eam_branches/ipp-20121219/ippToPsps/test/mkgpc1data.dvo	(revision 35051)
@@ -36,6 +36,6 @@
 macro mkfull
   init.db
-  mkcatdir.cam PS1_V3 PS1_V2
-  mkcatdir.stk PS1_V3 PS1_V2
+  mkcatdir.cam PS1_V3 PS1_V4
+  mkcatdir.stk PS1_V3 PS1_V4
   insert.stack.set
 end