q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move .txt handling belog site-wide .tpl's which was allowing the .txt sitemaps to shadow the html version

Browse source
This commit is contained in:
Uriel 2008-07-05 04:55:56 +02:00
parent 9c749537ed
commit c950f91181
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bin/controller.rc
View file

@ -102,13 +102,6 @@ fn genbody {
} }
if not if (test -f $body.tpl) if not if (test -f $body.tpl)
template.awk $body.tpl | rc $rcargs template.awk $body.tpl | rc $rcargs
if not if (test -f $body.txt) {
echo '<pre>'
# XXX Insering a blank line between lines in input is good for fortunes.txt, but probably not for other .txt files
# XXX Words are not broken, even if they are way beyond 82 chars long
cat $body.txt |sed 's/$/\n/g; s/</\&gt;/g; s/>/\&lt;/g' |fmt -l 82 -j
echo '</pre>'
}
if not if (test -f $body.html) if not if (test -f $body.html)
cat $body.html | /bin/sed '0,/<[Bb][Oo][Dd][Yy][^>]*>/d; /<\/[Bb][Oo][Dd][Yy]>/,$d' cat $body.html | /bin/sed '0,/<[Bb][Oo][Dd][Yy][^>]*>/d; /<\/[Bb][Oo][Dd][Yy]>/,$d'
if not if (~ $body *.html && test -f $body) if not if (~ $body *.html && test -f $body)
@ -117,6 +110,13 @@ fn genbody {
blogDirs = `{basename -d $body} blogDirs = `{basename -d $body}
if not if (test -f pub/^$reqpath^.tpl) if not if (test -f pub/^$reqpath^.tpl)
template.awk pub/^$reqpath^.tpl | rc $rcargs template.awk pub/^$reqpath^.tpl | rc $rcargs
if not if (test -f $body.txt) {
echo '<pre>'
# XXX Insering a blank line between lines in input is good for fortunes.txt, but probably not for other .txt files
# XXX Words are not broken, even if they are way beyond 82 chars long
cat $body.txt |sed 's/$/\n/g; s/</\&gt;/g; s/>/\&lt;/g' |fmt -l 82 -j
echo '</pre>'
}
if not if(~ $body */index && ~ $#blogDirs 0) { if not if(~ $body */index && ~ $#blogDirs 0) {
echo '<h1 style="text-transform: capitalize;">' `{basename -d $body|sed -e 's,.*//,,g' -e 's,/$,,' -e 's,/, / ,g' } '</h1>' echo '<h1 style="text-transform: capitalize;">' `{basename -d $body|sed -e 's,.*//,,g' -e 's,/$,,' -e 's,/, / ,g' } '</h1>'
echo '<ul style="text-transform: capitalize;">' echo '<ul style="text-transform: capitalize;">'