[Orca-checkins] r520 - orca/trunk/data_gatherers/winallator

[blair at orcaware.com]

Author: blair at orcaware.com
Date: Tue Dec 27 23:26:54 2005
New Revision: 520

Added:
   orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r519.txt
      - copied, changed from r519, /orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r362.txt
Removed:
   orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r362.txt
Modified:
   orca/trunk/data_gatherers/winallator/README

Log:
Update Winallator's patch for SourceFile.pm so it cleanly applies.

* data_gatherers/winallator/SourceFile.pm-patch-with-r519.txt:
  Renamed from
    data_gatherers/winallator/SourceFile.pm-patch-with-r362.txt.
  Regenerated by applying SourceFile.pm-patch-with-r362.txt to
    SourceFile.pm and running diff with the unpatched and patched
    versions.

* data_gatherers/winallator/README:
  Mention new filenames.


Modified: orca/trunk/data_gatherers/winallator/README
==============================================================================
--- orca/trunk/data_gatherers/winallator/README	(original)
+++ orca/trunk/data_gatherers/winallator/README	Tue Dec 27 23:26:54 2005
@@ -26,7 +26,7 @@
     a) Get a copy of the Orca source tree on the system that will
        process the Winallator log files.
 
-    b) Find the SourceFile.pm-patch-with-r362.txt file and note where
+    b) Find the SourceFile.pm-patch-with-r519.txt file and note where
        it is.
 
     c) cd into the $prefix/lib/Orca directory, where $prefix is where
@@ -35,7 +35,7 @@
     c) Apply the patch by running:
 
        cp -p SourceFile.pm SourceFile.FCS
-       patch -s -p0 < path/to/SourceFile.pm-patch-with-r362.txt
+       patch -s -p0 < path/to/SourceFile.pm-patch-with-r519.txt
 
  4. You have two choices now.  The first and easy choice is to load in
     a previously designed log configuration.  You can always modify

Copied: orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r519.txt (from r519, /orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r362.txt)
==============================================================================
--- /orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r362.txt	(original)
+++ orca/trunk/data_gatherers/winallator/SourceFile.pm-patch-with-r519.txt	Tue Dec 27 23:26:54 2005
@@ -1,8 +1,6 @@
-Index: SourceFile.pm
-===================================================================
---- SourceFile.pm	(revision 362)
-+++ SourceFile.pm	(working copy)
-@@ -31,6 +31,10 @@
+--- SourceFile.pm.orig	2005-12-27 23:14:54.000000000 -0800
++++ SourceFile.pm	2005-12-27 23:14:58.000000000 -0800
+@@ -48,6 +48,10 @@
  use Orca::Utils         qw(email_message);
  use vars                qw(@ISA $VERSION);
  
@@ -11,9 +9,9 @@
 +use Time::Local;
 +
  @ISA     = qw(Orca::DataFile);
- $VERSION = substr q$Revision: 0.01 $, 10;
+ $VERSION = (substr q$Revision: 513 $, 10)/100.0;
  
-@@ -153,9 +157,39 @@
+@@ -170,9 +174,39 @@
        return unless $fd;
        my $line = <$fd>;
        chomp($line);
@@ -54,7 +52,7 @@
        } else {
          warn "$0: warning: no first_line for '$filename' yet.\n";
          $open_file_cache->close($fid) or
-@@ -921,8 +955,19 @@
+@@ -965,7 +999,18 @@
      # in the output file when it starts up.
      next if $line =~ /timestamp/;
  
@@ -64,18 +62,17 @@
 +s/ /:/g;
 +s/"//g;
 +$line = $_;
- 
++
 +    # Andy Fox - 2nd July 2002
 +    # Changed this to a tab (was a space), so it can read tsv format files
 +    my @line = split('	', $line);
 +
 +    ##ANDY##
 +    #print "@line\n";
-+
+ 
      # Skip this input line if 1) the file uses the first line to
      # define the column names, 2) the number of columns loaded is not
-     # equal to the number of columns in the column description.
-@@ -940,6 +985,58 @@
+@@ -984,6 +1029,58 @@
      } else {
        $time = $line[$date_column_index];
      }