1.1 --- a/s4-blog.sh	Wed Jul 20 21:14:38 2016 +0859
     1.2 +++ b/s4-blog.sh	Wed Jul 20 21:50:06 2016 +0859
     1.3 @@ -140,45 +140,10 @@
     1.4  
     1.5    lkhome="<a href=\"$myname?home" lke='">'
     1.6    lkedit="<a href=\"$myname?editart"
     1.7 -  if false; then
     1.8 -    sq -html $db<<EOF |
     1.9 -WITH a_s AS (
    1.10 -  SELECT id,
    1.11 -         max(CASE key WHEN 'ctime' THEN val END) TIME,
    1.12 -         max(CASE key WHEN 'text' THEN val END) TEXT
    1.13 -  FROM article_s
    1.14 -  GROUP by id
    1.15 -)
    1.16 -SELECT	'id:'||a.id,
    1.17 -	CASE author
    1.18 -	WHEN '$user' THEN 'ed:'||a.rowid||':'||$rowid
    1.19 -	ELSE 'e0:'
    1.20 -	END edit,
    1.21 -	'at:'||(SELECT rowid FROM user WHERE name=author)||':'
    1.22 -	     ||coalesce((SELECT val FROM user_s
    1.23 -			 WHERE name=author AND key='gecos'),
    1.24 -			author),
    1.25 -	'ti:'||s.TIME,
    1.26 -	'te:'||s.TEXT,
    1.27 -	'im:'||(SELECT group_concat(hex(bin)
    1.28 -FROM (select rowid,id,author from article where blogid in
    1.29 -     (select id from blog where rowid=$rowid)) a
    1.30 -  LEFT JOIN
    1.31 -     a_s s
    1.32 -  ON a.id=s.id;
    1.33 -EOF
    1.34 -  sed -e "s|^<TR><TD>id:\(.*\)</TD>|<TR id=\"\1\"><TD>|" \
    1.35 -      -e "/^<TR/N" -e 's/\n//' \
    1.36 -      -e "s|<TD>ed:\([0-9]*\):\(.*\)</TD>|$lkedit+\1+\2${lke}編集</a>|" \
    1.37 -      -e "s|<TD>e0:</TD>||" \
    1.38 -      -e "s|^<TD>at:\([0-9]*\):\(.*\)</TD>|$lkhome+\1$lke\2</a>|" \
    1.39 -      -e "s|^<TD>ti:\(.*\)</TD>|\1</TD>|" \
    1.40 -      -e "s|^<TD>te:\(.*\)|<TD>\1|"
    1.41 -  else
    1.42 -    hlink="$myname?home" elink="$myname?editart"
    1.43 -    catlink="$myname?showattc+article_m"
    1.44 -    deficon="img/file-icon.png"
    1.45 -    sq $db<<EOF |
    1.46 +  hlink="$myname?home" elink="$myname?editart"
    1.47 +  catlink="$myname?showattc+article_m"
    1.48 +  deficon="img/file-icon.png"
    1.49 +  sq $db<<EOF |
    1.50  WITH a_s AS (
    1.51    SELECT id,
    1.52           max(CASE key WHEN 'ctime' THEN val END) TIME,
    1.53 @@ -212,46 +177,45 @@
    1.54       a_s s
    1.55    ON a.id=s.id;
    1.56  EOF
    1.57 -    while IFS='|' read id edit notify uid uname aid tm hte imgids; do
    1.58 -      nt="<label style=\"font-size: 70%;\"><input type=\"checkbox\"
    1.59 +  while IFS='|' read id edit notify uid uname aid tm hte imgids; do
    1.60 +    nt="<label style=\"font-size: 70%;\"><input type=\"checkbox\"
    1.61  	 name=\"notifyto\" value=\"$uid\">返信通知送信</label>"
    1.62 -      cat<<EOF |
    1.63 +    cat<<EOF |
    1.64  <tr id="$id">
    1.65  <td>${edit:+<a href="$elink+$edit">編集</a> }#$aid
    1.66  <a href="$hlink+$uid">$uname</a>
    1.67  $tm
    1.68  ${notify:+$nt}</td><td>`echo "$hte"|unhexize|htmlescape`
    1.69  EOF
    1.70 -      hreflink
    1.71 -      for i in $imgids; do
    1.72 -	mrid=${i%%:*}; i=${i#*:}; sz=`size_h ${i%%:*}`
    1.73 -	fn=`echo "${i#*:}"|unhexize`
    1.74 -	fnb=$fn"(${sz})"
    1.75 -	# echo r=$mrid fn=$fn
    1.76 -	case "$fn" in
    1.77 -	  *.[Pp][Nn][Gg]|*.[Jj][Pp][Gg]|*.[Jj][Pp][Ee][Gg]|*.[Gg][Ii][Ff])
    1.78 -	    #  fmt=${fn##*.}	# jpg:- is slow...why
    1.79 -	    case "$fn" in
    1.80 -	      *.[Pp][Nn][Gg])	fmt=png ;;
    1.81 -	      *.[Gg][Ii][Ff])	fmt=gif ;;
    1.82 -	      *)		fmt=jpeg ;;
    1.83 -	    esac
    1.84 -	    sq $db "SELECT hex(bin) FROM article_m WHERE rowid=$mrid" \
    1.85 -		| unhexize \
    1.86 -		| convert -define ${fmt}:size=100x100 -resize 100x100'>' - ${fmt}:- \
    1.87 -		| hexize \
    1.88 -		| sed -e 's/\(..\)/%\1/g' \
    1.89 -	    	      -e "s|^|<a href=\"$catlink+$mrid\"><img src=\"data:image/$fmt,|" \
    1.90 -		      -e "s|\$|\">$fnb</a>|"
    1.91 -	    ;;
    1.92 -	  *)
    1.93 -	    echo "<a href=\"$catlink+$mrid\"><img src=\"$deficon\">$fnb</a>"
    1.94 -	    ;;
    1.95 -	esac
    1.96 -      done
    1.97 -      echo "</td></tr>"
    1.98 +    hreflink
    1.99 +    for i in $imgids; do
   1.100 +      mrid=${i%%:*}; i=${i#*:}; sz=`size_h ${i%%:*}`
   1.101 +      fn=`echo "${i#*:}"|unhexize`
   1.102 +      fnb=$fn"(${sz})"
   1.103 +      # echo r=$mrid fn=$fn
   1.104 +      case "$fn" in
   1.105 +	*.[Pp][Nn][Gg]|*.[Jj][Pp][Gg]|*.[Jj][Pp][Ee][Gg]|*.[Gg][Ii][Ff])
   1.106 +	  #  fmt=${fn##*.}	# jpg:- is slow...why
   1.107 +	  case "$fn" in
   1.108 +	    *.[Pp][Nn][Gg])	fmt=png ;;
   1.109 +	    *.[Gg][Ii][Ff])	fmt=gif ;;
   1.110 +	    *)		fmt=jpeg ;;
   1.111 +	  esac
   1.112 +	  sq $db "SELECT hex(bin) FROM article_m WHERE rowid=$mrid" \
   1.113 +	      | unhexize \
   1.114 +	      | convert -define ${fmt}:size=100x100 -resize 100x100'>' - ${fmt}:- \
   1.115 +	      | hexize \
   1.116 +	      | sed -e 's/\(..\)/%\1/g' \
   1.117 +	    	    -e "s|^|<a href=\"$catlink+$mrid\"><img src=\"data:image/$fmt,|" \
   1.118 +		    -e "s|\$|\">$fnb</a>|"
   1.119 +	  ;;
   1.120 +	*)
   1.121 +	  echo "<a href=\"$catlink+$mrid\"><img src=\"$deficon\">$fnb</a>"
   1.122 +	  ;;
   1.123 +      esac
   1.124      done
   1.125 -  fi
   1.126 +    echo "</td></tr>"
   1.127 +  done
   1.128  
   1.129    textform='<div class="fold">
   1.130  <input type="checkbox" id="cmt" checked><label for="cmt"