MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-11 14:30:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename pl_id member of struct query_params

Browse Source
This commit is contained in:
Julien BLACHE
2010-03-07 11:53:16 +01:00
parent 6a144cd670
commit 641e5462cc
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/db.c
View File

@@ -583,10 +583,10 @@ db_build_query_plitems_plain(struct query_params *qp, char **q)
if (qp->filter)
count = sqlite3_mprintf("SELECT COUNT(*) FROM files JOIN playlistitems ON files.path = playlistitems.filepath"
" WHERE playlistitems.playlistid = %d AND files.disabled = 0 AND %s;", qp->pl_id, qp->filter);
" WHERE playlistitems.playlistid = %d AND files.disabled = 0 AND %s;", qp->id, qp->filter);
else
count = sqlite3_mprintf("SELECT COUNT(*) FROM files JOIN playlistitems ON files.path = playlistitems.filepath"
" WHERE playlistitems.playlistid = %d AND files.disabled = 0;", qp->pl_id);
" WHERE playlistitems.playlistid = %d AND files.disabled = 0;", qp->id);
if (!count)
{
@@ -609,19 +609,19 @@ db_build_query_plitems_plain(struct query_params *qp, char **q)
if (idx && qp->filter)
query = sqlite3_mprintf("SELECT files.* FROM files JOIN playlistitems ON files.path = playlistitems.filepath"
" WHERE playlistitems.playlistid = %d AND files.disabled = 0 AND %s ORDER BY playlistitems.id ASC %s;",
qp->pl_id, qp->filter, idx);
qp->id, qp->filter, idx);
else if (idx)
query = sqlite3_mprintf("SELECT files.* FROM files JOIN playlistitems ON files.path = playlistitems.filepath"
" WHERE playlistitems.playlistid = %d AND files.disabled = 0 ORDER BY playlistitems.id ASC %s;",
qp->pl_id, idx);
qp->id, idx);
else if (qp->filter)
query = sqlite3_mprintf("SELECT files.* FROM files JOIN playlistitems ON files.path = playlistitems.filepath"
" WHERE playlistitems.playlistid = %d AND files.disabled = 0 AND %s ORDER BY playlistitems.id ASC;",
qp->pl_id, qp->filter);
qp->id, qp->filter);
else
query = sqlite3_mprintf("SELECT files.* FROM files JOIN playlistitems ON files.path = playlistitems.filepath"
" WHERE playlistitems.playlistid = %d AND files.disabled = 0 ORDER BY playlistitems.id ASC;",
qp->pl_id);
qp->id);
if (!query)
{
@@ -688,13 +688,13 @@ db_build_query_plitems(struct query_params *qp, char **q)
struct playlist_info *pli;
int ret;
if (qp->pl_id <= 0)
if (qp->id <= 0)
{
DPRINTF(E_LOG, L_DB, "No playlist id specified in playlist items query\n");
return -1;
}
pli = db_pl_fetch_byid(qp->pl_id);
pli = db_pl_fetch_byid(qp->id);
if (!pli)
return -1;