1.1 --- a/s4-blog.sh	Mon Jul 25 22:37:17 2016 +0859
     1.2 +++ b/s4-blog.sh	Tue Jul 26 08:24:56 2016 +0859
     1.3 @@ -196,52 +196,39 @@
     1.4        # echo r=$mrid fn=$fn
     1.5        case "$fn" in
     1.6  	*.[Pp][Nn][Gg]|*.[Jj][Pp][Gg]|*.[Jj][Pp][Ee][Gg]|*.[Gg][Ii][Ff])
     1.7 -	  #  fmt=${fn##*.}	# jpg:- is slow...why
     1.8 +	  #  fmt=${fn##*.}	# convert - jpg:- is slow...why
     1.9  	  case "$fn" in
    1.10  	    *.[Pp][Nn][Gg])	fmt=png ;;
    1.11  	    *.[Gg][Ii][Ff])	fmt=gif ;;
    1.12  	    *)		fmt=jpeg ;;
    1.13  	  esac
    1.14 -	  if false; then	# This block should be removed
    1.15 -	  sq $db "SELECT hex(bin) FROM article_m WHERE rowid=$mrid" \
    1.16 -	      | unhexize \
    1.17 -	      | convert -define ${fmt}:size=100x100 -resize 100x100'>' - ${fmt}:- \
    1.18 -	      | hexize \
    1.19 -	      | sed -e 's/\(..\)/%\1/g' \
    1.20 -	    	    -e "s|^|<a href=\"$catlink+$mrid\"><img src=\"data:image/$fmt,|" \
    1.21 -		    -e "s|\$|\">$fnb</a>|"
    1.22 -	  else
    1.23 -	    outfile=$td/$mrid-${fn%.*}.$fmt
    1.24 -	    #err fn=$fn outfile=$outfile
    1.25 -	    #err "`ls -Fa $td`"
    1.26 -	    #rm -f $outfile
    1.27 -	    # mkfifo $outfile
    1.28 -	    #err "usecache=$usecache `ls -l $outfile`" 
    1.29 -	    #err tm=$tm
    1.30 -	    #err tsfile=$tsfile=`cat $tsfile`
    1.31 -	    if [ -s $outfile ] &&	# $outfile should be > 0
    1.32 -		   { [ "$usecache" ] ||	# And usecache flag is true, or...
    1.33 -			 { [ -s "$tsfile" ] && [ x"`cat $tsfile`" = x"$tm" ]
    1.34 -			 };}; then
    1.35 -	      # err Set usecache=1
    1.36 -	      usecache=1		# Set usecache flag on
    1.37 -	      cat<<-EOF
    1.38 +	  outfile=$td/$mrid-${fn%.*}.$fmt
    1.39 +	  #err fn=$fn outfile=$outfile
    1.40 +	  #err "usecache=$usecache `ls -l $outfile`" 
    1.41 +	  #err tm=$tm
    1.42 +	  #err tsfile=$tsfile=`cat $tsfile`
    1.43 +	  if [ -s $outfile ] &&	# $outfile should be > 0
    1.44 +		 { [ "$usecache" ] ||	# And usecache flag is true, or...
    1.45 +		       { [ -s "$tsfile" ] && [ x"`cat $tsfile`" = x"$tm" ]
    1.46 +		       };}; then
    1.47 +	    # err Set usecache=1
    1.48 +	    usecache=1		# Set usecache flag on
    1.49 +	    cat<<-EOF
    1.50  		<a href="$catlink+$mrid"><img src="$outfile">
    1.51  		$fnb</a>
    1.52  		EOF
    1.53 -	    else
    1.54 -	      query "SELECT hex(bin) FROM article_m WHERE rowid=$mrid;" \
    1.55 -		  | unhexize \
    1.56 -		  | convert -define ${fmt}:size=100x100 -resize 100x100'>' \
    1.57 -			    - ${fmt}:- \
    1.58 -		  | tee "$outfile" \
    1.59 -		  | hexize \
    1.60 -		  | sed -e 's/\(..\)/%\1/g' \
    1.61 -	    		-e "s|^|<a href=\"$catlink+$mrid\"><img src=\"data:image/$fmt,|" \
    1.62 -			-e "s|\$|\">$fnb</a>|"
    1.63 -	      [ -d $td ] || mkdir -p "$td"
    1.64 -	      echo $tm > $tsfile
    1.65 -	    fi
    1.66 +	  else
    1.67 +	    query "SELECT hex(bin) FROM article_m WHERE rowid=$mrid;" \
    1.68 +		| unhexize \
    1.69 +		| convert -define ${fmt}:size=100x100 -resize 100x100'>' \
    1.70 +			  - ${fmt}:- \
    1.71 +		| tee "$outfile" \
    1.72 +		| hexize \
    1.73 +		| sed -e 's/\(..\)/%\1/g' \
    1.74 +	    	      -e "s|^|<a href=\"$catlink+$mrid\"><img src=\"data:image/$fmt,|" \
    1.75 +		      -e "s|\$|\">$fnb</a>|"
    1.76 +	    [ -d $td ] || mkdir -p "$td"
    1.77 +	    echo $tm > $tsfile
    1.78  	  fi
    1.79  	  ;;
    1.80  	*)
    1.81 @@ -271,6 +258,7 @@
    1.82    $iswritable && cat<<-EOF
    1.83  	<div class="blogcomment">
    1.84  	<input type="hidden" name="blogid" value="$id">
    1.85 +	<input type="hidden" name="id" value="`genserial`">
    1.86  	<input type="hidden" name="stage" value="replyblog">
    1.87  	$textform
    1.88  	</div>

     2.1 --- a/s4-funcs.sh	Mon Jul 25 22:37:17 2016 +0859
     2.2 +++ b/s4-funcs.sh	Tue Jul 26 08:24:56 2016 +0859
     2.3 @@ -953,6 +953,9 @@
     2.4    # $1=columns (default: 10)
     2.5    dd if=/dev/urandom count=1 2>/dev/null|nkf -MB|fold -w${1:-10}|sed -n 10p
     2.6  }
     2.7 +genserial() {
     2.8 +  echo $((($(date +%s)-1433084400)/10))c$$
     2.9 +}
    2.10  smail() {
    2.11    # smail rcpts subj (file)
    2.12    # $SMAIL_TO <- Recipient value of To: header
    2.13 @@ -3069,7 +3072,7 @@
    2.14  	;;
    2.15        [Ss][Ee][Rr][Ii][Aa][Ll]|[Ss][Tt][Aa][Mm][Pp])
    2.16  	if [ -z "$rowid" ]; then
    2.17 -	  val=$((($(date +%s)-1433084400)/10))c$$
    2.18 +	  val=`genserial`
    2.19  	fi
    2.20  	form="<input type=\"hidden\" name=\"$name\" value=\"$val\">"
    2.21  	prompt="" ;;