From ec78df4a1d77816b2dc4b016ab421ddef6cae7d2 Mon Sep 17 00:00:00 2001
From: hjp <hjp>
Date: Thu, 6 Sep 2007 07:08:03 +0000
Subject: [PATCH] Added options style and timestamp.

---
 t/2scripts.t |  7 +++++--
 tsplot       | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/t/2scripts.t b/t/2scripts.t
index ba7f342..e334533 100755
--- a/t/2scripts.t
+++ b/t/2scripts.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 11;
+use Test::More tests => 12;
 
 my $ps1=`./blib/script/tsplot --output_format ps t/1.data`;
 ok($ps1, 				'Postscript output of tsplot is not empty');
@@ -27,8 +27,11 @@ ok($ps3 !~ m/\( 0\) Rshow/,	'Postscript output of tsplot doesn\'t contain marker
 ok($ps3 =~ m/\( 1\) Rshow/,	'Postscript output of tsplot contains marker "1"');
 ok($ps3 =~ m/\( 10\) Rshow/,	'Postscript output of tsplot contains marker "10"');
 
+my $ps4=`./blib/script/tsplot --output_format ps --style dots t/1.data`;
+ok($ps4,				'Postscript output of tsplot --style dots is not empty');
+
 my $fh;
 open($fh, ">", "t/$$.lin.ps"); print $fh $ps1; close($fh);
-open($fh, ">", "t/$$.log.ps"); print $fh $ps3; close($fh);
+open($fh, ">", "t/$$.dot.ps"); print $fh $ps4; close($fh);
 
 #vim:tw=0
diff --git a/tsplot b/tsplot
index 05a2e02..37c4ae1 100755
--- a/tsplot
+++ b/tsplot
@@ -14,6 +14,7 @@ tsplotv
 [--output-format format ]
 [--stacked]
 [--style style]
+[--time_t]
 [file ...]
 
 =head1 DESCRIPTION
@@ -37,11 +38,19 @@ output formats, and styles.
 The --stacked option causes the time series to be stacked on top of each
 other.
 
+The --time_t option specifies that the timestamps are in seconds since
+the epoch. Otherwise they are parsed by add_timestring function (which
+in turn uses the parse_date function of the HTTP::Date module).
+
 =cut
 my $output_format ='png';
 my $log_y =0;
+my $time_t =0;
+my $style = "lines";
 GetOptions('output_format|output-format=s' => \$output_format,
 	   'log_y|log-y'		   => \$log_y,
+	   'time_t'			   => \$time_t,
+	   'style:s'			   => \$style,
           ) 
     or die "Usage: $0 [--output_format format] [files...]\n";
 
@@ -57,9 +66,14 @@ while (<>) {
 }
 while (<>) {
     my ($timestamp, @values) = split();
-    $ts->add_timestring($timestamp, @values);
+    if ($time_t) {
+	$ts->add($timestamp, @values);
+    } else {
+	$ts->add_timestring($timestamp, @values);
+    }
 }
 $ts->log_y($log_y);
+$ts->style($style);
 
 my $g = $ts->plot();
 print $g