Changeset 7024


Ignore:
Timestamp:
05/13/05 11:49:02 (19 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7023 r7024  
    2121
    2222                                                 -*-*- END OF LINE -*-*-
    23  2005/05/10 Daniela Dorner
     23 2005/05/13 Daniela Dorner
     24
     25   * datacenter/scripts/runstar
     26     - fixed bug in the calculation of the number of to-do-files
     27
     28   * datacenter/scripts/runcallisto
     29     - fixed bug in the calculation of the number of to-do-files
     30
     31
     32
     33 2005/05/12 Daniela Dorner
    2434
    2535   * datacenter/macros/fillcalib.C:
  • trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C

    r6933 r7024  
    7575    {
    7676        query = Form("DELETE FROM MyMagic.Calibration WHERE fSequenceFirst=%s", (*row)[0]);
     77
     78        TSQLResult *res = serv.Query(query);
     79        if (!res)
     80            return kFALSE;
     81        delete res;
     82
     83        query = Form("DELETE FROM MyMagic.Star WHERE fSequenceFirst=%s", (*row)[0]);
    7784
    7885        TSQLResult *res = serv.Query(query);
  • trunk/MagicSoft/Mars/datacenter/macros/setupdb.C

    r7010 r7024  
    526526
    527527    list.Add(new TObjString(
     528         "CREATE TABLE MyMagic.Star ("
     529         "  fSequenceFirst      INT        UNSIGNED   PRIMARY KEY, "
     530         "  fMeanNumberIslands  FLOAT(5,1)            NOT NULL,"
     531         "  fPSF                FLOAT(5,1)            NOT NULL,"
     532         "  fLastUpdate         TIMESTAMP"
     533         ")"));
     534
     535    list.Add(new TObjString(
    528536         "CREATE TABLE MyMagic.SequenceBuildStatus ("
    529537         "  fDate                  DATE                 PRIMARY KEY, "
  • trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

    r7019 r7024  
    111111   lines=`cat $todofile.txt | wc -l`
    112112   echo "number of lines: "$lines >> $scriptlog 2>&1
     113   while (( "$lines" < "$pno" ))
     114   do
     115      echo "# of lines ($lines) < # of processes ($pno) "
     116      pno=`expr $pno / 2`
     117   done
     118   echo "pno: "$pno
    113119   nofiles=`expr $lines / \( $pno - 1 \)`
    114120   echo "number of files: "$nofiles >> $scriptlog 2>&1
  • trunk/MagicSoft/Mars/datacenter/scripts/runstar

    r7019 r7024  
    107107   lines=`cat $todofile.txt | wc -l`
    108108   echo "number of lines: "$lines >> $scriptlog 2>&1
     109   while (( "$lines" < "$pno" ))
     110   do
     111      echo "# of lines ($lines) < # of processes ($pno) "
     112      pno=`expr $pno / 2`
     113   done
     114   echo "pno: "$pno
    109115   nofiles=`expr $lines / \( $pno - 1 \)`
    110116   echo "number of files: "$nofiles >> $scriptlog 2>&1
Note: See TracChangeset for help on using the changeset viewer.