Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-13 08:05:55 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Added a 'LOG_NAME' call parameter to the 'ListLogs' web service.
This commit is contained in:
Fred Gleason
2017-01-18 07:40:58 -05:00
parent 9d5618c90c
commit 15f3da11d4
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -15519,3 +15519,5 @@
2017-01-17 Fred Gleason <fredg@paravelsystems.com> 2017-01-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'lib/rdlog_line.cpp' that caused invalid 'Type' values * Fixed a bug in 'lib/rdlog_line.cpp' that caused invalid 'Type' values
to be returned for Chain events. to be returned for Chain events.
2017-01-18 Fred Gleason <fredg@paravelsystems.com>
* Added a 'LOG_NAME' call parameter to the 'ListLogs' web service.

11
docs/docbook/web_api.xml
View File

@@ -2599,6 +2599,17 @@
Optional. Default is to return all logs. Optional. Default is to return all logs.
</entry> </entry>
</row> </row>
<row>
<entry>
LOG_NAME
</entry>
<entry>
Return the log with this name.
</entry>
<entry>
Optional. Default is to return all logs.
</entry>
</row>
<row> <row>
<entry> <entry>
TRACKABLE TRACKABLE

7
web/rdxport/logs.cpp
View File

@@ -40,20 +40,25 @@ void Xport::ListLogs()
RDSqlQuery *q; RDSqlQuery *q;
RDLog *log; RDLog *log;
QString service_name=""; QString service_name="";
QString log_name="";
QString trackable; QString trackable;
// //
// Get Options // Get Options
// //
xport_post->getValue("SERVICE_NAME",&service_name); xport_post->getValue("SERVICE_NAME",&service_name);
xport_post->getValue("LOG_NAME",&log_name);
xport_post->getValue("TRACKABLE",&trackable); xport_post->getValue("TRACKABLE",&trackable);
// //
// Generate Log List // Generate Log List
// //
sql="select NAME from LOGS"; sql="select NAME from LOGS";
if((!service_name.isEmpty())||(trackable=="1")) { if((!service_name.isEmpty())||(!log_name.isEmpty())||(trackable=="1")) {
sql+=" where"; sql+=" where";
if(!log_name.isEmpty()) {
sql+=" (NAME=\""+RDEscapeString(log_name)+"\")&&";
}
if(!service_name.isEmpty()) { if(!service_name.isEmpty()) {
sql+=" (SERVICE=\""+RDEscapeString(service_name)+"\")&&"; sql+=" (SERVICE=\""+RDEscapeString(service_name)+"\")&&";
} }

4
web/tests/listlogs.html
View File

@@ -18,6 +18,10 @@
<td><input type="text" name="SERVICE_NAME" size="20" maxlength="10"></td> <td><input type="text" name="SERVICE_NAME" size="20" maxlength="10"></td>
</tr> </tr>
<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">TRACKABLE:</td> <td align="right">TRACKABLE:</td>
<td><input type="text" name="TRACKABLE" size="2" maxlength="1"></td> <td><input type="text" name="TRACKABLE" size="2" maxlength="1"></td>
</tr> </tr>