Index: /trunk/MagicSoft/Mars/datacenter/macros/plotdb.C
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/macros/plotdb.C	(revision 8750)
+++ /trunk/MagicSoft/Mars/datacenter/macros/plotdb.C	(revision 8751)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.36 2007-09-05 17:05:35 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.37 2007-10-07 21:04:00 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -414,23 +414,23 @@
         case kNone:
         case kGroupByPrimary:
-            query += valued;
+            query += Form("%s AS %s", valued.Data(), valued.Data()+1);
             break;
         case kGroupByHour:
-            query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByNight:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByWeek:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByMonth:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupBySeason:
-            //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         case kGroupByYear:
-            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data());
+            query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1);
             break;
         }
@@ -493,8 +493,8 @@
         if (fGroupBy!=kNone)
         {
-            query += Form("GROUP BY %s ", valued.Data());
+            query += Form("GROUP BY %s ", valued.Data()+1);
             //query += Form(" HAVING COUNT(%s)=(COUNT(*)+1)/2 ", valuev.Data());
         }
-        query += Form("ORDER BY %s ", valued.Data());
+        query += Form("ORDER BY %s ", valued.Data()+1);
 
 
@@ -521,5 +521,5 @@
 void plotall(MPlot &plot)
 {
-    //plot.SetGroupBy(MPlot::kGroupByWeek);
+    //plot.SetGroupBy(MPlot::kGroupByNight);
 
     plot.SetPrimaryDate("Sequences.fRunStart");