Changeset 7336 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
08/29/05 03:09:15 (19 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7335 r7336  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2005/08/28 Daniela Dorner
     21
     22   * datacenter/scripts/insertdatasets,
     23     datacenter/macros/insertdataset.C:
     24     - added handling of the new fiels fComment in the table DataSets
     25
     26   * datacenter/macros/setupdb.C:
     27     - adapted to changes in the table DataSets
     28
     29
    2030
    2131 2005/08/28 Daniela Dorner
  • trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C

    r7166 r7336  
    105105}
    106106
    107 int insertdataset(TString number, TString source, TString wobble, Bool_t dummy=kTRUE)
     107int insertdataset(TString number, TString source, TString wobble, TString comment, Bool_t dummy=kTRUE)
    108108{
    109109    TEnv env("sql.rc");
     
    134134    {
    135135        TString query=Form("INSERT DataSets SET fDataSetNumber='%s', "
    136                    " fSourceKEY=%d, fWobble='%s' ",
    137                    number.Data(), sourcekey, wobble.Data());
     136                   " fSourceKEY=%d, fWobble='%s', fComment='%s' ",
     137                   number.Data(), sourcekey, wobble.Data(), comment.Data());
    138138
    139139        if (dummy)
  • trunk/MagicSoft/Mars/datacenter/macros/setupdb.C

    r7334 r7336  
    569569         "  fSourceKEY          SMALLINT      UNSIGNED   NOT NULL,"
    570570         "  fWobble             ENUM('Y','N')            NULL,"
     571         "  fComment            VARCHAR(255)             NULL,"
    571572         "  fLastUpdate         TIMESTAMP"
    572573         ")"));
  • trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets

    r7265 r7336  
    7474   fi
    7575   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'` >> $scriptlog 2>&1
     76   comment=`grep 'Comment:' $datasetfile | sed -e 's/Comment://g'` >> $scriptlog 2>&1
    7677   mode=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1
    7778   mode2=`echo $mode | grep ^\#` >> $scriptlog 2>&1
     
    8687   echo "  sourcename: "$source >> $scriptlog 2>&1
    8788   echo "  wobble:     "$wobble >> $scriptlog 2>&1
     89   echo "  comment:    "$comment >> $scriptlog 2>&1
    8890   echo " " >> $scriptlog 2>&1
    8991   
     
    9294   insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log
    9395
    94    check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\"",kFALSE\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
     96   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\""\,"\"$comment\""\,kFALSE\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
    9597   case $check0 in
    9698      1)   echo "check0=$check0 -> everything ok " >> $scriptlog 2>&1 ;;
Note: See TracChangeset for help on using the changeset viewer.