Changeset 8996 for trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C

Timestamp:

07/05/08 20:01:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C (modified) (4 diffs)

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

@@ -57 +57 @@
 #include <fstream>
 
-#include <TEnv.h>
 #include <TSystem.h>
 
-#include "MSQLMagic.h"
 #include <TSQLRow.h>
 #include <TSQLResult.h>
+
+#include "MSQLMagic.h"
 
 using namespace std;
@@ -69 +69 @@
 int findcacofiles()
 {
-    TEnv env("sql.rc");
-
-    MSQLMagic serv(env);
+    MSQLMagic serv("sql.rc");
     if (!serv.IsConnected())
     {
@@ -87 +85 @@
     query+=" DATE_FORMAT(ADDDATE(if(fRunStart='0000-00-00 00:00:00', fRunStop, fRunStart), INTERVAL +13 HOUR), '%Y/%m/%d') ";
     query+=" FROM RunProcessStatus ";
-    query+=" LEFT JOIN RunData ON RunData.fRunNumber=RunProcessStatus.fRunNumber ";
-    query+=" LEFT JOIN Source ON RunData.fSourceKEY=Source.fSourceKEY ";
+    query+=" LEFT JOIN RunData USING (fRunNumber) ";
+    query+=" LEFT JOIN Source USING (fSourceKEY) ";
     query+=" WHERE IsNull(fCaCoFileFound) AND fExcludedFDAKEY=1 ";
     query+=" AND RunProcessStatus.fRunNumber > 10000 AND NOT IsNull(fCCFileAvail)";
@@ -115 +113 @@
 
         query ="SELECT MAX(fCaCoFileFound) FROM RunProcessStatus ";
-        query+=" LEFT JOIN RunData ON RunData.fRunNumber=RunProcessStatus.fRunNumber ";
+        query+=" LEFT JOIN RunData USING (fRunNumber) ";
         query+=Form("WHERE DATE_FORMAT(ADDDATE(fRunStart, INTERVAL +13 HOUR), '%%Y/%%m/%%d')='%s' ",
                     (*row)[1]);