Changeset 7395 for trunk/MagicSoft/Mars/datacenter

Timestamp:

11/11/05 17:57:31 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

• macros/buildsequenceentries.C (modified) (3 diffs)
• scripts/rmlocks (modified) (1 diff)

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

@@ -220 +220 @@
 
         //calibration table
-        query=Form("SELECT fSequenceFirst FROM Calibration "
+        query=Form("SELECT Calibration.fSequenceFirst FROM Calibration "
                    " LEFT JOIN Sequences ON Calibration.fSequenceFirst=Sequences.fSequenceFirst "
-                   " WHERE fManuallyChangedKEY=1 AND fSequenceFirst BETWEEN %d and %d",
+                   " WHERE fManuallyChangedKEY=1 AND Calibration.fSequenceFirst BETWEEN %d and %d",
                    from, to);
         res = serv.Query(query);
@@ -237 +237 @@
 
         //Star table
-        query=Form("SELECT fSequenceFirst FROM Star "
+        query=Form("SELECT Star.fSequenceFirst FROM Star "
                    " LEFT JOIN Sequences ON Star.fSequenceFirst=Sequences.fSequenceFirst "
-                   " WHERE fManuallyChangedKEY=1 AND  fSequenceFirst BETWEEN %d and %d",
+                   " WHERE fManuallyChangedKEY=1 AND  Star.fSequenceFirst BETWEEN %d and %d",
                    from, to);
         res = serv.Query(query);
@@ -254 +254 @@
 
         //SequenceProcessStatus table
-        query=Form("SELECT fSequenceFirst FROM SequenceProcessStatus "
+        query=Form("SELECT SequenceProcessStatus.fSequenceFirst FROM SequenceProcessStatus "
                    " LEFT JOIN Sequences ON SequenceProcessStatus.fSequenceFirst=Sequences.fSequenceFirst "
-                   " WHERE fManuallyChangedKEY=1 AND  fSequenceFirst BETWEEN %d and %d",
+                   " WHERE fManuallyChangedKEY=1 AND  SequenceProcessStatus.fSequenceFirst BETWEEN %d and %d",
                    from, to);
         res = serv.Query(query);

trunk/MagicSoft/Mars/datacenter/scripts/rmlocks

@@ -40 +40 @@
 #   echo "now: " $now
 #   echo "comp: " $compdate
-   twelf=12
-   if [ $compdate -gt $twelf ]
-   then
-      filedate2=`expr $filedate + 24`
-   else 
-      filedate2=$filedate
-   fi
-   if [ $compdate -gt $filedate2 ] || [ $filedate2 -gt $now -a $now -gt $twelf ]
+   filedate2=`expr $filedate + 24`
+   
+   if [ $compdate -gt $filedate2 ] || [ $filedate -gt $now ]
    then 
       rm -v $file