Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-07 17:32:20 +02:00
Code Issues Projects Releases Wiki Activity

2017-01-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'AddLog' method to the Web API.
	* Added an 'DeleteLog' method to the Web API.
	* Added a 'SaveLog' method to the Web API.
	* Added 'eventLength', 'linkEventName', 'linkStartSlop',
	'linkEndSlop', 'linkId', 'linkEmbedded', 'extStartTime',
	'extLength', 'extCartName', 'extData', 'extEventId',
	and 'extAnncType' XML fields to the return of the ListLog web
	API method
This commit is contained in:
Fred Gleason 2017-01-31 18:01:46 -05:00
parent 03ee1d780c
commit 41b3db2408
17 changed files with 1261 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -15530,3 +15530,15 @@
2017-01-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions in 'rdlogedit/edit_log.cpp' that caused a change
to the Purge Date values to fail to be saved.
2017-01-31 Fred Gleason <fredg@paravelsystems.com>
* Added an RLM for the TagStation NextRadio framework in
'rlm/rlm_tagstation.c'
2017-01-31 Fred Gleason <fredg@paravelsystems.com>
* Added an 'AddLog' method to the Web API.
* Added an 'DeleteLog' method to the Web API.
* Added a 'SaveLog' method to the Web API.
* Added 'eventLength', 'linkEventName', 'linkStartSlop',
'linkEndSlop', 'linkId', 'linkEmbedded', 'extStartTime',
'extLength', 'extCartName', 'extData', 'extEventId',
and 'extAnncType' XML fields to the return of the ListLog web
API method

707
docs/docbook/web_api.xml
View File

@ -328,6 +328,95 @@
</table>
</sect1>
<sect1>
<title>AddLog</title>
<subtitle>Add a new log</subtitle>
<para>
Command Code: <code>RDXPORT_COMMAND_ADDLOG</code>
</para>
<para>
Required User Permissions: <code>Create Log</code>
</para>
<table xml:id="ex.addlog" frame="all">
<title>AddLog Call Fields</title>
<tgroup cols="3" align="left" colsep="1" rowsep="1">
<colspec colname="FIELD NAME" />
<colspec colname="MEANING" />
<colspec colname="REMARKS" />
<thead>
<row>
<entry>
FIELD NAME
</entry>
<entry>
MEANING
</entry>
<entry>
REMARKS
</entry>
</row>
</thead>
<tbody>
<row>
<entry>
COMMAND
</entry>
<entry>
29
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
LOGIN_NAME
</entry>
<entry>
Rivendell User Name
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
PASSWORD
</entry>
<entry>
Login Password
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
LOG_NAME
</entry>
<entry>
Name of log to be created.
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
SERVICE_NAME
</entry>
<entry>
Name of the service to own the new log.
</entry>
<entry>
Mandatory
</entry>
</row>
</tbody>
</tgroup>
</table>
</sect1>
<sect1>
<title>AssignSchedCode</title>
<subtitle>Assign a scheduler code to an existing cart</subtitle>
@ -667,6 +756,84 @@
</table>
</sect1>
<sect1>
<title>DeleteLog</title>
<subtitle>Delete a log</subtitle>
<para>
Command Code: <code>RDXPORT_COMMAND_DELETELOG</code>
</para>
<para>
Required User Permissions: <code>Delete Log</code>
</para>
<table xml:id="ex.deletelog" frame="all">
<title>DeleteLog Call Fields</title>
<tgroup cols="3" align="left" colsep="1" rowsep="1">
<colspec colname="FIELD NAME" />
<colspec colname="MEANING" />
<colspec colname="REMARKS" />
<thead>
<row>
<entry>
FIELD NAME
</entry>
<entry>
MEANING
</entry>
<entry>
REMARKS
</entry>
</row>
</thead>
<tbody>
<row>
<entry>
COMMAND
</entry>
<entry>
30
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
LOGIN_NAME
</entry>
<entry>
Rivendell User Name
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
PASSWORD
</entry>
<entry>
Login Password
</entry>
<entry>
Mandatory
</entry>
</row>
<row>
<entry>
LOG_NAME
</entry>
<entry>
Name of log to be deleted.
</entry>
<entry>
Mandatory
</entry>
</row>
</tbody>
</tgroup>
</table>
</sect1>
<sect1>
<title>EditCart</title>
<subtitle>
@ -2528,7 +2695,7 @@
<sect1>
<title>ListLogs</title>
<subtitle>Return information about all available logs</subtitle>
<subtitle>Return information about one or more logs</subtitle>
<para>
Command Code: <code>RDXPORT_COMMAND_LISTLOGS</code>
</para>
@ -2940,6 +3107,544 @@
</table>
</sect1>
<sect1>
<title>SaveLog</title>
<subtitle>Save a log to the Rivendell Database</subtitle>
<para>
Command Code: <code>RDXPORT_COMMAND_SAVELOG</code>
</para>
<para>
Required User Permissions: none
</para>
<table xml:id="ex.savelog" frame="all">
<title>ListLogs Call Fields</title>
<tgroup cols="3" align="left" colsep="1" rowsep="1">
<colspec colname="FIELD NAME" />
<colspec colname="MEANING" />
<colspec colname="REMARKS" />
<thead>
<row>
<entry>
FIELD NAME
</entry>
<entry>
MEANING
</entry>
<entry>
REMARKS
</entry>
</row>
</thead>
<tbody>
<row>
<entry>
COMMAND
</entry>
<entry>
28
</entry>
<entry>
Mandatory.
</entry>
</row>
<row>
<entry>
LOGIN_NAME
</entry>
<entry>
Rivendell User Name
</entry>
<entry>
Mandatory. String.
</entry>
</row>
<row>
<entry>
PASSWORD
</entry>
<entry>
Login Password
</entry>
<entry>
Mandatory. String.
</entry>
</row>
<row>
<entry>
LOG_NAME
</entry>
<entry>
Save the log to this name. If it does not already exist, it will
be created.
</entry>
<entry>
Mandatory. String, 64 characters max.
</entry>
</row>
<row>
<entry>
SERVICE_NAME
</entry>
<entry>
The name of the Service to which the log belongs.
</entry>
<entry>
Mandatory. String, 10 characters max.
</entry>
</row>
<row>
<entry>
DESCRIPTION
</entry>
<entry>
The Description field.
</entry>
<entry>
Mandatory. String, 64 characters max.
</entry>
</row>
<row>
<entry>
PURGE_DATE
</entry>
<entry>
The date on which the log should be automatically deleted.
</entry>
<entry>
Mandatory. Date.
</entry>
</row>
<row>
<entry>
AUTO_REFRESH
</entry>
<entry>
Enable/disable auto-refresh.
</entry>
<entry>
Mandatory. Boolean.
</entry>
</row>
<row>
<entry>
START_DATE
</entry>
<entry>
The Start Date.
</entry>
<entry>
Mandatory. Date.
</entry>
</row>
<row>
<entry>
END_DATE
</entry>
<entry>
The End Date.
</entry>
<entry>
Mandatory. Date.
</entry>
</row>
<row>
<entry>
LINE_QUANTITY
</entry>
<entry>
The number of log line entries in this call.
</entry>
<entry>
Mandatory. Positive integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_ID
</entry>
<entry>
Integer Id.
</entry>
<entry>
Mandatory. Unique positive integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_TYPE
</entry>
<entry>
Event type.
</entry>
<entry>
Mandatory. One of the following key words:
<simplelist>
<member><userinput>Audio</userinput></member>
<member><userinput>Chain</userinput></member>
<member><userinput>Macro</userinput></member>
<member><userinput>Marker</userinput></member>
<member><userinput>Track</userinput></member>
<member><userinput>MusicLink</userinput></member>
<member><userinput>TrafficLink</userinput></member>
</simplelist>
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_CART_NUMBER
</entry>
<entry>
Cart number for Audio or Macro events.
</entry>
<entry>
Mandatory. Positive integer in the range 0 - 999999.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_START_TIME
</entry>
<entry>
Event start time.
</entry>
<entry>
Mandatory. Integer, expressing milliseconds past midnight.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_GRACE_TIME
</entry>
<entry>
Event start time.
</entry>
<entry>
Mandatory. Integer, expressing milliseconds.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_TIME_TYPE
</entry>
<entry>
Start time type.
</entry>
<entry>
Mandatory. One of the following key words:
<simplelist>
<member><userinput>Hard</userinput></member>
<member><userinput>Relative</userinput></member>
</simplelist>
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_TRANS_TYPE
</entry>
<entry>
Event transition type.
</entry>
<entry>
Mandatory. One of the following key words:
<simplelist>
<member><userinput>Play</userinput></member>
<member><userinput>Segue</userinput></member>
<member><userinput>Stop</userinput></member>
</simplelist>
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_START_POINT
</entry>
<entry>
Start point for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Positive integer, or -1 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_END_POINT
</entry>
<entry>
End point for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Positive integer, or -1 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_SEGUE_START_POINT
</entry>
<entry>
Segue start point for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Positive integer, or -1 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_SEGUE_END_POINT
</entry>
<entry>
Segue end point for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Positive integer, or -1 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_FADEUP_POINT
</entry>
<entry>
FadeUp point for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Positive integer, or -1 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_FADEDOWN_POINT
</entry>
<entry>
FadeDown point for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Positive integer, or -1 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_DUCK_UP_GAIN
</entry>
<entry>
Duck Up level for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Negative integer, or 0 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_DUCK_DOWN_GAIN
</entry>
<entry>
Duck Down level for one-off (voice-tracked) play-outs.
</entry>
<entry>
Mandatory. Negative integer, or 0 if not defined.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_COMMENT
</entry>
<entry>
Marker and Track event body text.
</entry>
<entry>
Mandatory. String, max length 255.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LABEL
</entry>
<entry>
Marker and Track event label text.
</entry>
<entry>
Mandatory. String, max length 64.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_ORIGIN_USER
</entry>
<entry>
User name for one-off (voice-tracked) events.
</entry>
<entry>
Mandatory. String, max length 255.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_ORIGIN_DATETIME
</entry>
<entry>
Date/time stamp for one-off (voice-tracked) events.
</entry>
<entry>
Mandatory. DateTime value.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EVENT_LENGTH
</entry>
<entry>
Link event length, in mS.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_EVENT_NAME
</entry>
<entry>
Link event name.
</entry>
<entry>
Mandatory. String, max length 64.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_START_TIME
</entry>
<entry>
Link event start time, in mS past midnight.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_LENGTH
</entry>
<entry>
Link event length, in mS.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_START_SLOP
</entry>
<entry>
Link event start slop, in mS.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_END_SLOP
</entry>
<entry>
Link event end slop, in mS.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_ID
</entry>
<entry>
Link event id.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_LINK_EMBEDDED
</entry>
<entry>
Link event embedded flag.
</entry>
<entry>
Mandatory. Boolean.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EXT_START_TIME
</entry>
<entry>
External data start time.
</entry>
<entry>
Mandatory. Time value.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EXT_LENGTH
</entry>
<entry>
External data length.
</entry>
<entry>
Mandatory. Integer.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EXT_CART_NAME
</entry>
<entry>
External data cart name.
</entry>
<entry>
Mandatory. String, max length 32.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EXT_DATA
</entry>
<entry>
External data data field.
</entry>
<entry>
Mandatory. String, max length 32.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EXT_EVENT_ID
</entry>
<entry>
External data event id.
</entry>
<entry>
Mandatory. String, max length 32.
</entry>
</row>
<row>
<entry>
LINE<replaceable>num</replaceable>_EXT_ANNC_TYPE
</entry>
<entry>
External data announcement type.
</entry>
<entry>
Mandatory. String, max length 8.
</entry>
</row>
</tbody>
</tgroup>
</table>
</sect1>
<sect1>
<title>TrimAudio</title>
<subtitle>

31
lib/rdformpost.cpp
View File

@ -221,6 +221,26 @@ bool RDFormPost::getValue(const QString &name,QDateTime *datetime,bool *ok)
}
bool RDFormPost::getValue(const QString &name,QDate *date,bool *ok)
{
QString str;
if(ok!=NULL) {
*ok=false;
}
if(!getValue(name,&str)) {
return false;
}
if(str.length()==0) {
*date=QDate();
}
else {
*date=RDGetWebDate(str,ok);
}
return true;
}
bool RDFormPost::getValue(const QString &name,QTime *time,bool *ok)
{
QString str;
@ -241,6 +261,17 @@ bool RDFormPost::getValue(const QString &name,QTime *time,bool *ok)
}
bool RDFormPost::getValue(const QString &name,bool *state,bool *ok)
{
if(post_values.count(name)>0) {
*state=post_values[name].toInt(ok);
return true;
}
return false;
}
bool RDFormPost::isFile(const QString &name)
{
return post_filenames[name];

2
lib/rdformpost.h
View File

@ -45,7 +45,9 @@ class RDFormPost
bool getValue(const QString &name,int *n,bool *ok=NULL);
bool getValue(const QString &name,long *n,bool *ok=NULL);
bool getValue(const QString &name,QDateTime *datetime,bool *ok=NULL);
bool getValue(const QString &name,QDate *date,bool *ok=NULL);
bool getValue(const QString &name,QTime *time,bool *ok=NULL);
bool getValue(const QString &name,bool *state,bool *ok=NULL);
bool isFile(const QString &name);
QString tempDir() const;
void dump();

4
lib/rdlog.cpp
View File

@ -36,8 +36,8 @@ RDLog::RDLog(const QString &name,bool create)
log_name=name;
if(create) {
sql=QString().sprintf("select NAME from LOGS where \
(NAME=\"%s\")",(const char *)RDEscapeString(log_name));
sql=QString("select NAME from LOGS where ")+
"(NAME=\""+RDEscapeString(log_name)+"\")";
q=new RDSqlQuery(sql);
if(q->size()!=1) {
delete q;

14
lib/rdlog_line.cpp
View File

@ -2014,6 +2014,20 @@ QString RDLogLine::xml(int line) const
ret+=" "+RDXmlField("hookStartPoint",hookStartPoint());
ret+=" "+RDXmlField("hookEndPoint",hookEndPoint());
ret+=" "+RDXmlField("eventLength",eventLength());
ret+=" "+RDXmlField("linkEventName",linkEventName());
ret+=" "+RDXmlField("linkStartSlop",linkStartSlop());
ret+=" "+RDXmlField("linkEndSlop",linkEndSlop());
ret+=" "+RDXmlField("linkId",linkId());
ret+=" "+RDXmlField("linkEmbedded",linkEmbedded());
ret+=" "+RDXmlField("extStartTime",extStartTime());
ret+=" "+RDXmlField("extLength",extLength());
ret+=" "+RDXmlField("extCartName",extCartName());
ret+=" "+RDXmlField("extData",extData());
ret+=" "+RDXmlField("extEventId",extEventId());
ret+=" "+RDXmlField("extAnncType",extAnncType());
ret+=" </logLine>\n";
#endif // WIN32
return ret;

12
lib/rdweb.cpp
View File

@ -1206,6 +1206,18 @@ QDateTime RDGetWebDateTime(const QString &str,bool *ok)
}
QDate RDGetWebDate(const QString &str,bool *ok)
{
QDate ret;
ret=QDate::fromString(str,Qt::ISODate);
if(ok!=NULL) {
*ok=ret.isValid();
}
return ret;
}
QTime RDGetWebTime(const QString &str,bool *ok)
{
QTime ret;

1
lib/rdweb.h
View File

@ -96,6 +96,7 @@ extern QString RDUrlEscape(const QString &str);
extern QString RDUrlUnescape(const QString &str);
extern QString RDWebDateTime(const QDateTime &datetime);
extern QDateTime RDGetWebDateTime(const QString &str,bool *ok=NULL);
extern QDate RDGetWebDate(const QString &str,bool *ok=NULL);
extern QTime RDGetWebTime(const QString &str,bool *ok=NULL);
extern int RDGetWebMonth(const QString &str,bool *ok=NULL);

3
lib/rdxport_interface.h
View File

@ -48,6 +48,9 @@
#define RDXPORT_COMMAND_ASSIGNSCHEDCODE 25
#define RDXPORT_COMMAND_UNASSIGNSCHEDCODE 26
#define RDXPORT_COMMAND_LISTCARTSCHEDCODES 27
#define RDXPORT_COMMAND_SAVELOG 28
#define RDXPORT_COMMAND_ADDLOG 29
#define RDXPORT_COMMAND_DELETELOG 30
#endif // RDXPORT_INTERFACE_H

1
rivendell.spec.in
View File

@ -356,6 +356,7 @@ rm -rf $RPM_BUILD_ROOT
%doc conf/rlm_spottrap.conf
%doc conf/rlm_filewrite.conf
%doc conf/rlm_spinitron_plus.conf
%doc conf/rlm_tagstation.conf
%doc docs/implemented_macros.txt
%doc utils/sas_shim/rc.sas_shim
%doc docs/datetime_wildcards.txt

330
web/rdxport/logs.cpp
View File

@ -24,16 +24,96 @@
#include <fcntl.h>
#include <errno.h>
#include <rdcreate_log.h>
#include <rddb.h>
#include <rdformpost.h>
#include <rdweb.h>
#include <rdsvc.h>
#include <rduser.h>
#include <rdlog.h>
#include <rdlog_event.h>
#include <rdlog_line.h>
#include <rdconf.h>
#include <rdescape_string.h>
#include <rdxport.h>
void Xport::AddLog()
{
QString log_name;
QString service_name;
//
// Get Arguments
//
if(!xport_post->getValue("LOG_NAME",&log_name)) {
XmlExit("Missing LOG_NAME",400);
}
if(!xport_post->getValue("SERVICE_NAME",&service_name)) {
XmlExit("Missing SERVICE_NAME",400);
}
RDSvc *svc=new RDSvc(service_name);
if(!svc->exists()) {
XmlExit("No such service",404);
}
//
// Verify User Perms
//
if(!xport_user->createLog()) {
XmlExit("Unauthorized",404);
}
RDLog *log=new RDLog(log_name);
if(!log->exists()) {
delete log;
log=new RDLog(log_name,true);
if(!log->exists()) {
delete log;
XmlExit("Unable to create log",500);
}
log->setOriginUser(xport_user->name());
log->setDescription("[new log]");
log->setService(service_name);
}
delete log;
RDCreateLogTable(RDLog::tableName(log_name));
XmlExit("OK",200);
}
void Xport::DeleteLog()
{
QString log_name;
//
// Get Arguments
//
if(!xport_post->getValue("LOG_NAME",&log_name)) {
XmlExit("Missing LOG_NAME",400);
}
//
// Verify User Perms
//
if(!xport_user->deleteLog()) {
XmlExit("Unauthorized",404);
}
RDLog *log=new RDLog(log_name);
if(log->exists()) {
if(!log->remove(xport_station,xport_user,xport_config)) {
delete log;
XmlExit("Unable to delete log",500);
}
}
delete log;
XmlExit("OK",200);
}
void Xport::ListLogs()
{
QString sql;
@ -124,3 +204,253 @@ void Xport::ListLog()
Exit(0);
}
void Xport::SaveLog()
{
//
// Verify User Perms
//
if((!xport_user->addtoLog())||(!xport_user->removefromLog())||(!xport_user->arrangeLog())) {
XmlExit("No user privilege",404);
}
QString log_name;
QString service_name;
QString description;
QDate purge_date;
bool auto_refresh;
QDate start_date;
QDate end_date;
int line_quantity;
//
// Header Data
//
if(!xport_post->getValue("LOG_NAME",&log_name)) {
XmlExit("Missing LOG_NAME",400);
}
if(!xport_post->getValue("SERVICE_NAME",&service_name)) {
XmlExit("Missing SERVICE_NAME",400);
}
if(!xport_post->getValue("DESCRIPTION",&description)) {
XmlExit("Missing DESCRIPTION",400);
}
if(!xport_post->getValue("PURGE_DATE",&purge_date)) {
XmlExit("Missing PURGE_DATE",400);
}
if(!xport_post->getValue("AUTO_REFRESH",&auto_refresh)) {
XmlExit("Missing AUTO_REFRESH",400);
}
if(!xport_post->getValue("START_DATE",&start_date)) {
XmlExit("Missing START_DATE",400);
}
if(!xport_post->getValue("END_DATE",&end_date)) {
XmlExit("Missing END_DATE",400);
}
if(!xport_post->getValue("LINE_QUANTITY",&line_quantity)) {
XmlExit("Missing LINE_QUANTITY",400);
}
//
// Logline Data
//
RDLogEvent *logevt=new RDLogEvent(RDLog::tableName(log_name));
for(int i=0;i<line_quantity;i++) {
logevt->insert(i,1);
RDLogLine *ll=logevt->logLine(i);
QString line=QString().sprintf("LINE%d_",i);
QString str;
int integer1;
int integer2;
QDateTime datetime;
QTime time;
bool state;
if(!xport_post->getValue(line+"_ID",&integer1)) {
XmlExit("Missing "+line+"_ID",400);
}
ll->setId(integer1);
if(!xport_post->getValue(line+"_TYPE",&integer1)) {
XmlExit("Missing "+line+"_TYPE",400);
}
ll->setType((RDLogLine::Type)integer1);
if(!xport_post->getValue(line+"_CART_NUMBER",&integer1)) {
XmlExit("Missing "+line+"_CART_NUMBER",400);
}
ll->setCartNumber(integer1);
if(!xport_post->getValue(line+"_START_TIME",&integer1)) {
XmlExit("Missing "+line+"_START_TIME",400);
}
if(!xport_post->getValue(line+"_TIME_TYPE",&integer2)) {
XmlExit("Missing "+line+"_TIME_TYPE",400);
}
ll->setStartTime((RDLogLine::StartTimeType)integer2,
QTime().addMSecs(integer1));
if(!xport_post->getValue(line+"_GRACE_TIME",&integer1)) {
XmlExit("Missing "+line+"_GRACE_TIME",400);
}
ll->setGraceTime(integer1);
if(!xport_post->getValue(line+"_TRANS_TYPE",&str)) {
XmlExit("Missing "+line+"_TRANS_TYPE",400);
}
integer1=-1;
if(str.lower()=="play") {
integer1=RDLogLine::Play;
}
if(str.lower()=="segue") {
integer1=RDLogLine::Segue;
}
if(str.lower()=="stop") {
integer1=RDLogLine::Stop;
}
if(integer1<0) {
XmlExit("Invalid transition type in "+line+"_TRANS_TYPE",400);
}
ll->setTransType((RDLogLine::TransType)integer1);
if(!xport_post->getValue(line+"_START_POINT",&integer1)) {
XmlExit("Missing "+line+"_START_POINT",400);
}
ll->setStartPoint(integer1,RDLogLine::LogPointer);
if(!xport_post->getValue(line+"_END_POINT",&integer1)) {
XmlExit("Missing "+line+"_END_POINT",400);
}
ll->setEndPoint(integer1,RDLogLine::LogPointer);
if(!xport_post->getValue(line+"_SEGUE_START_POINT",&integer1)) {
XmlExit("Missing "+line+"_SEGUE_START_POINT",400);
}
ll->setSegueStartPoint(integer1,RDLogLine::LogPointer);
if(!xport_post->getValue(line+"_SEGUE_END_POINT",&integer1)) {
XmlExit("Missing "+line+"_SEGUE_END_POINT",400);
}
ll->setSegueEndPoint(integer1,RDLogLine::LogPointer);
if(!xport_post->getValue(line+"_FADEUP_POINT",&integer1)) {
XmlExit("Missing "+line+"_FADEUP_POINT",400);
}
ll->setFadeupPoint(integer1,RDLogLine::LogPointer);
if(!xport_post->getValue(line+"_FADEDOWN_POINT",&integer1)) {
XmlExit("Missing "+line+"_FADEDOWN_POINT",400);
}
ll->setFadedownPoint(integer1,RDLogLine::LogPointer);
if(!xport_post->getValue(line+"_DUCK_UP_GAIN",&integer1)) {
XmlExit("Missing "+line+"_DUCK_UP_GAIN",400);
}
ll->setDuckUpGain(integer1);
if(!xport_post->getValue(line+"_DUCK_DOWN_GAIN",&integer1)) {
XmlExit("Missing "+line+"_DUCK_DOWN_GAIN",400);
}
ll->setDuckDownGain(integer1);
if(!xport_post->getValue(line+"_COMMENT",&str)) {
XmlExit("Missing "+line+"_COMMENT",400);
}
ll->setMarkerComment(str);
if(!xport_post->getValue(line+"_LABEL",&str)) {
XmlExit("Missing "+line+"_LABEL",400);
}
ll->setMarkerLabel(str);
if(!xport_post->getValue(line+"_ORIGIN_USER",&str)) {
XmlExit("Missing "+line+"_ORIGIN_USER",400);
}
ll->setOriginUser(str);
if(!xport_post->getValue(line+"_ORIGIN_DATETIME",&datetime)) {
XmlExit("Missing "+line+"_ORIGIN_DATETIME",400);
}
ll->setOriginDateTime(datetime);
if(!xport_post->getValue(line+"_EVENT_LENGTH",&integer1)) {
XmlExit("Missing "+line+"_EVENT_LENGTH",400);
}
ll->setEventLength(integer1);
if(!xport_post->getValue(line+"_LINK_EVENT_NAME",&str)) {
XmlExit("Missing "+line+"_LINK_EVENT_NAME",400);
}
ll->setLinkEventName(str);
if(!xport_post->getValue(line+"_LINK_START_TIME",&integer1)) {
XmlExit("Missing "+line+"_LINK_START_TIME",400);
}
ll->setLinkStartTime(QTime().addMSecs(integer1));
if(!xport_post->getValue(line+"_LINK_LENGTH",&integer1)) {
XmlExit("Missing "+line+"_LINK_LENGTH",400);
}
ll->setLinkLength(integer1);
if(!xport_post->getValue(line+"_LINK_START_SLOP",&integer1)) {
XmlExit("Missing "+line+"_LINK_START_SLOP",400);
}
ll->setLinkStartSlop(integer1);
if(!xport_post->getValue(line+"_LINK_END_SLOP",&integer1)) {
XmlExit("Missing "+line+"_LINK_END_SLOP",400);
}
ll->setLinkEndSlop(integer1);
if(!xport_post->getValue(line+"_LINK_ID",&integer1)) {
XmlExit("Missing "+line+"_LINK_ID",400);
}
ll->setLinkId(integer1);
if(!xport_post->getValue(line+"_LINK_EMBEDDED",&state)) {
XmlExit("Missing "+line+"_LINK_EMBEDDED",400);
}
ll->setLinkEmbedded(state);
if(!xport_post->getValue(line+"_EXT_START_TIME",&time)) {
XmlExit("Missing "+line+"_EXT_START_TIME",400);
}
ll->setExtStartTime(time);
if(!xport_post->getValue(line+"_EXT_CART_NAME",&str)) {
XmlExit("Missing "+line+"_EXT_CART_NAME",400);
}
ll->setExtCartName(str);
if(!xport_post->getValue(line+"_EXT_DATA",&str)) {
XmlExit("Missing "+line+"_EXT_DATA",400);
}
ll->setExtData(str);
if(!xport_post->getValue(line+"_EXT_EVENT_ID",&str)) {
XmlExit("Missing "+line+"_EXT_EVENT_ID",400);
}
ll->setExtEventId(str);
if(!xport_post->getValue(line+"_EXT_ANNC_TYPE",&str)) {
XmlExit("Missing "+line+"_EXT_ANNC_TYPE",400);
}
ll->setExtAnncType(str);
}
RDLog *log=new RDLog(log_name);
if(!log->exists()) {
XmlExit("No such log",404);
}
log->setService(service_name);
log->setDescription(description);
log->setPurgeDate(purge_date);
log->setAutoRefresh(auto_refresh);
log->setStartDate(start_date);
log->setEndDate(end_date);
logevt->save();
XmlExit("OK",200);
}

13
web/rdxport/rdxport.cpp
View File

@ -119,6 +119,7 @@ Xport::Xport(QObject *parent)
// Load System Settings
//
xport_system=new RDSystem();
xport_station=new RDStation(xport_config->stationName());
//
// Generate Post
@ -221,6 +222,14 @@ Xport::Xport(QObject *parent)
AudioStore();
break;
case RDXPORT_COMMAND_ADDLOG:
AddLog();
break;
case RDXPORT_COMMAND_DELETELOG:
DeleteLog();
break;
case RDXPORT_COMMAND_LISTLOGS:
ListLogs();
break;
@ -229,6 +238,10 @@ Xport::Xport(QObject *parent)
ListLog();
break;
case RDXPORT_COMMAND_SAVELOG:
SaveLog();
break;
case RDXPORT_COMMAND_LISTSCHEDCODES:
ListSchedCodes();
break;

7
web/rdxport/rdxport.h
View File

@ -27,8 +27,9 @@
#include <rdaudioconvert.h>
#include <rdconfig.h>
#include <rdformpost.h>
#include <rduser.h>
#include <rdstation.h>
#include <rdsystem.h>
#include <rduser.h>
class Xport : public QObject
{
@ -59,8 +60,11 @@ class Xport : public QObject
void CopyAudio();
void AudioInfo();
void AudioStore();
void AddLog();
void DeleteLog();
void ListLogs();
void ListLog();
void SaveLog();
void ListSchedCodes();
void AssignSchedCode();
void UnassignSchedCode();
@ -73,6 +77,7 @@ class Xport : public QObject
RDUser *xport_user;
RDConfig *xport_config;
RDSystem *xport_system;
RDStation *xport_station;
};

9
web/tests/Makefile.am
View File

@ -23,11 +23,13 @@ install-exec-am:
mkdir -p $(DESTDIR)@libexecdir@
cp addcart.html $(DESTDIR)@libexecdir@
cp addcut.html $(DESTDIR)@libexecdir@
cp addlog.html $(DESTDIR)@libexecdir@
cp assignschedcode.html $(DESTDIR)@libexecdir@
cp audioinfo.html $(DESTDIR)@libexecdir@
cp audiostore.html $(DESTDIR)@libexecdir@
cp copyaudio.html $(DESTDIR)@libexecdir@
cp delete_audio.html $(DESTDIR)@libexecdir@
cp deletelog.html $(DESTDIR)@libexecdir@
cp editcart.html $(DESTDIR)@libexecdir@
cp editcut.js $(DESTDIR)@libexecdir@
cp editcut.html $(DESTDIR)@libexecdir@
@ -49,6 +51,7 @@ install-exec-am:
cp listservices.html $(DESTDIR)@libexecdir@
cp removecart.html $(DESTDIR)@libexecdir@
cp removecut.html $(DESTDIR)@libexecdir@
cp savelog.html $(DESTDIR)@libexecdir@
cp trimaudio.html $(DESTDIR)@libexecdir@
cp unassignschedcode.html $(DESTDIR)@libexecdir@
cp utils.js $(DESTDIR)@libexecdir@
@ -56,11 +59,13 @@ install-exec-am:
uninstall-local:
rm -f $(DESTDIR)@libexecdir@/addcart.html
rm -f $(DESTDIR)@libexecdir@/addcut.html
rm -f $(DESTDIR)@libexecdir@/addlog.html
rm -f $(DESTDIR)@libexecdir@/assignschedcode.html
rm -f $(DESTDIR)@libexecdir@/audioinfo.html
rm -f $(DESTDIR)@libexecdir@/audiostore.html
rm -f $(DESTDIR)@libexecdir@/copyaudio.html
rm -f $(DESTDIR)@libexecdir@/delete_audio.html
rm -f $(DESTDIR)@libexecdir@/deletelog.html
rm -f $(DESTDIR)@libexecdir@/editcart.html
rm -f $(DESTDIR)@libexecdir@/editcart.js
rm -f $(DESTDIR)@libexecdir@/editcut.html
@ -81,17 +86,20 @@ uninstall-local:
rm -f $(DESTDIR)@libexecdir@/listservices.html
rm -f $(DESTDIR)@libexecdir@/removecart.html
rm -f $(DESTDIR)@libexecdir@/removecut.html
rm -f $(DESTDIR)@libexecdir@/savelog.html
rm -f $(DESTDIR)@libexecdir@/trimaudio.html
rm -f $(DESTDIR)@libexecdir@/unassignschedcode.html
rm -f $(DESTDIR)@libexecdir@/utils.js
EXTRA_DIST = addcart.html\
addcut.html\
addlog.html\
assignschedcode.html\
audioinfo.html\
audiostore.html\
copyaudio.html\
delete_audio.html\
deletelog.html\
editcart.html\
editcart.js\
editcut.html\
@ -112,6 +120,7 @@ EXTRA_DIST = addcart.html\
listservices.html\
removecart.html\
removecut.html\
savelog.html\
trimaudio.html\
unassignschedcode.html\
utils.js

33
web/tests/addlog.html Normal file
View File

@ -0,0 +1,33 @@
<html>
<head>
<title>Rivendell ADDLOG Service Test Harness</title>
<body>
<form action="/rd-bin/rdxport.cgi" method="post" enctype="multipart/form-data">
<input type="hidden" name="COMMAND" value="29">
<table cellpadding="0" cellspacing="2" border="0">
<tr>
<td align="right">LOGIN NAME:</td>
<td><input type="text" name="LOGIN_NAME" size="20" maxlength="255"></td>
</tr>
<tr>
<td align="right">PASSWORD:</td>
<td><input type="password" name="PASSWORD" size="20" maxlength="32"></td>
</tr>
<tr>
<td align="right">LOG NAME:</td>
<td><input type="text" name="LOG_NAME" size="20" maxlength="64"></td>
</tr>
<tr>
<td align="right">SERVICE NAME:</td>
<td><input type="text" name="SERVICE_NAME" size="20" maxlength="10"></td>
</tr>
<tr>
<td colspan="2" align="right">&nbsp;</td>
</tr>
<tr>
<td colspan="2" align="right"><input type="submit" value="OK"></td>
</tr>
</table>
</form>
</body>
</html>

29
web/tests/deletelog.html Normal file
View File

@ -0,0 +1,29 @@
<html>
<head>
<title>Rivendell DELETELOG Service Test Harness</title>
<body>
<form action="/rd-bin/rdxport.cgi" method="post" enctype="multipart/form-data">
<input type="hidden" name="COMMAND" value="30">
<table cellpadding="0" cellspacing="2" border="0">
<tr>
<td align="right">LOGIN NAME:</td>
<td><input type="text" name="LOGIN_NAME" size="20" maxlength="255"></td>
</tr>
<tr>
<td align="right">PASSWORD:</td>
<td><input type="password" name="PASSWORD" size="20" maxlength="32"></td>
</tr>
<tr>
<td align="right">LOG NAME:</td>
<td><input type="text" name="LOG_NAME" size="20" maxlength="64"></td>
</tr>
<tr>
<td colspan="2" align="right">&nbsp;</td>
</tr>
<tr>
<td colspan="2" align="right"><input type="submit" value="OK"></td>
</tr>
</table>
</form>
</body>
</html>

57
web/tests/savelog.html Normal file
View File

@ -0,0 +1,57 @@
<html>
<head>
<title>Rivendell SAVELOG Service Test Harness</title>
<body>
<form action="/rd-bin/rdxport.cgi" method="post" enctype="multipart/form-data">
<input type="hidden" name="COMMAND" value="28">
<table cellpadding="0" cellspacing="2" border="0">
<tr>
<td align="right">LOGIN NAME:</td>
<td><input type="text" name="LOGIN_NAME" size="20" maxlength="255"></td>
</tr>
<tr>
<td align="right">PASSWORD:</td>
<td><input type="password" name="PASSWORD" size="20" maxlength="32"></td>
</tr>
<tr>
<td align="right">LOG_NAME:</td>
<td><input type="text" name="LOG_NAME" size="20" maxlength="64"></td>
</tr>
<tr>
<td align="right">SERVICE_NAME:</td>
<td><input type="text" name="SERVICE_NAME" size="20" maxlength="10"></td>
</tr>
<tr>
<td align="right">DESCRIPTION:</td>
<td><input type="text" name="DESCRIPTION" size="20" maxlength="64"></td>
</tr>
<tr>
<td align="right">PURGE DATE (YYYY-MM-DD):</td>
<td><input type="text" name="PURGE_DATE" size="20" maxlength="10"></td>
</tr>
<tr>
<td align="right">AUTO REFRESH:</td>
<td><input type="text" name="AUTO_REFRESH" size="20" maxlength="1"></td>
</tr>
<tr>
<td align="right">START DATE (YYYY-MM-DD):</td>
<td><input type="text" name="START_DATE" size="20" maxlength="10"></td>
</tr>
<tr>
<td align="right">END DATE (YYYY-MM-DD):</td>
<td><input type="text" name="END_DATE" size="20" maxlength="10"></td>
</tr>
<tr>
<td align="right">LINE QUANTITY:</td>
<td><input type="text" name="LINE_QUANTITY" size="20" maxlength="6"></td>
</tr>
<tr>
<td colspan="2" align="right">&nbsp;</td>
</tr>
<tr>
<td colspan="2" align="right"><input type="submit" value="OK"></td>
</tr>
</table>
</form>
</body>
</html>