Index: trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C	(revision 7369)
+++ trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C	(revision 7370)
@@ -186,7 +186,7 @@
 
     //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,4 +212,7 @@
     {
     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,5 +220,8 @@
 
         //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,5 +237,8 @@
 
         //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,5 +254,8 @@
 
         //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,5 +813,5 @@
 
     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());
 
Index: trunk/MagicSoft/Mars/datacenter/macros/insertsequence.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/insertsequence.C	(revision 7370)
+++ trunk/MagicSoft/Mars/datacenter/macros/insertsequence.C	(revision 7370)
@@ -0,0 +1,252 @@
+/* ======================================================================== *\
+!
+! *
+! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+! * Software. It is distributed to you in the hope that it can be a useful
+! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+! * It is distributed WITHOUT ANY WARRANTY.
+! *
+! * Permission to use, copy, modify and distribute this software and its
+! * documentation for any purpose is hereby granted without fee,
+! * provided that the above copyright notice appear in all copies and
+! * that both that copyright notice and this permission notice appear
+! * in supporting documentation. It is provided "as is" without express
+! * or implied warranty.
+! *
+!
+!
+!   Author(s): Daniela Dorner, 01/2005 <mailto:dorner@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2005
+!
+!
+\* ======================================================================== */
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// InsertSequence.C
+// ================
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+
+#include <TEnv.h>
+
+#include <MSQLServer.h>
+#include <TSQLRow.h>
+#include <TSQLResult.h>
+
+using namespace std;
+
+Bool_t ExistStr(MSQLServer &serv, const char *column, const char *table, const char *test)
+{
+    TString query(Form("SELECT %s FROM %s WHERE %s='%s'", column, table, column, test));
+    TSQLResult *res = serv.Query(query);
+    if (!res)
+        return kFALSE;
+
+    Bool_t rc = kFALSE;
+
+    TSQLRow *row=res->Next();
+    if (row && (*row)[0])
+        rc=kTRUE;
+
+    delete res;
+    return rc;
+}
+
+Int_t QueryNameKEY(MSQLServer &serv, Bool_t dummy, const char *col, const char *name, Bool_t insert=kTRUE)
+{
+    TString query;
+
+    query = Form("SELECT f%sKEY FROM %s WHERE f%sName='%s'", col, col, col, name);
+    TSQLResult *res = serv.Query(query);
+    if (!res)
+        return -1;
+
+    TSQLRow *row=res->Next();
+
+    Int_t rc = row && (*row)[0] ? atoi((*row)[0]) : -1;
+
+    delete res;
+
+    if (rc>=0)
+        return rc;
+
+    if (!insert)
+        return -1;
+
+    query = Form("INSERT %s (f%sName) VALUES (\"%s\");", col, col, name);
+
+    if (dummy)
+    {
+        cout << query << endl;
+        return 0;
+    }
+
+    res=serv.Query(query);
+    if (!res)
+        return -1;
+
+    delete res;
+
+    Int_t key = QueryNameKEY(serv, dummy, col, name, kFALSE);
+    if (key>0)
+    {
+        cout << "New " << col << ": " << name << endl;
+        return key;
+    }
+
+    cout << "ERROR: " << query << endl;
+    return kFALSE;
+}
+
+int insertsequence(TString filename, Bool_t dummy=kTRUE)
+{
+    TEnv env("sql.rc");
+    TEnv sequ(filename);
+
+    MSQLServer serv(env);
+    if (!serv.IsConnected())
+    {
+        cout << "ERROR - Connection to database failed." << endl;
+        return 0;
+    }
+    cout << "insertsequence" << endl;
+    cout << "--------------" << endl;
+    cout << endl;
+    cout << "Connected to " << serv.GetName() << endl;
+    cout << endl;
+
+    TString sequnum=filename;
+    sequnum=sequnum.Remove(0,30);
+    sequnum=sequnum.Remove(8);
+    Int_t seq=atoi(sequnum.Data());
+
+    TString runs;
+    runs = sequ.GetValue("Runs", "");
+    runs.ReplaceAll(" ", ",");
+    if (runs.IsNull())
+    {
+        cout << "ERROR - No runs in file " << filename << " found." << endl;
+        return 0;
+    }
+
+    TString query="SELECT max(fRunNumber), min(fRunStart), ";
+    query +="sum(time_to_sec(fRunStop)-time_to_sec(fRunStart)), ";
+    query +="min(fZenithDistance), max(fZenithDistance), ";
+    query +="min(fAzimuth), max(fAzimuth), sum(fNumEvents) from RunData ";
+    query +=Form("WHERE fRunNumber IN (%s)",runs.Data());
+
+    cout << "runs: " << runs << endl;
+    cout << "q: " << query << endl;
+
+    TSQLResult *res = serv.Query(query);
+    if (!res)
+        return 0;
+
+    TSQLRow *row=res->Next();
+    TString lastrun=(*row)[0];
+    TString starttime=(*row)[1];
+    TString uptime=(*row)[2];
+    TString zdmin=(*row)[3];
+    TString zdmax=(*row)[4];
+    TString azmin=(*row)[5];
+    TString azmax=(*row)[6];
+    TString numevts=(*row)[7];
+
+    delete res;
+
+    query  ="SELECT fProjectKEY, fSourceKEY, fHvSettingsKEY, ";
+    query +="fTriggerDelayTableKEY, fDiscriminatorThresholdTableKEY, ";
+    query +="fTestFlagKEY, fLightConditionsKEY, fL1TriggerTableKEY, ";
+    query +=Form("fL2TriggerTableKEY FROM RunData WHERE fRunNumber=%d", seq);
+
+    cout << "q: " << query << endl;
+
+    res = serv.Query(query);
+    if (!res)
+        return 0;
+
+    row=res->Next();
+    TString project=(*row)[0];
+    TString source=(*row)[1];
+    TString hv=(*row)[2];
+    TString delay=(*row)[3];
+    TString dt=(*row)[4];
+    TString testflag=(*row)[5];
+    TString lightcond=(*row)[6];
+    TString l1tt=(*row)[7];
+    TString l2tt=(*row)[8];
+
+    delete res;
+
+    cout << "seq: "       << seq       << endl;
+    cout << " lastrun   " << lastrun   << endl;
+    cout << " startime  " << starttime << endl;
+    cout << " uptime    " << uptime    << endl;
+    cout << " zdmin     " << zdmin     << endl;
+    cout << " zdmax     " << zdmax     << endl;
+    cout << " azmin     " << azmin     << endl;
+    cout << " azmax     " << azmax     << endl;
+    cout << " numevts   " << numevts   << endl;
+    cout << " keys:"                   <<  endl;
+    cout << " project   " << project   << endl;
+    cout << " source    " << source    << endl;
+    cout << " hv        " << hv        << endl;
+    cout << " delay     " << delay     << endl;
+    cout << " dt        " << dt        << endl;
+    cout << " testflag  " << testflag  << endl;
+    cout << " lightcond " << lightcond << endl;
+    cout << " l1tt      " << l1tt      << endl;
+    cout << " l2tt      " << l2tt      << endl;
+
+    TString query1="INSERT Sequences SET fManuallyChangedKEY=2, ";
+    query1 +=Form("fSequenceFirst=%d, fSequenceLast=%s, "
+                  "fProjectKEY=%s, fSourceKEY=%s, fNumEvents=%s, "
+                  "fRunStart='%s', fHvSettingsKEY=%s, fRunTime=%s, "
+                  "fTriggerDelayTableKEY=%s, fDiscriminatorThresholdTableKEY=%s, "
+                  "fTestFlagKEY=%s, fLightConditionsKEY=%s, fAzimuthMin=%s, "
+                  "fAzimuthMax=%s, fZenithDistanceMin=%s, fZenithDistanceMax=%s, "
+                  "fL1TriggerTableKEY=%s, fL2TriggerTableKEY=%s ",
+                  seq, lastrun.Data(), project.Data(), source.Data(),
+                  numevts.Data(), starttime.Data(), hv.Data(), uptime.Data(),
+                  delay.Data(), dt.Data(), testflag.Data(), lightcond.Data(),
+                  azmin.Data(), azmax.Data(), zdmin.Data(), zdmax.Data(),
+                  l1tt.Data(), l2tt.Data());
+
+    TString query2=Form("INSERT SequenceProcessStatus SET "
+                        "fSequenceFirst=%d, fSequenceFileWritten='1970-01-01 00:00:00'",
+                        seq);
+
+    if (dummy)
+    {
+        cout << "q1: " << query1 << endl;
+        cout << "q2: " << query2 << endl;
+        return 1;
+    }
+
+
+    res = serv.Query(query1);
+    if (!res)
+    {
+        cout << "ERROR: query1 failed: " << query1 << endl;
+        return 0;
+    }
+    delete res;
+
+    res = serv.Query(query2);
+    if (!res)
+    {
+        cout << "ERROR: query2 failed: " << query2 << endl;
+        return 0;
+    }
+    delete res;
+
+    return 1;
+}
+
+
Index: trunk/MagicSoft/Mars/datacenter/scripts/insertsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertsequences	(revision 7370)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertsequences	(revision 7370)
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# ========================================================================
+#
+# *
+# * This file is part of MARS, the MAGIC Analysis and Reconstruction
+# * Software. It is distributed to you in the hope that it can be a useful
+# * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+# * It is distributed WITHOUT ANY WARRANTY.
+# *
+# * Permission to use, copy, modify and distribute this software and its
+# * documentation for any purpose is hereby granted without fee,
+# * provided that the above copyright notice appear in all copies and
+# * that both that copyright notice and this permission notice appear
+# * in supporting documentation. It is provided "as is" without express
+# * or implied warranty.
+# *
+#
+#
+#   Author(s): Daniela Dorner  08/2004 <mailto:dorner@astro.uni-wuerzburg.de>
+#
+#   Copyright: MAGIC Software Development, 2000-2004
+#
+#
+# ========================================================================
+#
+#
+
+user=`whoami`
+source /home/$user/Mars/datacenter/scripts/sourcefile
+
+set -C
+
+cd $mars
+
+datetime=`date +%F-%H-%M-%S`
+year=`date +%Y`
+
+scriptlogpath=$logpath/run/insertsequences/`date +%Y/%m`
+makedir $scriptlogpath
+
+scriptlog=$scriptlogpath/insertsequences-$datetime.log
+
+date >> $scriptlog 2>&1
+
+date > $lockpath/lock-insertsequences.txt >> $scriptlog 2>&1 
+checklock0=$?
+case $checklock0 in 
+    0)   echo "checklock0=$checklock0 -> continue " >> $scriptlog 2>&1;;
+    1)   echo "checklock0=$checklock0 -> file exists " >> $scriptlog 2>&1
+         echo "-> insertsequences is running -> exit" >> $scriptlog 2>&1
+         date  >> $scriptlog 2>&1
+         exit;;
+    *)   echo "checklock0=$checklock0 -> something went completely wrong" >> $scriptlog 2>&1;;
+esac
+
+
+sequencefiles=(`grep -R '#manually changed' $sequpath/ | cut -c 1-42`)
+echo "sequencefiles: "${sequencefiles[@]}  >> $scriptlog 2>&1 
+echo "" >> $scriptlog 2>&1 
+
+for sequencefile in ${sequencefiles[@]}
+do 
+   echo "file: "$sequencefile >> $scriptlog 2>&1 
+   no=`echo $sequencefile | cut -c 31-38`
+   insertsequencepath=$logpath/insertsequence/$no
+   makedir $insertsequencepath >> $scriptlog 2>&1
+   insertsequencelog=$insertsequencepath/insertsequence-$no.log
+
+   check0=`root -q -b $macrospath/insertsequence.C+\("\"$sequencefile\""\,kFALSE\) | tee $insertsequencelog | grep int | sed -e 's/(int)//'`
+   case $check0 in 
+      1)   echo "check0=$check0 -> everything ok " >> $scriptlog 2>&1 ;;
+      *)   echo "check0=$check0 -> ERROR " >> $scriptlog 2>&1 ;;
+   esac
+done
+
+rm -v $lockpath/lock-insertsequences.txt >> $scriptlog 2>&1 
+
+set +C
+
+date  >> $scriptlog 2>&1
+
Index: trunk/MagicSoft/Mars/datacenter/scripts/rmlocks
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/rmlocks	(revision 7370)
+++ trunk/MagicSoft/Mars/datacenter/scripts/rmlocks	(revision 7370)
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# ========================================================================
+#
+# *
+# * This file is part of MARS, the MAGIC Analysis and Reconstruction
+# * Software. It is distributed to you in the hope that it can be a useful
+# * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+# * It is distributed WITHOUT ANY WARRANTY.
+# *
+# * Permission to use, copy, modify and distribute this software and its
+# * documentation for any purpose is hereby granted without fee,
+# * provided that the above copyright notice appear in all copies and
+# * that both that copyright notice and this permission notice appear
+# * in supporting documentation. It is provided "as is" without express
+# * or implied warranty.
+# *
+#
+#
+#   Author(s): Daniela Dorner  08/2005 <mailto:dorner@astro.uni-wuerzburg.de>
+#
+#   Copyright: MAGIC Software Development, 2000-2004
+#
+#
+# ========================================================================
+#
+#
+
+user=`whoami`
+source /home/$user/Mars/datacenter/scripts/sourcefile
+
+files=`ls $lockpath/*`
+
+for file in ${files[@]}
+do 
+#   echo "file: "$file
+   filedate=`date +%Y%m%d%H -r $file`
+   now=`date +%Y%m%d%H`
+   compdate=`expr $now - 12`
+#   echo "date: "$filedate
+#   echo "now: " $now
+#   echo "comp: " $compdate
+   if [ $compdate -gt $filedate ]
+   then 
+#      echo "greater -> remove"
+      rm -v $file
+      date
+   fi
+done
+
+
+
