Mercurial > hg > lukkari
comparison update.sh @ 97:acb600abc0c7
Few minor improvements.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 22 Dec 2012 14:57:14 +0200 |
parents | c553ad61e9c2 |
children | 891bd3c93f96 |
comparison
equal
deleted
inserted
replaced
96:0ba79f50e604 | 97:acb600abc0c7 |
---|---|
27 echo -n "* Fetched classfile $CLASSFILE: " | 27 echo -n "* Fetched classfile $CLASSFILE: " |
28 cat "$CLASSFILE" | wc -l | 28 cat "$CLASSFILE" | wc -l |
29 fi | 29 fi |
30 | 30 |
31 if test -e "$CLASSFILE"; then | 31 if test -e "$CLASSFILE"; then |
32 echo "* Processing $CLASSFILE ..." | |
32 cat "$CLASSFILE" | while read i; do | 33 cat "$CLASSFILE" | while read i; do |
33 parse=no | 34 parse=no |
34 INFILE="${CACHEDIR}${i}.html" | 35 INFILE="${CACHEDIR}${i}.html" |
35 ONFILE="${OLDCACHEDIR}${i}.html" | 36 ONFILE="${OLDCACHEDIR}${i}.html" |
36 DATAFILE="${i}.data" | 37 DATAFILE="${i}.data" |
65 if test "x$parse" = "xyes" -a -e "$INFILE"; then | 66 if test "x$parse" = "xyes" -a -e "$INFILE"; then |
66 if test -e "${CACHEDIR}${DATAFILE}"; then | 67 if test -e "${CACHEDIR}${DATAFILE}"; then |
67 mv "${CACHEDIR}${DATAFILE}" "${OLDCACHEDIR}${DATAFILE}" | 68 mv "${CACHEDIR}${DATAFILE}" "${OLDCACHEDIR}${DATAFILE}" |
68 fi | 69 fi |
69 echo "Parsing $i" | 70 echo "Parsing $i" |
70 perl parsedata.pl -php "$INFILE" -o "${CACHEDIR}${DATAFILE}" | 71 perl parsedata.pl -php "$INFILE" -o "${CACHEDIR}${DATAFILE}" && \ |
71 perl parsedata.pl -xml "$INFILE" -o "${CACHEDIR}${i}.xml" | 72 perl parsedata.pl -xml "$INFILE" -o "${CACHEDIR}${i}.xml" |
72 fi | 73 fi |
73 done | 74 done |
74 fi | 75 fi |
75 } | 76 } |
80 CACHEDIR="cache/" | 81 CACHEDIR="cache/" |
81 parse "http://www.oamk.fi/tyojarjestykset/otek/luokat/" "classes.txt" "OR_" | 82 parse "http://www.oamk.fi/tyojarjestykset/otek/luokat/" "classes.txt" "OR_" |
82 #parse "http://www.oamk.fi/~heikkim/riihi2/Oppilaat/" "classes.txt" "Ryh._" | 83 #parse "http://www.oamk.fi/~heikkim/riihi2/Oppilaat/" "classes.txt" "Ryh._" |
83 | 84 |
84 CACHEDIR="cache-next/" | 85 CACHEDIR="cache-next/" |
85 parse "http://www.oamk.fi/~heikkim/riihi2/Oppilaat/" "classes_next.txt" "Ryh._" | 86 parse "http://www.oamk.fi/~heikkim/riihi3/Luokat/" "classes_next.txt" "Ryh._" |