Changeset 34936 for branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/mkcatdir.dvo

Timestamp:

Jan 15, 2013, 8:37:38 PM (14 years ago)

Author:

eugene

Message:

fix mysql issues with multirow inserts; update tests

File:

• branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/mkcatdir.dvo (modified) (1 diff)

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/mkcatdir.dvo

@@ -38 +38 @@
     mkinput $offset:$i
     exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
-    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2
+    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
   end
 
-  exec relphot -D CATDIR catdir.test r -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update -nloop 10.0 >& /dev/null
+  break -auto off
+  echo dbadmin.sh delete localhost dvotest dvo dvo
+  exec dbadmin.sh delete localhost dvotest dvo dvo
+  break -auto on
 
-  catdir catdir.test
-  skyregion {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} 
+  echo dbadmin.sh create localhost dvotest dvo dvo
+  exec dbadmin.sh create localhost dvotest dvo dvo
 
-  imextract time Mcal
+  echo dvopsps -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -dbhost localhost -dbname dvotest -dbuser dvo -dbpass dvo
+  exec dvopsps -D CATDIR catdir.test -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -dbhost localhost -dbname dvotest -dbuser dvo -dbpass dvo
 
-  for i 0 $offset:n
-    tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
-  end
-
-  exec rm test.cmf test.in.txt
-  exec rm -r catdir.test
+  # for i 0 $offset:n
+  #   tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
+  # end
 
   tapDONE