s4

changeset 336:08165f6b7828

Searching into file names cause JOIN failure,... disabled.
author HIROSE Yuuji <yuuji@gentei.org>
date Sat, 22 Oct 2016 00:39:53 +0859
parents a120ba2d719b
children 48d0b6c4de65
files s4-blog.sh
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/s4-blog.sh	Sat Oct 22 00:15:09 2016 +0859
     1.2 +++ b/s4-blog.sh	Sat Oct 22 00:39:53 2016 +0859
     1.3 @@ -521,19 +521,20 @@
     1.4  	    (SELECT a.id,
     1.5  		    a.blogid,
     1.6  		    s.ctime,
     1.7 -		    s.text || ' ' || m.filenames content
     1.8 +		    s.text /* || ' ' || m.filenames */ content
     1.9  	     FROM article a
    1.10  	       JOIN
    1.11  	          (SELECT id,  /* Create [id, ctime, text] from article_s */
    1.12  		          max(CASE key WHEN 'ctime' THEN val END) ctime,
    1.13  		     	  max(CASE key WHEN 'text' THEN val END) text
    1.14  	      	   FROM article_s GROUP BY id) s
    1.15 +	       /*
    1.16  	       JOIN
    1.17  	          (SELECT id, group_concat(val) filenames
    1.18  		   FROM article_m
    1.19  		   WHERE type LIKE 'file:%'
    1.20 -	      	   GROUP BY id) m
    1.21 -	       ON a.id=s.id AND a.id=m.id WHERE $kc$kwdgrp) x
    1.22 +	      	   GROUP BY id) m */
    1.23 +	       ON a.id=s.id /* AND a.id=m.id */ WHERE $kc$kwdgrp) x
    1.24  	   ON b.id=x.blogid
    1.25         WHERE b.id IN (SELECT id FROM blog_s $cond)
    1.26         ORDER by DATE DESC, TITLE, x.ctime;"