Changeset 7370 for trunk/MagicSoft/Mars

Timestamp:

09/29/05 19:21:55 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/buildsequenceentries.C (modified) (6 diffs)
• datacenter/macros/insertsequence.C (added)
• datacenter/scripts/insertsequences (added)
• datacenter/scripts/rmlocks (added)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/09/29 Daniela Dorner
+
+   * datacenter/macros/insertsequence.C:
+     - added (macro to insert manually changed sequences into the DB)
+
+   * datacenter/scripts/insertsequences:
+     - added (script to call insertsequence.C)
+
+   * datacenter/scripts/rmlock:
+     - added (script to remove lockfiles after 13 hours)
+
+
 
  2005/09/27 Thomas Bretz

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

@@ -186 +186 @@
 
     //getting # of sequence (in sequDB) between from and to
-    TString query("SELECT fSequenceFirst FROM Sequences WHERE fSequenceFirst ");
-    query += Form("BETWEEN %d and %d OR fSequenceLast BETWEEN %d and %d",
-                  from, to, from, to);
+    TString query("SELECT fSequenceFirst FROM Sequences WHERE (fSequenceFirst ");
+    query += Form("BETWEEN %d and %d OR fSequenceLast BETWEEN %d and %d) AND "
+                  "fManuallyChangedKEY=1 ", from, to, from, to);
 
     TSQLResult *res = serv.Query(query);
@@ -212 +212 @@
     {
     case 0:
+        //FIXME: like this the check is of no use, but when doing it
+        //       without the check for manuallychanged, all manually
+        //       changed sequences would be deleted
         cout << "found no sequence in Sequ-DB -> check other tables" << endl;
         cout << " deleting every sequence found in Calibration, Star or SequenceProcessStatus between "
@@ -217 +220 @@
 
         //calibration table
-        query=Form("SELECT fSequenceFirst FROM Calibration WHERE fSequenceFirst BETWEEN %d and %d", from, to);
+        query=Form("SELECT fSequenceFirst FROM Calibration "
+                   " LEFT JOIN Sequences ON Calibration.fSequenceFirst=Sequences.fSequenceFirst "
+                   " WHERE fManuallyChangedKEY=1 AND fSequenceFirst BETWEEN %d and %d",
+                   from, to);
         res = serv.Query(query);
         if (!res)
@@ -231 +237 @@
 
         //Star table
-        query=Form("SELECT fSequenceFirst FROM Star WHERE fSequenceFirst BETWEEN %d and %d", from, to);
+        query=Form("SELECT fSequenceFirst FROM Star "
+                   " LEFT JOIN Sequences ON Star.fSequenceFirst=Sequences.fSequenceFirst "
+                   " WHERE fManuallyChangedKEY=1 AND  fSequenceFirst BETWEEN %d and %d",
+                   from, to);
         res = serv.Query(query);
         if (!res)
@@ -245 +254 @@
 
         //SequenceProcessStatus table
-        query=Form("SELECT fSequenceFirst FROM SequenceProcessStatus WHERE fSequenceFirst BETWEEN %d and %d", from, to);
+        query=Form("SELECT fSequenceFirst FROM SequenceProcessStatus "
+                   " LEFT JOIN Sequences ON SequenceProcessStatus.fSequenceFirst=Sequences.fSequenceFirst "
+                   " WHERE fManuallyChangedKEY=1 AND  fSequenceFirst BETWEEN %d and %d",
+                   from, to);
         res = serv.Query(query);
         if (!res)
@@ -801 +813 @@
 
     TList sequlist;
-    query=Form("SELECT fSequenceFirst FROM Sequences WHERE %s order by fSequenceFirst",
+    query=Form("SELECT fSequenceFirst FROM Sequences WHERE fManuallyChangedKEY=1 AND %s order by fSequenceFirst",
                cond.Data());