From d5ead4e4b6493cd7797103f3a7bc6e637cf22b51 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Tue, 17 Aug 2004 04:14:44 +0000 Subject: [PATCH] Add period to names --- bin/away-detect | 28 ++++++++++++++-------------- perl/sctweb | 1 + 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bin/away-detect b/bin/away-detect index 72d83ff..cd0ba17 100755 --- a/bin/away-detect +++ b/bin/away-detect @@ -69,8 +69,8 @@ set_active() { now="$(expr 60 \* $(date +%H) + $(date +%M))" -if today --category='holiday' | ! grep '' >/dev/null; then -today --category='school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \ +if ! today --category='holiday' | grep '' >/dev/null; then +today --category='school' | sed -e s/^..........// -e 's/ \[.*\]$//'|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \ while read times event; do begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))" end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))" @@ -86,18 +86,18 @@ while read times event; do done fi -today --category='!school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \ -while read times event; do - begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))" - end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))" - max_end="$end" - if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then - echo "scheduled=\"$event\"" > "$HOME/.away-smart" - break - elif [ "$old_away" = "$event" -a "$now" -gt "$max_end" ]; then - echo "old_smart=\"$old_away\"" > "$HOME/.away-smart" - fi -done +#today --category='!school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \ +#while read times event; do +# begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))" +# end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))" +# max_end="$end" +# if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then +# echo "scheduled=\"$event\"" > "$HOME/.away-smart" +# break +# elif [ "$old_away" = "$event" -a "$now" -gt "$max_end" ]; then +# echo "old_smart=\"$old_away\"" > "$HOME/.away-smart" +# fi +#done [ -f "$HOME/.away-smart" ] && . "$HOME/.away-smart" old_sched="$scheduled" diff --git a/perl/sctweb b/perl/sctweb index 8c1edef..c32a30f 100755 --- a/perl/sctweb +++ b/perl/sctweb @@ -134,6 +134,7 @@ sub do_html_schedule { $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s; $row->[0] =~ s/
(.*)/"
" . capitalize($1)/eg; $row->[1] = capitalize($row->[1]); + $row->[1] =~ s/([A-Z]r?)$/$1./; $row->[3] =~ s/-/-/g; $row->[5] =~ s/ON CAMPUS
//g; $row->[5] =~ s/
/ /g; -- 2.30.2