From 4991bfa10734216de4f5df34ae3e1079ac4d971e Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Fri, 20 Jun 2014 20:00:27 +0200 Subject: [PATCH 1/3] nicer table --- index | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/index b/index index bd28bfa..56209b0 100755 --- a/index +++ b/index @@ -148,12 +148,12 @@ then
- - - - - - + + + + + + @@ -242,23 +242,23 @@ then EOHTML for level in {1..16} do - echo "" + echo "" if (( last["AP"] >= lvl[level] )) then - echo '' else readable=$(printf "%'li" ${lvl[level]}) - echo '" fi if (( silvercount >= lvlsilver[level] )) then - echo '' + echo '' else - echo "' + echo '' else - echo "' + echo '' else - echo "' + echo '' else - echo "
LevelAPSilverGoldPlatinumBlackLevelAPSilverGoldPlatinumBlack
 
$level
$level' + echo '' printf "%'li" ${lvl[level]} echo ''"${readable// / }" + echo ''"${readable// / }" readable=$(printf "%'li" $(( last["AP"] - lvl[level] ))) echo "
(${readable// / })		'${lvlsilver[level]}''${lvlsilver[level]}'${lvlsilver[level]} ($(( silvercount - lvlsilver[level] )))
" + echo "		${lvlsilver[level]} ($(( silvercount - lvlsilver[level] )))
" for id in {100..0} do [ -z "${upsilver[id]}" ] && continue @@ -285,9 +285,9 @@ then fi if (( goldcount >= lvlgold[level] )) then - echo '		'${lvlgold[level]}''${lvlgold[level]}'${lvlgold[level]} ($(( goldcount - lvlgold[level] )))
" + echo "		${lvlgold[level]} ($(( goldcount - lvlgold[level] )))
" for id in {100..0} do [ -z "${upgold[id]}" ] && continue @@ -314,9 +314,9 @@ then fi if (( platinumcount >= lvlplatinum[level] )) then - echo '		'${lvlplatinum[level]}''${lvlplatinum[level]}'${lvlplatinum[level]} ($(( platinumcount - lvlplatinum[level] )))
" + echo "		${lvlplatinum[level]} ($(( platinumcount - lvlplatinum[level] )))
" for id in {100..0} do [ -z "${upplatinum[id]}" ] && continue @@ -343,9 +343,9 @@ then fi if (( blackcount >= lvlblack[level] )) then - echo '		'${lvlblack[level]}''${lvlblack[level]}'${lvlblack[level]} ($(( blackcount - lvlblack[level] )))
" + echo "		${lvlblack[level]} ($(( blackcount - lvlblack[level] )))
" for id in {100..0} do [ -z "${upblack[id]}" ] && continue From 9bf4e00e160da8d1bd5bd9963242436e9988bd07 Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Fri, 20 Jun 2014 20:28:56 +0200 Subject: [PATCH 2/3] Create RRD --- add | 2 +- add.html | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- index | 11 +++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/add b/add index 2c18498..a7ba04e 100755 --- a/add +++ b/add @@ -18,7 +18,7 @@ . settings -if [[ $REQUEST_METHOD != POST ]] +if [[ $REQUEST_METHOD != POST ]] || [ ! -w "$rrdfile" ] then cat <<-EOHead Content-type: text/plain diff --git a/add.html b/add.html index 785d35f..d016699 100755 --- a/add.html +++ b/add.html @@ -80,8 +80,55 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z') 		Add data
-
-
    +EOHTML +if ! [ -w "$rrdfile" ] +then + rrdtool create ingress.rrd -s $((60*60)) \ + DS:AP:GAUGE:$((2*24*60*60)):0:NaN \ + DS:Explorer:GAUGE:$((48*60*60)):0:NaN \ + DS:Seer:GAUGE:$((48*60*60)):0:NaN \ + DS:XM:GAUGE:$((48*60*60)):0:NaN \ + DS:Hacker:GAUGE:$((48*60*60)):0:NaN \ + DS:Builder:GAUGE:$((48*60*60)):0:NaN \ + DS:Connector:GAUGE:$((48*60*60)):0:NaN \ + DS:Mind_Controller:GAUGE:$((48*60*60)):0:NaN \ + DS:MU:GAUGE:$((48*60*60)):0:NaN \ + DS:Longest_Link:GAUGE:$((48*60*60)):0:NaN \ + DS:Largest_Field:GAUGE:$((48*60*60)):0:NaN \ + DS:Recharger:GAUGE:$((48*60*60)):0:NaN \ + DS:Liberator:GAUGE:$((48*60*60)):0:NaN \ + DS:Pioneer:GAUGE:$((48*60*60)):0:NaN \ + DS:Purifier:GAUGE:$((48*60*60)):0:NaN \ + DS:Neutralized:GAUGE:$((48*60*60)):0:NaN \ + DS:Links_Destroyed:GAUGE:$((48*60*60)):0:NaN \ + DS:Fields_Destroyed:GAUGE:$((48*60*60)):0:NaN \ + DS:Walked:GAUGE:$((48*60*60)):0:NaN \ + DS:Guardian:GAUGE:$((48*60*60)):0:NaN \ + DS:Link_Maintained:GAUGE:$((48*60*60)):0:NaN \ + DS:Link_Length_x_Days:GAUGE:$((48*60*60)):0:NaN \ + DS:Field_Held:GAUGE:$((48*60*60)):0:NaN \ + DS:Field_x_Days:GAUGE:$((48*60*60)):0:NaN \ + RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \ + RRA:AVERAGE:99e-2:1:$((24*15)) \ + RRA:MAX:99e-2:1:$((24*15)) \ + RRA:AVERAGE:99e-2:4:$((24*180)) \ + RRA:MAX:99e-2:4:$((24*180)) \ + RRA:AVERAGE:99e-2:24:$(((4*365)+1)) \ + RRA:MAX:99e-2:24:$(((4*365)+1)) \ + RRA:AVERAGE:99e-2:$((24*30)):$(((32*365)+8)) \ + RRA:MAX:99e-2:$((24*30)):$(((32*365)+8)) \ + || { + cat <<-EOHTML +

    Cannot create $rrdfile

    + + + EOHTML + exit + } +fi +cat <<-EOHTML + +
      EOHTML for indice in ${!uinames[@]} diff --git a/index b/index index 56209b0..7465807 100755 --- a/index +++ b/index @@ -17,6 +17,17 @@ # along with this program. If not, see . . settings +if [ ! -w "$rrdfile" ] +then + cat <<-EOHead + Content-type: text/plain + Last-Modified: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z') + Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z') + refresh: 0,url=/cgi/$webuser/add.html + + EOHead + exit +fi if [ -n "$QUERY_STRING" ] then From f6e2ae750bdfc9c529c7fc1b846fa092a2ab4601 Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Fri, 20 Jun 2014 20:29:49 +0200 Subject: [PATCH 3/3] Ignore ingress.rrd --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..be2a4a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +ingress.rrd