2018-07-10 Fred Gleason <fredg@paravelsystems.com>

* Added a 'STACK_LINES' table to the database. * Incremented the database version to 293.
2026-01-12 15:45:59 +01:00 · 2018-07-10 11:05:46 -04:00
parent c72c5702c0
commit 3973ab5f01
36 changed files with 210 additions and 294 deletions
--- a/rdlogmanager/commandline_ops.cpp
+++ b/rdlogmanager/commandline_ops.cpp
@@ -25,7 +25,6 @@

 #include <dbversion.h>
 #include <rdapplication.h>
-#include <rdcreate_log.h>
 #include <rddatedecode.h>
 #include <rdlog.h>
 #include <rdlog_event.h>
--- a/rdlogmanager/edit_clock.cpp
+++ b/rdlogmanager/edit_clock.cpp
@@ -34,7 +34,6 @@
 #include <rd.h>
 #include <rdapplication.h>
 #include <rdconf.h>
-#include <rdcreate_log.h>
 #include <rddb.h>
 #include <rdescape_string.h>
 #include <rdevent.h>
--- a/rdlogmanager/edit_eventline.cpp
+++ b/rdlogmanager/edit_eventline.cpp
@@ -2,7 +2,7 @@
 //
 // Edit Rivendell Log Eventline
 //
-//   (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -25,16 +25,14 @@
 #include <qmessagebox.h>
 #include <qpushbutton.h>

-#include <rddb.h>
 #include <rd.h>
+#include <rddb.h>
 #include <rdevent.h>
-#include <rdcreate_log.h>
 #include <rdtextvalidator.h>

 #include <list_events.h>
 #include <edit_eventline.h>

-
 EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line,
 			     QWidget *parent)
  : QDialog(parent,"",true)
--- a/rdlogmanager/edit_grid.cpp
+++ b/rdlogmanager/edit_grid.cpp
@@ -2,7 +2,7 @@
 //
 // Edit Rivendell Log Grid
 //
-//   (C) Copyright 2002-2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -30,15 +30,14 @@
 #include <qcolordialog.h>
 #include <qsignalmapper.h>

-#include <rddb.h>
 #include <rd.h>
+#include <rddb.h>
 #include <rdescape_string.h>
 #include <rdevent.h>
-#include <rdcreate_log.h>

-#include <edit_grid.h>
-#include <list_clocks.h>
-#include <edit_clock.h>
+#include "edit_grid.h"
+#include "list_clocks.h"
+#include "edit_clock.h"

 EditGrid::EditGrid(QString servicename,QWidget *parent)
  : QDialog(parent,"",true)
--- a/rdlogmanager/edit_note.cpp
+++ b/rdlogmanager/edit_note.cpp
@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell LogManager Note
 //
-//   (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -27,9 +27,8 @@

 #include <rd.h>
 #include <rdevent.h>
-#include <rdcreate_log.h>

-#include <edit_note.h>
+#include "edit_note.h"

 EditNote::EditNote(QString *text,QWidget *parent)
  : QDialog(parent,"",true)
--- a/rdlogmanager/edit_track.cpp
+++ b/rdlogmanager/edit_track.cpp
@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell LogManager Track
 //
-//   (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -27,9 +27,8 @@

 #include <rd.h>
 #include <rdevent.h>
-#include <rdcreate_log.h>

-#include <edit_track.h>
+#include "edit_track.h"

 EditTrack::EditTrack(QString *text,QWidget *parent)
  : QDialog(parent,"",true)
--- a/rdlogmanager/generate_log.cpp
+++ b/rdlogmanager/generate_log.cpp
@@ -29,7 +29,6 @@

 #include <rd.h>
 #include <rdapplication.h>
-#include <rdcreate_log.h>
 #include <rddatedecode.h>
 #include <rddb.h>
 #include <rddatedialog.h>
@@ -49,7 +48,6 @@
 #include "../icons/greenball.xpm"
 #include "../icons/redball.xpm"

-
 GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service,
 			 QDate *cmd_date)
  : QDialog(parent,"",true)
@@ -348,18 +346,6 @@ void GenerateLog::createData()
  RDSqlQuery *q;

  srand(QTime::currentTime().msec());
-  sql=RDCreateStackTableSql(gen_service_box->currentText().replace(" ","_"),
-			    rda->config()); 
-
-  q=new RDSqlQuery(sql);
-  if(!q->isActive()) {
-    fprintf(stderr,"SQL: %s\n",(const char *)sql);
-    fprintf(stderr,"SQL Error: %s\n",
-	    (const char *)q->lastError().databaseText());
-    delete q;
-  }
-  delete q;
-
  connect(svc,SIGNAL(generationProgress(int)),
 	  gen_progress_dialog,SLOT(setProgress(int)));
  if(!svc->generateLog(gen_date_edit->date(),
--- a/rdlogmanager/list_clocks.cpp
+++ b/rdlogmanager/list_clocks.cpp
@@ -28,7 +28,6 @@

 #include <rd.h>
 #include <rdapplication.h>
-#include <rdcreate_log.h>
 #include <rddb.h>
 #include <rdescape_string.h>
 #include <rdevent.h>
--- a/rdlogmanager/list_events.cpp
+++ b/rdlogmanager/list_events.cpp
@@ -28,7 +28,6 @@

 #include <rd.h>
 #include <rdapplication.h>
-#include <rdcreate_log.h>
 #include <rddb.h>
 #include <rdescape_string.h>
 #include <rdevent.h>
--- a/rdlogmanager/list_grids.cpp
+++ b/rdlogmanager/list_grids.cpp
@@ -27,11 +27,10 @@
 #include <rddb.h>
 #include <rd.h>
 #include <rdevent.h>
-#include <rdcreate_log.h>

-#include <list_grids.h>
-#include <edit_grid.h>
-#include <globals.h>
+#include "edit_grid.h"
+#include "globals.h"
+#include "list_grids.h"

 ListGrids::ListGrids(QWidget *parent)
  : QDialog(parent,"",true)
--- a/rdlogmanager/logobject.cpp
+++ b/rdlogmanager/logobject.cpp
@@ -23,7 +23,6 @@
 #include <qapplication.h>

 #include <rdapplication.h>
-#include <rdcreate_log.h>
 #include <rddatedecode.h>
 #include <rdlog.h>
 #include <rdsvc.h>
@@ -62,8 +61,6 @@ LogObject::LogObject(const QString &svcname,int start_offset,
 void LogObject::userData()
 {
  QString err_msg;
-  QString sql;
-  RDSqlQuery *q;
  QString report;
  QString unused_report;
  QString svcname_table=log_service_name;
@@ -96,14 +93,6 @@ void LogObject::userData()
      SendNotification(RDNotification::DeleteAction,log->name());
      log->removeTracks(rda->station(),rda->user(),rda->config());
      srand(QTime::currentTime().msec());
-      sql=RDCreateStackTableSql(svcname_table,rda->config());
-      q=new RDSqlQuery(sql);
-      if(!q->isActive()) {
-	fprintf(stderr,"SQL: %s\n",(const char *)sql);
-	fprintf(stderr,"SQL Error: %s\n",
-		(const char *)q->lastError().databaseText());
-      }
-      delete q;
      if(!svc->generateLog(start_date,
 			   RDDateDecode(svc->nameTemplate(),start_date,
 				   rda->station(),rda->config(),svc->name()),
--- a/rdlogmanager/rdlogmanager.cpp
+++ b/rdlogmanager/rdlogmanager.cpp
@@ -43,7 +43,6 @@
 #include <rd.h>
 #include <rdapplication.h>
 #include <rdcheck_daemons.h>
-#include <rdcreate_log.h>
 #include <rdcmd_switch.h>
 #include <rddatedecode.h>
 #include <rddbheartbeat.h>
--- a/rdlogmanager/rename_item.cpp
+++ b/rdlogmanager/rename_item.cpp
@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell LogManager Note
 //
-//   (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -24,13 +24,12 @@
 #include <qpainter.h>
 #include <qmessagebox.h>

-#include <rddb.h>
 #include <rd.h>
+#include <rddb.h>
 #include <rdevent.h>
-#include <rdcreate_log.h>
 #include <rdtextvalidator.h>

-#include <rename_item.h>
+#include "rename_item.h"

 RenameItem::RenameItem(QString *text,QString table,QWidget *parent)
  : QDialog(parent,"",true)