Changeset 7336 for trunk/MagicSoft/Mars
- Timestamp:
- 08/29/05 03:09:15 (19 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7335 r7336 18 18 19 19 -*-*- 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 20 30 21 31 2005/08/28 Daniela Dorner -
trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C
r7166 r7336 105 105 } 106 106 107 int insertdataset(TString number, TString source, TString wobble, Bool_t dummy=kTRUE)107 int insertdataset(TString number, TString source, TString wobble, TString comment, Bool_t dummy=kTRUE) 108 108 { 109 109 TEnv env("sql.rc"); … … 134 134 { 135 135 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()); 138 138 139 139 if (dummy) -
trunk/MagicSoft/Mars/datacenter/macros/setupdb.C
r7334 r7336 569 569 " fSourceKEY SMALLINT UNSIGNED NOT NULL," 570 570 " fWobble ENUM('Y','N') NULL," 571 " fComment VARCHAR(255) NULL," 571 572 " fLastUpdate TIMESTAMP" 572 573 ")")); -
trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets
r7265 r7336 74 74 fi 75 75 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 76 77 mode=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 77 78 mode2=`echo $mode | grep ^\#` >> $scriptlog 2>&1 … … 86 87 echo " sourcename: "$source >> $scriptlog 2>&1 87 88 echo " wobble: "$wobble >> $scriptlog 2>&1 89 echo " comment: "$comment >> $scriptlog 2>&1 88 90 echo " " >> $scriptlog 2>&1 89 91 … … 92 94 insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log 93 95 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)//'` 95 97 case $check0 in 96 98 1) echo "check0=$check0 -> everything ok " >> $scriptlog 2>&1 ;;
Note:
See TracChangeset
for help on using the changeset viewer.