|
...
|
...
|
@@ -52,7 +52,7 @@ if(isset($_POST['submit']) || isset($_GET['offset'])) {
|
|
52
|
52
|
$scountquery = array();
|
|
53
|
53
|
if($searchtype == "fulltext") {
|
|
54
|
54
|
$query = "SELECT DISTINCT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.storytext AND chapter.validated > 0 LIKE '%$searchterm%' AND chapter.sid = stories.sid AND stories.uid = "._UIDFIELD;
|
|
55
|
|
- $countquery = "SELECT DISTINCT count(stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.storytext AND chapter.validated > 0 LIKE '%$searchterm%' AND chapter.sid = stories.sid GROUP BY stories.sid";
|
|
|
55
|
+ $countquery = "SELECT count(DISTINCT stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.storytext AND chapter.validated > 0 LIKE '%$searchterm%' AND chapter.sid = stories.sid GROUP BY stories.sid";
|
|
56
|
56
|
$query .= " "._ORDERBY;
|
|
57
|
57
|
search($query, $countquery);
|
|
58
|
58
|
$tpl->assign("output", $output);
|
|
...
|
...
|
@@ -84,7 +84,7 @@ if(isset($_POST['submit']) || isset($_GET['offset'])) {
|
|
84
|
84
|
if(count(array($authorlist)) > 0) {
|
|
85
|
85
|
$authors = implode(",",$authorlist);
|
|
86
|
86
|
$query = "SELECT DISTINCT stories.*, "._PENNAMEFIELD." as penname, stories.date as date, stories.updated as updated FROM ("._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories) LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE "._UIDFIELD." = stories.uid AND stories.validated > 0 AND (FIND_IN_SET(stories.uid, '$authors') > 0 OR FIND_IN_SET(coauth.uid, '$authors') > 0) ";
|
|
87
|
|
- $countquery = "SELECT DISTINCT COUNT(stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE stories.validated > 0 AND (FIND_IN_SET(stories.uid, '$authors') > 0 OR FIND_IN_SET(coauth.uid, '$authors') > 0)";
|
|
|
87
|
+ $countquery = "SELECT COUNT(DISTINCT stories.sid) FROM ".TABLEPREFIX."fanfiction_stories as stories LEFT JOIN ".TABLEPREFIX."fanfiction_coauthors as coauth ON coauth.sid = stories.sid WHERE stories.validated > 0 AND (FIND_IN_SET(stories.uid, '$authors') > 0 OR FIND_IN_SET(coauth.uid, '$authors') > 0)";
|
|
88
|
88
|
search($query, $countquery);
|
|
89
|
89
|
$tpl->assign("output", $output);
|
|
90
|
90
|
$tpl->printToScreen();
|