X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=examples%2Fshared-demo.pl.in;h=f01c1ae1c886adf294515ef546141471cb8eb08d;hp=61df205225161e37a7766a6095abe69e33ccc491;hb=264a94560ae83c638e05b0b93b85fd6285b07dac;hpb=0fe03275068c0e55d01a7cc2308fa12fdee569cf

diff --git a/examples/shared-demo.pl.in b/examples/shared-demo.pl.in
index 61df205..f01c1ae 100755
--- a/examples/shared-demo.pl.in
+++ b/examples/shared-demo.pl.in
@@ -14,11 +14,8 @@ sub ok
     print "ok $ok_count $what\n";
 }
 
-#makes things work when run without install
-use lib qw( ../bindings/perl-shared/blib/lib ../bindings/perl-shared/blib/arch );
-
 #makes programm work AFTER install
-use lib qw( @prefix@/lib/perl ../lib/perl );
+use lib qw( @prefix@/lib/perl );
 
 use strict;
 use vars qw(@ISA $loaded);
@@ -91,7 +88,7 @@ my $counter = 1e7;
 for (my $t=$START+1;
      $t<$START+$STEP*$RUNS;
      $t+=$STEP+int((rand()-0.5)*7)){
-  $counter += 2500*sin($t/2000)*$STEP;
+  $counter += int(2500*sin($t/2000)*$STEP);
   my $data = (1000+500*sin($t/1000)).":".
       (1000+900*sin($t/2330)).":".
       (2000*cos($t/1550)).":".
@@ -145,7 +142,7 @@ for (my $i=0;$i<$GRUNS;$i++) {
           "VRULE:".($now-7200)."#008877:120 Minutes ago";
 
     if ($ERROR = RRDs::error) {
-      print "ERROR: $ERROR\n";
+      die "ERROR: $ERROR\n";
     } else {
       print "Image Size: ${xs}x${ys}\n";
       print "Graph Return:\n",(join "\n", @$graphret),"\n\n";
@@ -157,7 +154,7 @@ for (my $i=0;$i<$GRUNS;$i++) {
 
 my ($start,$step,$names,$array) = RRDs::fetch $RRD1, "AVERAGE";
 $ERROR = RRDs::error;
-print "ERROR: $ERROR\n" if $ERROR ;
+die "ERROR: $ERROR\n" if $ERROR ;
 print "start=$start, step=$step\n";
 print "                    "; 
 map {printf("%12s",$_)} @$names ;
@@ -173,3 +170,46 @@ foreach my $line (@$array){
 
 
 
+my ($start,$end,$step,$col_cnt,$legend,$data) = 
+  RRDs::xport ("-m", 400,
+	       "--start", "now-1day",
+	       "--end", "now",
+	       "DEF:alpha=$RRD1:a:AVERAGE",
+	       "DEF:beta=$RRD1:d:AVERAGE",
+	       "CDEF:calc=alpha,beta,+,2,/,100,*,102,/",
+	       "XPORT:alpha:original ds",
+	       "XPORT:calc:calculated values",
+	       );
+
+my $ERROR = RRDs::error;
+die "$0: unable to xport: $ERROR\n" if $ERROR;
+
+print "\nrrdxport test:\n\n";
+print "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n\n";
+print "<xport>\n";
+print "  <meta>\n";
+print "    <start>$start</start>\n";
+print "    <step>$step</step>\n";
+print "    <end>$end</end>\n";
+print "    <rows>", $#$data + 1, "</rows>\n";
+print "    <columns>$col_cnt</columns>\n";
+print "    <legend>\n";
+foreach my $entry (@$legend) {
+    print "      <entry>$entry</entry>\n";
+}
+print "    </legend>\n";
+print "  </meta>\n";
+print "  <data>\n";
+my $row_counter = 0;
+foreach my $row (@$data) {
+    $row_counter++;
+    print "    <row id=\"$row_counter\"><t is=\"", scalar localtime($start), "\">$start</t>";
+    $start += $step;
+    foreach my $val (@$row) {
+	printf ("<v>%1.10e</v>",$val) if $val ne '';
+	print "<v>NaN</v>" if  $val eq '';
+    }
+    print "</row>\n";
+}
+print "  </data>\n";
+print "</xport>\n";