From: oetiker Date: Tue, 19 Jun 2007 19:16:11 +0000 (+0000) Subject: sync with reality X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1def796e1734c6646c7e2185fac0ce4efd64cd04;p=rrdtool-all.git sync with reality git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1136 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/website/bin/pod2wml.sh b/website/bin/pod2wml.sh index 74bcc2cb..a122b530 100755 --- a/website/bin/pod2wml.sh +++ b/website/bin/pod2wml.sh @@ -2,16 +2,19 @@ pod2wml (){ base=$1 [ -z "$descr" ] && descr=$base [ -z "$menu" ] && menu=$descr - pod2html --infile=$base.pod --outfile=$base.pre --noindex --htmlroot='$(ROOT)' --podroot=$SITEROOT --podpath=$PODPATH - $SITEROOT/bin/fix-pod2html.pl $base.pre | $SITEROOT/bin/fix-hrefs.pl >$base.html + perl-5.8.8 -I/home/oetiker/checkouts/mrtg/trunk/web/bin/lib -MPod::Simple::HTML -e Pod::Simple::HTML::go $base.pod $base.html +#Thing.pod Thing.html +# pod2html-5.8.8 --infile=$base.pod --outfile=$base.pre --noindex --htmlroot='$(ROOT)' --podroot=$SITEROOT --podpath=$PODPATH +# $SITEROOT/bin/fix-pod2html.pl $base.pre | $SITEROOT/bin/fix-hrefs.pl >$base.html echo "" >>navbar.inc printf "
" >>index.inc - grep $base $base.pod |fgrep ' - '|head -1|sed 's| - |
|' >>index.inc + grep -i $base $base.pod |fgrep ' - '|head -1|sed 's| - |
|' >>index.inc echo "
" >>index.inc echo " $base.wml - perl -0777 -n -e 's|E|<|g;s|E|>|g;m|=head1 AUTHO\S+\s*(.+)| && do {$a=$1;$e="no\@address.nowhere";$a=~ s/\s*<(.+?)>\s*,?// and $e=$1; $e=~ s/\s\S+\s/\@/;print "author=\"$a <$e>\"/>\n"}' $base.pod >>$base.wml + perl-5.8.8 -0777 -n -e 's|E|<|g;s|E|>|g;m|=head1 AUTHO\S+\s*(.+)| && do {$a=$1;$a =~ s/>.*/>/; $e="no\@address.nowhere";$a=~ s/\s*<(.+?)>\s*,?// and $e=$1; $e=~ s/\s\S+\s/\@/;print "author=\"$a <$e>\"/>\n"}' $base.pod >>$base.wml # perl -0777 -n -e 's|.*?(.*|$1|s;for($i=5;$i>0;$i--){$j=$i-1;s|(|$1$i>|g}; s|

NAME

.*?

(.+?) - .*?

|

$1

|s;s|

\s*

||g;s|||g;s|\s*
|\n|g;s|\s*||g;s|\s*
||g;print ' $base.html >>$base.wml
- perl -0777 -n -e '
+true <<'XXXX'
+ perl-5.8.8 -0777 -n -e '
   s|.*?(.*|$1|s;
   for($i=5;$i>0;$i--){
          $j=$i-1;
@@ -19,20 +22,39 @@ pod2wml (){
   };
   s|.*?NAME.*?.*?\s*(.+?)\s*- .*?
|
$1
|s;
   s{
  • (.+?)(?=
  • ||)}{
  • $1
    • }sg;
+  s|
    \s*(.*?)\s*
    |
    $1
    \n
    |sg;
+  s|
    \s*
    \s*(.*?)\s*
    \s*
    |
    $1
    |sg;
+  s|
  • \s*
    ([^<]+?)
    \s*
    • |
  • $1
    • |sg;
   s|
    \s*
    |\n|g;
   s|\n\s|\n|g;
   s|\s*
    \s*
    \s*|\n\n|g;
   s|(\S)
    |$1\n|g; s|
    (.+?)
    |
    $1
    |gs; - s|\s*(.+?)\s*
    \s+|$1\n|g; - s|
    \s*

    |

    |g; +# s|\s*(.+?)\s*
    \s+|$1\n|g; + s|
    \s*()|$1|g; s|
    \s*
    ||gs; s|)\s*(\S)(.+?)\s*(

    )|$1$2\L$3\E$4|g; print ' $base.html >>$base.wml # rm $base.html - perl -i~ -0777 -p -e 's|\s*\s*
    |
    |sg' $base.wml - rm $base.html $base.pre + perl-5.8.8 -i~ -0777 -p -e 's|
    \s*\s*
    |
    |sg' $base.wml +XXXX + perl-5.8.8 -0777 -n -e ' + s|

    \s*
    |

    \n
    |sg; + s|\s*
    |\n
    |sg; + s|
    (.+?)
    |
    $1
    |gs; + s|.*?(.*|$1|s; + for($i=5;$i>0;$i--){ + $j=$i-1; + s|(|$1$i>|g + }; + s|.*?NAME.*?.*?\s*(.+?)\s*- .*?

    |

    $1

    |s; + + print + ' $base.html >>$base.wml +# rm $base.html + rm $base.html +# $base.pre descr="" } diff --git a/website/gallery/index.wml b/website/gallery/index.wml index 9c72936c..66ac5865 100644 --- a/website/gallery/index.wml +++ b/website/gallery/index.wml @@ -9,6 +9,7 @@ #include "stream-pop.xml" #include "n20e-daily.xml" #include "ups_voltage_month.xml" +#include "temp-poprs.xml" #include "docsis_upstream_utilization.xml" #include "andrey.xml" #include "rrdtool-xmas.xml" diff --git a/website/gallery/temp-poprs.png b/website/gallery/temp-poprs.png new file mode 100644 index 00000000..23c6cb52 Binary files /dev/null and b/website/gallery/temp-poprs.png differ diff --git a/website/gallery/temp-poprs.xml b/website/gallery/temp-poprs.xml new file mode 100644 index 00000000..efd381e1 --- /dev/null +++ b/website/gallery/temp-poprs.xml @@ -0,0 +1,16 @@ + + + Temperature + João Marcelo Ceron + This graph shows the temperature of a computer room (indoor) and make a parallel with external +temperature (in Porto Alegre city). + 2007 6 + + + http://www.pop-rs.rnp.br/temperatura + + + + + + diff --git a/website/inc/html.inc b/website/inc/html.inc index afd62657..b289e80b 100644 --- a/website/inc/html.inc +++ b/website/inc/html.inc @@ -12,17 +12,17 @@ $x =~ s/\\n/ /g; print $x; :>:#H1_FLAT#}