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

* Added an 'ELR_LINES' table to the database.
	* Incremented the database version to 289.
	* Removed the 'RDSvc::serviceTableName()' method.

lib/export_nprsoundex.cpp

@@ -2,7 +2,7 @@
 //
 // Export a Rivendell NPR SoundExchange Report to an ASCII Text File.
 //
-//   (C) Copyright 2002-2006,2013,2016-2017 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2006,2013,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
@@ -22,13 +22,14 @@
 
 #include <qfile.h>
 #include <qmessagebox.h>
-#include <rddb.h>
-#include <rdlog_line.h>
+
 #include <rdairplay_conf.h>
 #include <rddatedecode.h>
-#include <rdreport.h>
-#include <rdget_ath.h>
+#include <rddb.h>
 #include <rdescape_string.h>
+#include <rdget_ath.h>
+#include <rdlog_line.h>
+#include <rdreport.h>
 
 //
 // This implements a National Public Radio (NPR) standard.
@@ -63,8 +64,16 @@ bool RDReport::ExportNprSoundEx(const QString &filename,const QDate &startdate,
   //
   // Roll Up Records
   //
-  sql=QString("select EVENT_DATETIME,LENGTH,TITLE,ARTIST,ALBUM,LABEL from `")+
-    mixtable+"_SRT` order by EVENT_DATETIME";
+  sql=QString("select ")+
+    "EVENT_DATETIME,"+
+    "LENGTH,"+
+    "TITLE,"+
+    "ARTIST,"+
+    "ALBUM,"+
+    "LABEL "+
+    "from ELR_LINES where "+
+    "SERVICE_NAME=\""+RDEscapeString(mixtable)+"\" "+
+    "order by EVENT_DATETIME";
   q=new RDSqlQuery(sql);
   while(q->next()) {
     fprintf(f,"%s\t",(const char *)q->value(0).toDateTime().