IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34936


Ignore:
Timestamp:
Jan 15, 2013, 8:37:38 PM (14 years ago)
Author:
eugene
Message:

fix mysql issues with multirow inserts; update tests

Location:
branches/eam_branches/ipp-20121219/Ohana/src/dvopsps
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

    r34921 r34936  
    11# include "dvopsps.h"
    2 # define DEBUG 0
     2# define DEBUG 1
    33# define SQL_INSERT 1
    44// 1 = write data via sql insert values = (),
    … …  
    128128  if (mysql) {
    129129# if (SQL_INSERT)   
     130    if (DEBUG) fprintf (stderr, "%s\n", buffer->buffer);
    130131    int status = mysql_query(mysql, buffer->buffer);
    131132# else

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/mysql_dvopsps.c

    r34921 r34936  
    5050  dump_result (connection);
    5151   
    52   sprintf (query, "set max_allowed_packet = %d;", 2*MAX_BUFFER);
    53   if (mysql_query (connection, query)) {
    54     fprintf (stderr, "failed to set max_allowed_packet\n");
    55     fprintf (stderr, "%s\n", mysql_error (connection));
    56     return NULL;
    57   }
    58   dump_result (connection);
     52  // sprintf (query, "set max_allowed_packet = %d;", 2*MAX_BUFFER);
     53  // if (mysql_query (connection, query)) {
     54  //   fprintf (stderr, "failed to set max_allowed_packet\n");
     55  //   fprintf (stderr, "%s\n", mysql_error (connection));
     56  //   return NULL;
     57  // }
     58  // dump_result (connection);
    5959   
    6060  sprintf (query, "show variables like 'max_allowed_packet';");

  • branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/test/dbadmin.sh

    r34921 r34936  
    1818
    1919if ("$1" == "create") then
    20   if ($#argv != 4) goto usage;
     20  if ($#argv < 4) goto usage;
    2121  set dbhost = $2
    2222  set dbname = $3
    2323  set dbuser = $4
     24  if ($#argv == 5) then
     25    set dbpass = "-p$5"
     26  else
     27    set dbpass = "-p"
     28  endif
    2429
    25   mysql -h $dbhost -u $dbuser -p <<EOF
     30  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    2631   CREATE DATABASE $dbname;
    2732   USE $dbname;
    … …  
    4853
    4954if ("$1" == "delete") then
    50   if ($#argv != 4) goto usage;
     55  if ($#argv < 4) goto usage;
    5156  set dbhost = $2
    5257  set dbname = $3
    5358  set dbuser = $4
     59  if ($#argv == 5) then
     60    set dbpass = "-p$5"
     61  else
     62    set dbpass = "-p"
     63  endif
    5464
    55   mysql -h $dbhost -u $dbuser -p <<EOF > /dev/null
     65  echo mysql -h $dbhost -u $dbuser $dbpass
     66
     67  mysql -h $dbhost -u $dbuser $dbpass <<EOF > /dev/null
    5668   USE $dbname;
    5769   describe dvoDetection;
    … …  
    6476
    6577  echo "database is valid, deleting"
    66   mysql -h $dbhost -u $dbuser -p <<EOF
     78  mysql -h $dbhost -u $dbuser $dbpass <<EOF
    6779   drop database $dbname;
    6880EOF

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

    r34922 r34936  
    3838    mkinput $offset:$i
    3939    exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\:00:00 -radec $RA $DEC -type $1
    40     exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2
     40    exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
    4141  end
    4242
    43   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
     43  break -auto off
     44  echo dbadmin.sh delete localhost dvotest dvo dvo
     45  exec dbadmin.sh delete localhost dvotest dvo dvo
     46  break -auto on
    4447
    45   catdir catdir.test
    46   skyregion {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0}
     48  echo dbadmin.sh create localhost dvotest dvo dvo
     49  exec dbadmin.sh create localhost dvotest dvo dvo
    4750
    48   imextract time Mcal
     51  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
     52  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
    4953
    50   for i 0 $offset:n
    51     tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
    52   end
    53 
    54   exec rm test.cmf test.in.txt
    55   exec rm -r catdir.test
     54  # for i 0 $offset:n
     55  #   tapOK {abs(Mcal[$i] - Mcal[0] - $offset:$i) < 0.001} "Mcal $i"
     56  # end
    5657
    5758  tapDONE
Note: See TracChangeset for help on using the changeset viewer.