[SimBot-commits] CVS: simbot/plugins sqlite-logger.pl,1.47,1.48

[Pete P. <fou...@us...>]

Update of /cvsroot/simbot/simbot/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15884/plugins

Modified Files:
	sqlite-logger.pl 
Log Message:
Dates now work.


Index: sqlite-logger.pl
===================================================================
RCS file: /cvsroot/simbot/simbot/plugins/sqlite-logger.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -p -r1.47 -r1.48
--- sqlite-logger.pl	28 Jul 2005 13:18:28 -0000	1.47
+++ sqlite-logger.pl	28 Jul 2005 13:24:38 -0000	1.48
@@ -700,24 +700,27 @@ sub row_hashref_to_text {
 sub row_hashref_to_html {
     my ($row) = @_;
     
+    my $msg = '<div class="row ' . lc($row->{'event'}) . '">';
+    
+    
+    # timestamp    
     my (undef, undef, undef, $cur_day, $cur_month, $cur_yr) = localtime; 
     $cur_month += 1; # localtime gives us 0..11, we want 1..12
     $cur_yr += 1900; # localtime gives us number of years since 1900
     
-    my $msg = '<div class="row ' . lc($row->{'event'}) . '">';
-    
-    
-    # timestamp
-    my ($yr, $month, $day, $hr,$min) = $row->{'time'} =~ m/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/;
+    my (undef, $min, $hr, $day, $month, $yr) = localtime($row->{'time'});
+    $month += 1;
+    $yr += 1900;
     
-    $msg .= q(<span class="ts">);
+    $msg .= '<span class="ts">';
     
     if($cur_day != $day || $cur_month != $month || $cur_yr != $yr) {
         $msg .= (MONTHS)[$month-1] . " $day ";
     }
-    $msg .= "$hr:$min";
     
-    $msg .= q(</span>);
+    if($cur_yr != $yr) { $msg .= "$yr "; }
+    
+    $msg .= $hr . ':' . sprintf('%02d',$min) . '</span> ';
     
     # event
 #    $msg .= q(<span class=") . lc($row->{'event'}) . q(">);