diff --git a/.gitignore b/.gitignore index f0c164802..797fd0c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.1 *.5 +*.7 *.8 *.buildinfo *.cgi diff --git a/ChangeLog b/ChangeLog index d5068c0c9..b5a838389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24330,3 +24330,5 @@ 2023-08-04 Fred Gleason * Fixed a regression in rdlibrary(1) that caused cart deletion to fail with the message "Voicetrack Found". +2023-08-04 Fred Gleason + * Added a rivendell(7) man page. diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am index 4f96bf63e..ad1d06571 100644 --- a/docs/manpages/Makefile.am +++ b/docs/manpages/Makefile.am @@ -30,6 +30,8 @@ xsltproc $(DOCBOOK_STYLESHEETS)/manpages/docbook.xsl $< %.5: %.xml xsltproc $(DOCBOOK_STYLESHEETS)/manpages/docbook.xsl $< +%.7: %.xml + xsltproc $(DOCBOOK_STYLESHEETS)/manpages/docbook.xsl $< %.8: %.xml xsltproc $(DOCBOOK_STYLESHEETS)/manpages/docbook.xsl $< @@ -93,7 +95,10 @@ all-local: rdadmin.1\ rdsinglestart.pdf\ rdsoftkeys.1\ rdsoftkeys.html\ - rdsoftkeys.pdf + rdsoftkeys.pdf\ + rivendell.7\ + rivendell.html\ + rivendell.pdf man_MANS = rdadmin.1\ rdairplay.1\ @@ -111,7 +116,8 @@ man_MANS = rdadmin.1\ rmlsend.1\ rdservice.8\ rdsinglestart.1\ - rdsoftkeys.1 + rdsoftkeys.1\ + rivendell.7 EXTRA_DIST = exitcodes.xml\ rdadmin.1\ @@ -181,13 +187,18 @@ EXTRA_DIST = exitcodes.xml\ rdsoftkeys.1\ rdsoftkeys.html\ rdsoftkeys.pdf\ - rdsoftkeys.xml + rdsoftkeys.xml\ + rivendell.7\ + rivendell.html\ + rivendell.pdf\ + rivendell.xml CLEANFILES = *~ MAINTAINERCLEANFILES = *~\ *.1\ *.5\ - *.8\ + *.5\ + *.7\ *.html\ *.pdf\ aclocal.m4\ diff --git a/docs/manpages/rivendell.xml b/docs/manpages/rivendell.xml new file mode 100644 index 000000000..62074ae3f --- /dev/null +++ b/docs/manpages/rivendell.xml @@ -0,0 +1,219 @@ + + + + + rivendell + 7 + August 2023 + Linux Audio Manual + + + rivendell + + Common command-line switches for Rivendell modules + + + + + + Fred + Gleason + fredg@paravelsystems.com + + Application Author + + + + + Description + + Rivendell is a complete radio broadcast automation system, with + facilities for the acquisition, management, scheduling and playout of + audio content. This man page covers the set of command-line options + supported by all Rivendell modules. + + + For a comprehensive overview of Rivendell and its features, see the + + Rivendell Operations Guide + . + + + + Basic Options + + The following command-line options work with nearly all Rivendell + modules: + + + + + --help + + + + Print a list of available command-line options and then exit. + + + + + + --list-styles + + + + Print the list of available Qt style plug-ins to standard output + and then exit. + + + + + + --skip-db-check + + + + Bypass the usual check to ensure that the Rivendell database + is using the expected schema version. Useless except for debugging. + + + + This option is dangerous, and can cause + database corruption! It should only used be as + a debugging aid and when you know exactly what you are doing. + + + + + + + --skip-db-check + + + + Bypass the usual check to ensure that the "rivendell" + service is running. Useless except for debugging. + + + + + + -style plugin-name + + + + Use the Qt style plug-in plugin-name. + + + + + + --ticket=tkt-str + + + + Manually add the ticket string tkt-str + to the WebAPI ticket store. Useless except for debugging. + + + + + + --version + + + + Print the Rivendell version and then exit. + + + + + + + Bugs + + The -style option uses the X11-style format + (single leading hyphen, with a space separating the switch and its value) + rather than the Rivendell-style one (double leading hyphens with an equal + sign separating the switch and its value). + + + + See Also + + + rdadmin1 + + , + + rdairplay1 + + , + + rdalsaconfig8 + + , + + rdclilogedit1 + + , + + rd.conf5 + + , + + rdconvert1 + + , + + rddbmgr8 + + , + + rdexport1 + + , + + rdimport1 + + , + + rdlogmanager1 + + , + + rdmarkerset8 + + , + + rdmetadata1 + + , + + rdrender1 + + , + + rdservice8 + + , + + rdsinglestart1 + + , + + rdsoftkeys1 + + , + + rmlsend1 + + + + + + diff --git a/lib/rdcoreapplication.cpp b/lib/rdcoreapplication.cpp index 7b67396c9..e63d99122 100644 --- a/lib/rdcoreapplication.cpp +++ b/lib/rdcoreapplication.cpp @@ -143,7 +143,7 @@ bool RDCoreApplication::open(QString *err_msg,ErrorType *err_type, bool skip_db_check=false; int persistent_dropbox_id=-1; bool ok=false; - QString sql; + QString sql; RDSqlQuery *q=NULL; if(err_type!=NULL) { @@ -163,21 +163,31 @@ bool RDCoreApplication::open(QString *err_msg,ErrorType *err_type, app_ticket=app_cmd_switch->value(i); app_cmd_switch->setProcessed(i,true); } - if(app_cmd_switch->key(i)=="--persistent-dropbox-id") { + if((app_cmd_switch->key(i)=="--persistent-dropbox-id")&& + (app_command_name=="rdimport")) { + // + // Catch this here so we can include the dropbox ID the + // ident parameter to openlog(3). + // persistent_dropbox_id=app_cmd_switch->value(i).toUInt(&ok); if(ok) { - app_command_name=QString::asprintf("dropbox[%u]",persistent_dropbox_id); + strncpy(app_syslog_name, + QString::asprintf("dropbox[%u]",persistent_dropbox_id).toUtf8(), + PATH_MAX-1); + app_cmd_switch->setProcessed(i,true); } - app_cmd_switch->setProcessed(i,true); } if(app_cmd_switch->key(i)=="--list-styles") { QStringList f0=QStyleFactory::keys(); - printf("Available styles:\n"); for(int j=0;jkey(i)=="--skip-service-check") { + check_svc=false; + app_cmd_switch->setProcessed(i,true); + } } // diff --git a/rivendell.spec.in b/rivendell.spec.in index b43572c3a..20449af33 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -473,6 +473,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/rdsinglestart.1.gz %{_mandir}/man1/rdsoftkeys.1.gz %{_mandir}/man5/rd.conf.5.gz +%{_mandir}/man7/rivendell.7.gz %{_mandir}/man8/rddbmgr.8.gz %{_mandir}/man8/rdmarkerset.8.gz %{_mandir}/man8/rdservice.8.gz