bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to LIKE

Browse Source
This commit is contained in:
Andrew Pamment 2017-10-19 13:24:21 +10:00
parent 0edc68105b
commit 7eb58c4dbd
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/files.c
View File

@ -1096,34 +1096,35 @@ void file_search() {
searchterms = (char **)realloc(searchterms, sizeof(char *) * (searchterm_count + 1)); searchterms = (char **)realloc(searchterms, sizeof(char *) * (searchterm_count + 1));
} }
searchterms[searchterm_count] = strdup(ptr); searchterms[searchterm_count] = malloc(strlen(ptr) + 3);
sprintf(searchterms[searchterm_count], "%%%s%%", ptr);
searchterm_count++; searchterm_count++;
ptr = strtok(NULL, " "); ptr = strtok(NULL, " ");
} }
if (stype == 0) { if (stype == 0) {
snprintf(sqlbuffer, 1024, "select filename, description, size, dlcount, uploaddate from files where approved=1 AND filename MATCH(?"); snprintf(sqlbuffer, 1024, "select filename, description, size, dlcount, uploaddate from files where approved=1 AND (filename LIKE ?");
for (i=1; i < searchterm_count; i++) { for (i=1; i < searchterm_count; i++) {
strncat(sqlbuffer, " OR ?", 1024); strncat(sqlbuffer, " OR filename LIKE ?", 1024);
} }
strncat(sqlbuffer, ")", 1024); strncat(sqlbuffer, ")", 1024);
} }
if (stype == 1) { if (stype == 1) {
snprintf(sqlbuffer, 1024, "select filename, description, size, dlcount, uploaddate from files where approved=1 AND description MATCH(?"); snprintf(sqlbuffer, 1024, "select filename, description, size, dlcount, uploaddate from files where approved=1 AND description (filename LIKE ?");
for (i=1; i < searchterm_count; i++) { for (i=1; i < searchterm_count; i++) {
strncat(sqlbuffer, " OR ?", 1024); strncat(sqlbuffer, " OR filename LIKE ?", 1024);
} }
strncat(sqlbuffer, ")", 1024); strncat(sqlbuffer, ")", 1024);
} }
if (stype == 2) { if (stype == 2) {
snprintf(sqlbuffer, 1024, "select filename, description, size, dlcount, uploaddate from files where approved=1 AND (filename MATCH(?"); snprintf(sqlbuffer, 1024, "select filename, description, size, dlcount, uploaddate from files where approved=1 AND (filename LIKE ?");
for (i=1; i < searchterm_count; i++) { for (i=1; i < searchterm_count; i++) {
strncat(sqlbuffer, " OR ?", 1024); strncat(sqlbuffer, " OR filename LIKE ?", 1024);
} }
strncat(sqlbuffer, ") OR description MATCH(", 1024); strncat(sqlbuffer, " OR description LIKE ?", 1024);
for (i=1; i < searchterm_count; i++) { for (i=1; i < searchterm_count; i++) {
strncat(sqlbuffer, " OR ?", 1024); strncat(sqlbuffer, " OR description LIKE ?", 1024);
} }
strncat(sqlbuffer, "))", 1024); strncat(sqlbuffer, ")", 1024);
} }
if (!all) { if (!all) {
@ -1181,8 +1182,6 @@ void file_search() {
files_c++; files_c++;
} }
s_printf("%s\n", sqlite3_errmsg(db));
sqlite3_finalize(res); sqlite3_finalize(res);
sqlite3_close(db); sqlite3_close(db);