MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixing up of prev commit

This commit is contained in:
ejurgensen 2015-01-10 00:45:19 +01:00
parent bfa9f4d5cf
commit a96af67a30
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db.c
View File

@ -1445,16 +1445,16 @@ db_build_query_browse(struct query_params *qp, char *field, char *sort_field, ch
if (idx && qp->filter) if (idx && qp->filter)
query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''" query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''"
" AND %s GROUP BY f.%s %s %s;", field, sort_field, field, qp->filter, field, sort, idx); " AND %s GROUP BY f.%s %s %s;", field, sort_field, field, qp->filter, sort_field, sort, idx);
else if (idx) else if (idx)
query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''" query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''"
" GROUP BY f.%s %s %s;", field, sort_field, field, field, sort, idx); " GROUP BY f.%s %s %s;", field, sort_field, field, sort_field, sort, idx);
else if (qp->filter) else if (qp->filter)
query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''" query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''"
" AND %s GROUP BY f.%s %s;", field, sort_field, field, qp->filter, field, sort); " AND %s GROUP BY f.%s %s;", field, sort_field, field, qp->filter, sort_field, sort);
else else
query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''" query = sqlite3_mprintf("SELECT f.%s, f.%s FROM files f WHERE f.disabled = 0 AND f.%s != ''"
" GROUP BY f.%s %s", field, sort_field, field, field, sort); " GROUP BY f.%s %s", field, sort_field, field, sort_field, sort);
free(sort); free(sort);
@ -4475,6 +4475,7 @@ static const struct db_init_query db_init_index_queries[] =
{ I_ARTIST, "create artist index" }, { I_ARTIST, "create artist index" },
{ I_ALBUMARTIST, "create album_artist index" }, { I_ALBUMARTIST, "create album_artist index" },
{ I_COMPOSER, "create composer index" }, { I_COMPOSER, "create composer index" },
{ I_GENRE, "create genre index" },
{ I_TITLE, "create title index" }, { I_TITLE, "create title index" },
{ I_ALBUM, "create album index" }, { I_ALBUM, "create album index" },