s4
changeset 905:5acef432b1de
TD-class delimiter changed to :::
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Sun, 03 Jan 2021 14:44:56 +0900 |
| parents | 0352ff0fb37f |
| children | 9f237a8f550d |
| files | s4-funcs.sh |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Sun Jan 03 13:37:20 2021 +0900 1.2 +++ b/s4-funcs.sh Sun Jan 03 14:44:56 2021 +0900 1.3 @@ -86,6 +86,7 @@ 1.4 " 1.5 likeesc=`printf '\037'` # ESCAPE char of LIKE operator 1.6 iconcachekey="profimgcache_S" 1.7 +asdelim=":::" # delimiter of dumptable td-class specifier 1.8 1.9 # Start debug logging 1.10 logtag="($$)${S4WORLD:+{$S4WORLD\}}" 1.11 @@ -3728,9 +3729,9 @@ 1.12 done 1.13 } 1.14 dt_colhack() { 1.15 - # FROM: <TD>xxx:yyy</TD> 1.16 + # FROM: <TD>xxx:::yyy</TD> 1.17 # TO: <TD class="xxx">yyy</TD> 1.18 - sed -Ee 's,<TD>([^:<"]+):([^<]*)(</TD>|$),<TD class="\1">\2\3,g' 1.19 + sed -Ee 's,<TD>([^:<"]+)'$asdelim'([^<]*)(</TD>|$),<TD class="\1">\2\3,g' 1.20 } 1.21 dt_rowhack() { 1.22 # From: <TR> 1.23 @@ -3859,9 +3860,9 @@ 1.24 esac 1.25 ss=`printf "$substr" "$valvar"` 1.26 if [ x"$fromtbl" = x"b" ]; then 1.27 - eav=$eav${eav:+,}" \"$as:\"||coalesce(max(case key when '$col' then $ss end), '') as $as" 1.28 + eav=$eav${eav:+,}" \"$as$asdelim\"||coalesce(max(case key when '$col' then $ss end), '') as $as" 1.29 else 1.30 - eav=$eav${eav:+,}" \"$as:\"||$ss as $as" 1.31 + eav=$eav${eav:+,}" \"$as$asdelim\"||$ss as $as" 1.32 fi 1.33 scols="$scols${scols:+, }${fromtbl}.$as" 1.34 done