Changeset 7167 for trunk/MagicSoft/Mars/datacenter/macros

Timestamp:

06/15/05 17:12:46 (20 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/macros/createdataset.C (modified) (6 diffs)

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

@@ -16 +16 @@
 !
 !
-!   Author(s): Daniela Dorner, 05/2005 <mailto:dorner@astro.uni-wuerzburg.de>
+!   Author(s): Daniela Dorner, 06/2005 <mailto:dorner@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2005
@@ -82 +82 @@
     fouthtml << source << endl;
     fouthtml << "</td><td>" << endl;
-    if (wobble.Contains("Y"))
+    if (wobble!="N")
         fouthtml << "wobble," << endl;
     if (startdate=="0000-00-00 00:00:00")
@@ -89 +89 @@
         fouthtml << "from " << startdate << " to " << stopdate << endl;
     if (cal)
-        fouthtml << "only data processed to the imgpar is taken into account" << endl;
+        fouthtml << ", only data processed to the imgpar is taken into account" << endl;
     fouthtml << "</td></tr>" << endl;
 
@@ -100 +100 @@
     if (cal)
         query +=" left join SequenceProcessStatus on Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst ";
-    query +=Form(" where fSourceName like '%s%%' and fRunStart between '%s' and '%s'",
-                 source.Data(), startdate.Data(), stopdate.Data());
+    if (wobble=="N")
+        query +=Form(" where fSourceName like '%s%%' and fRunStart between '%s' and '%s'",
+                     source.Data(), startdate.Data(), stopdate.Data());
+    else
+        query +=Form(" where fSourceName like '%s%%' and fRunStart between '%s' and '%s'",
+                     wobble.Data(), startdate.Data(), stopdate.Data());
     if (cal)
         query +=" and not IsNull(fStar) ";
@@ -123 +127 @@
     delete res;
 
-    if (wobble.Contains("N"))
-    {
-        if (off.Contains("none"))
+    if (wobble=="N")
+    {
+        if (off=="none")
         {
             off  ="Off";
@@ -161 +165 @@
     }
 
-    if (wobble.Contains("N"))
+    if (wobble=="N")
         fout << "#" << flush;
     fout << "SourceName: " << source << endl;
     fout << "Catalog: /magic/datacenter/setup/magic_favorites.edb" << endl;
-    if (wobble.Contains("N"))
+    if (wobble=="N")
         fout << "#" << flush;
     fout << "WobbleMode: On" << endl << endl;