Merge branch 'master' of git.mycard.moe:mycard/docker-manticore

manticore.conf

@@ -24,6 +24,7 @@ source shared {
     sql_query_pre    = SET NAMES utf8
     sql_query_pre    = CREATE TABLE IF NOT EXISTS sph_counter (counter_id INTEGER PRIMARY KEY NOT NULL, max_doc_id INTEGER NOT NULL)
     sql_attr_uint    = tid
+    sql_attr_uint    = fid
     sql_attr_uint    = digest
     sql_attr_uint    = displayorder
     sql_attr_uint    = authorid
@@ -33,20 +34,20 @@ source shared {
 
 source threads : shared {
     sql_query_range  = SELECT MIN(tid),MAX(tid) FROM pre_forum_thread
-    sql_query        = SELECT tid AS id,tid,subject,digest,displayorder,authorid,lastpost,special FROM pre_forum_thread \
+    sql_query        = SELECT tid AS id,tid,fid,subject,digest,displayorder,authorid,lastpost,special FROM pre_forum_thread \
                        WHERE tid>=\$start AND tid<=\$end
     sql_query_post_index = REPLACE INTO sph_counter set counter_id = 1, max_doc_id = \$maxid
 }
 
 source threads_minute : shared
 {
-    sql_query        = SELECT tid AS id,tid,subject,digest,displayorder,authorid,lastpost,special FROM pre_forum_thread \
+    sql_query        = SELECT tid AS id,tid,fid,subject,digest,displayorder,authorid,lastpost,special FROM pre_forum_thread \
                        WHERE tid > (SELECT max_doc_id FROM sph_counter WHERE counter_id = 1)
 }
 
 source posts: shared {
     sql_query_range  = SELECT MIN(pid),MAX(pid) FROM pre_forum_post
-    sql_query        = SELECT p.pid AS id, p.tid, p.subject, p.message, t.digest, t.displayorder, t.authorid, t.lastpost, t.special \
+    sql_query        = SELECT p.pid AS id,p.tid,t.fid,p.subject,p.message,t.digest,t.displayorder,t.authorid,t.lastpost,t.special \
                        FROM pre_forum_post AS p LEFT JOIN pre_forum_thread AS t USING(tid) \
                        WHERE pid>=\$start AND pid<=\$end
     sql_query_post_index = REPLACE INTO sph_counter set counter_id = 2, max_doc_id = \$maxid
@@ -54,7 +55,7 @@ source posts: shared {
 
 source posts_minute : shared
 {
-    sql_query        = SELECT p.pid AS id, p.tid, p.subject, p.message, t.digest, t.displayorder, t.authorid, t.lastpost, t.special \
+    sql_query        = SELECT p.pid AS id,p.tid,t.fid,p.subject,p.message,t.digest,t.displayorder,t.authorid,t.lastpost,t.special \
                        FROM pre_forum_post AS p LEFT JOIN pre_forum_thread AS t USING(tid) \
                        WHERE pid > (SELECT max_doc_id FROM sph_counter WHERE counter_id = 2)
 }