Changeset 7336 for trunk

Timestamp:

08/29/05 03:09:15 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/insertdataset.C (modified) (2 diffs)
• datacenter/macros/setupdb.C (modified) (1 diff)
• datacenter/scripts/insertdatasets (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/08/28 Daniela Dorner
+
+   * datacenter/scripts/insertdatasets, 
+     datacenter/macros/insertdataset.C:
+     - added handling of the new fiels fComment in the table DataSets
+
+   * datacenter/macros/setupdb.C:
+     - adapted to changes in the table DataSets
+
+
 
  2005/08/28 Daniela Dorner

trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C

@@ -105 +105 @@
 }
 
-int insertdataset(TString number, TString source, TString wobble, Bool_t dummy=kTRUE)
+int insertdataset(TString number, TString source, TString wobble, TString comment, Bool_t dummy=kTRUE)
 {
     TEnv env("sql.rc");
@@ -134 +134 @@
     {
         TString query=Form("INSERT DataSets SET fDataSetNumber='%s', "
-                   " fSourceKEY=%d, fWobble='%s' ",
-                   number.Data(), sourcekey, wobble.Data());
+                   " fSourceKEY=%d, fWobble='%s', fComment='%s' ",
+                   number.Data(), sourcekey, wobble.Data(), comment.Data());
 
         if (dummy)

trunk/MagicSoft/Mars/datacenter/macros/setupdb.C

@@ -569 +569 @@
          "  fSourceKEY          SMALLINT      UNSIGNED   NOT NULL,"
          "  fWobble             ENUM('Y','N')            NULL,"
+         "  fComment            VARCHAR(255)             NULL,"
          "  fLastUpdate         TIMESTAMP"
          ")"));

trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets

@@ -74 +74 @@
    fi
    source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'` >> $scriptlog 2>&1 
+   comment=`grep 'Comment:' $datasetfile | sed -e 's/Comment://g'` >> $scriptlog 2>&1 
    mode=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
    mode2=`echo $mode | grep ^\#` >> $scriptlog 2>&1 
@@ -86 +87 @@
    echo "  sourcename: "$source >> $scriptlog 2>&1 
    echo "  wobble:     "$wobble >> $scriptlog 2>&1 
+   echo "  comment:    "$comment >> $scriptlog 2>&1 
    echo " " >> $scriptlog 2>&1 
    
@@ -92 +94 @@
    insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log
 
-   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\"",kFALSE\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
+   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\""\,"\"$comment\""\,kFALSE\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
    case $check0 in 
       1)   echo "check0=$check0 -> everything ok " >> $scriptlog 2>&1 ;;