Script schedule: slight changes in regexps done.

This commit is contained in:
vonavi 2014-04-20 22:20:46 +03:00
parent ce8e63e5b6
commit 2f61ebe368

View File

@ -127,7 +127,7 @@ get_tour_num() {
get_tour_dates() { get_tour_dates() {
local date_re="[0-9?]{2}\\.[0-9?]{2}\\.[0-9?]{4}" local date_re="[0-9?]{2}\\.[0-9?]{2}\\.[0-9?]{4}"
if [[ "$1" =~ "Время проведения:"' '*($date_re)' '*[-—]' '*($date_re) ]]; then if [[ "$1" =~ "Время проведения:"\ *($date_re)\ *[-—]\ *($date_re) ]]; then
date_beg="${BASH_REMATCH[1]}" date_end="${BASH_REMATCH[2]}" date_beg="${BASH_REMATCH[1]}" date_end="${BASH_REMATCH[2]}"
# Use short dates # Use short dates
date_beg="${date_beg:0:5}" date_end="${date_end:0:5}" date_beg="${date_beg:0:5}" date_end="${date_end:0:5}"
@ -142,7 +142,7 @@ keep_game_info() {
local res_re="(0|1|0\\.5):(0|1|0\\.5)" local res_re="(0|1|0\\.5):(0|1|0\\.5)"
local line="$1" keep=1 local line="$1" keep=1
if [[ "$line" =~ ($date_re)' '*[-—]' '*([^' ']+)' '*($res_re)?' '*([^' ']+) ]]; then if [[ "$line" =~ ($date_re)\ *[-—]\ *([^\ ]+)\ *($res_re)?\ *([^\ ]+) ]]; then
white="${BASH_REMATCH[5]}" white="${BASH_REMATCH[5]}"
black="${BASH_REMATCH[9]}" black="${BASH_REMATCH[9]}"
result="${BASH_REMATCH[6]}" result="${BASH_REMATCH[6]}"