Index: trunk/ippToPsps/test/fulltest.sh
===================================================================
--- trunk/ippToPsps/test/fulltest.sh	(revision 40224)
+++ trunk/ippToPsps/test/fulltest.sh	(revision 40268)
@@ -16,4 +16,25 @@
 end
 setenv IPPTOPSPS_DATA $datadir/ipptopsps
+
+set DRversion = "DR2"
+set myScript = "none"
+if ($DRversion == "DR1") then
+  set myScript = mkgpc1data.dvo
+  set CATDIR_CAM = catdir.cam
+  set CATDIR_STK = catdir.stk
+  set CATDIR_WRP = catdir.wrp
+  set CATDIR_DIF = catdir.dif
+endif
+if ($DRversion == "DR2") then
+  set myScript = mkgpc1data.dr2.dvo
+  set CATDIR_CAM = catdir.mrg
+  set CATDIR_STK = catdir.mrg
+  set CATDIR_WRP = catdir.mrg
+  set CATDIR_DIF = catdir.dif
+endif
+if ($DRversion == "none") then
+  echo "invalid DRversion $DRversion"
+  exit 2
+endif
 
 # before running this test, you must have a mysql user:
@@ -217,6 +238,6 @@
 if ($mkgpc1) then
   echo ""
-  echo " ---- mkgpc1data.dvo : creating the dvo & gpc1 database entries ----"
-  mkgpc1data.dvo
+  echo " ---- $myScript : creating the dvo & gpc1 database entries ----"
+  $myScript
   if ($status) then
     echo "failed to generate the data & dvo, quitting"
@@ -315,5 +336,5 @@
   echo "0                     " >> cambatch.dat # datastore_publish
   echo "catdir.cam            " >> cambatch.dat # dvo_label
-  echo "$OUTDIR/catdir.cam    " >> cambatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_CAM   " >> cambatch.dat # dvo_location
   echo "9                     " >> cambatch.dat # min_ra
   echo "11                    " >> cambatch.dat # max_ra
@@ -370,5 +391,5 @@
   echo "0                     " >> objectbatch.dat # datastore_publish
   echo "catdir.cam            " >> objectbatch.dat # dvo_label
-  echo "$OUTDIR/catdir.cam    " >> objectbatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_CAM    " >> objectbatch.dat # dvo_location
   echo "9                     " >> objectbatch.dat # min_ra
   echo "11                    " >> objectbatch.dat # max_ra
@@ -425,5 +446,5 @@
   echo "0                     " >> stackbatch.dat # datastore_publish
   echo "catdir.stk            " >> stackbatch.dat # dvo_label
-  echo "$OUTDIR/catdir.stk    " >> stackbatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_STK   " >> stackbatch.dat # dvo_location
   echo "9                     " >> stackbatch.dat # min_ra
   echo "11                    " >> stackbatch.dat # max_ra
@@ -480,5 +501,5 @@
   echo "0                     " >> forcebatch.dat # datastore_publish
   echo "catdir.wrp            " >> forcebatch.dat # dvo_label
-  echo "$OUTDIR/catdir.wrp    " >> forcebatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_WRP   " >> forcebatch.dat # dvo_location
   echo "9                     " >> forcebatch.dat # min_ra
   echo "11                    " >> forcebatch.dat # max_ra
@@ -535,5 +556,5 @@
   echo "0                     " >> forcedobjectbatch.dat # datastore_publish
   echo "catdir.wrp            " >> forcedobjectbatch.dat # dvo_label
-  echo "$OUTDIR/catdir.wrp    " >> forcedobjectbatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_WRP   " >> forcedobjectbatch.dat # dvo_location
   echo "9                     " >> forcedobjectbatch.dat # min_ra
   echo "11                    " >> forcedobjectbatch.dat # max_ra
@@ -591,5 +612,5 @@
   echo "0                     " >> diffbatch.dat # datastore_publish
   echo "catdir.dif            " >> diffbatch.dat # dvo_label
-  echo "$OUTDIR/catdir.dif    " >> diffbatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_DIF    " >> diffbatch.dat # dvo_location
   echo "9                     " >> diffbatch.dat # min_ra
   echo "11                    " >> diffbatch.dat # max_ra
@@ -645,5 +666,5 @@
   echo "0                     " >> diffobjbatch.dat # datastore_publish
   echo "catdir.dif            " >> diffobjbatch.dat # dvo_label
-  echo "$OUTDIR/catdir.dif    " >> diffobjbatch.dat # dvo_location
+  echo "$OUTDIR/$CATDIR_DIF    " >> diffobjbatch.dat # dvo_location
   echo "9                     " >> diffobjbatch.dat # min_ra
   echo "11                    " >> diffobjbatch.dat # max_ra