5 files changed, 31 insertions, 264 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index b384fd0..c40a711 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -3,10 +3,7 @@
 # Modify these top variables.
 SUBDIRS = 
 
-EXTRA_DIST = README \
-                create_tables.sql \
-                make_combined_log.pl \
-                mysql_import_combined_log.pl
+EXTRA_DIST = README mysql_import_combined_log.pl
 
 #Don't modify anything below here
 
diff --git a/contrib/README b/contrib/README
index bf0e65f..7dac946 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,38 +1 @@
-This directory contains contributed scripts/programs/utilites for mod_log_sql.
-
-* create_tables.sql
-
-This is the create table SQL commands to create the access, headers_in, 
-headers_out, cookies, and notes tables in the MySQL database.
-Use it like this.
-mysql -u user -h host -p apachelogdatabase < create_tables.sql
-Where:
-        user is the username to log in as,
-        host is the hostname the server is on, 
-        apachelogdatabase is the database to put the tables into
-        -p will have mysql ask you for a password for the user
-
-*make_combined_log.pl
-
-This perl script will extract the data from mod_log_sql's tables in the 
-database and export a standard Apache combined log file. Use this to run
-logs through a program like webalizer.
-
-You must edit the perl script to configure variables before you run it.
-Usage:
-./make_combined_log.pl days virtualhost
-Where:
-        days is the number of days to fetch (starting from now and going back 
-                in time)
-        virtualhost is the name of the virtualhost to retrieve
-
-Example:
-        ./make_combined_log.pl 2 example.com
-
-*mysql_import_combined_log.pl
-
-This is a perl script written by Aaron Jenson that imports a combined log file
-from apache into a SQL database table.. You can use this script to import logs
-from a webserver you are converting over from the standard Apache log system to
-mod_log_sql.  A Usage statement can be fetch by running the program with no 
-parameters or with --help or -?.
+This directory contains contributed scripts/programs/utilites related to mod_log_sql.
diff --git a/contrib/create_tables.sql b/contrib/create_tables.sql
deleted file mode 100644
index 0fe0f4b..0000000
--- a/contrib/create_tables.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-create table access_log (
-        id char(19) ,
-        agent varchar(255) ,
-        bytes_sent int unsigned ,
-        child_pid smallint unsigned,
-        cookie varchar(255),
-        machine_id varchar(25),
-        request_file varchar(255),
-        referer varchar(255) ,
-        remote_host varchar(50) ,
-        remote_logname varchar(50) ,
-        remote_user varchar(50) ,
-        request_duration smallint unsigned ,
-        request_line varchar(255),
-        request_method varchar(10) ,
-        request_protocol varchar(10) ,
-        request_time char(28),
-        request_uri varchar(255),
-        request_args varchar(255),
-        server_port smallint unsigned,
-        ssl_cipher varchar(25),
-        ssl_keysize smallint unsigned,
-        ssl_maxkeysize smallint unsigned,
-        status smallint unsigned ,
-        time_stamp int unsigned ,
-        virtual_host varchar(255)
-);
-
-create table notes (
-    id char(19),
-    item varchar(80),
-    val varchar(80)
-);
-
-create table headers_in (
-    id char(19),
-    item varchar(80),
-    val varchar(80)
-);
-
-create table headers_out (
-    id char(19),
-    item varchar(80),
-    val varchar(80)
-);
-
-create table cookies (
-    id char(19),
-    item varchar(80),
-    val varchar(80)
-);
diff --git a/contrib/make_combined_log.pl b/contrib/make_combined_log.pl
deleted file mode 100644
index 2c55271..0000000
--- a/contrib/make_combined_log.pl
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: make_combined_log.pl,v 1.2 2004/02/12 23:32:55 urkle Exp $
-#
-# make_combined_log.pl
-#
-# Usage: make_combined_log <days> <virtual host>
-#
-# This perl script extracts the httpd access data from a MySQL database
-# and formats it properly for parsing by 3rd-party log analysis tools.
-#
-# The script is intended to be run out by cron.  Its commandline arguments tell
-# it how many days' worth of access records to extract, and which virtual_host
-# you are interested in (because many people log several virthosts to one MySQL
-# db.) This permits you to run it daily, weekly, every 9 days -- whatever you
-# decide.
-#
-# Note: By "days" I mean "chunks of 24 hours prior to the moment this script is
-# run." So if you run it at 4:34 p.m. on the 12th, it will go back through 4:34
-# p.m. on the 11th.
-#
-# Known issues:
-# * Because GET and POST are not discriminated in the MySQL log, we'll just
-#   assume that all requests are GETs.  This should have negligible effect
-#   on any analysis software.  This could be remedied IF you stored the full
-#   HTTP request in your database instead of just the URI, but that's going to
-#   cost you a LOT of space really quickly...
-#
-# * Because this is somewhat of a quick hack it doesn't do the most robust
-#   error checking in the world.  Run it by hand to confirm your usage before
-#   putting it in crontab.
-
-$| = 1;
-
-use DBI;
-
-# Remove the # in front of this line when you have 
-# edited the variables below.
-#$has_edited_source = 1;
-#
-# Set up the proper variables to permit database access
-#
-$serverName = "your.dbhost.com";
-$serverPort = "3306";
-$serverUser = "someuser";
-$serverPass = "somepass";
-$serverTbl  = "acc_log_tbl";
-$serverDb   = "apache";
-
-if (!defined($has_edited_source)) {
-        print "Please edit this file and configure it first.\n";
-        print "This program is $0\n";
-        exit 1;
-}
-# Remember, $#ARGV is parameters minus one...
-if ($#ARGV != 1) {
-        print "Usage $0 days virtualhost\n";
-        exit 1;
-}
-
-$days     = $ARGV[0];
-$virthost = $ARGV[1];
-
-#
-# Other constants
-#
-$st_tz = "-0800";
-$dt_tz = "-0700";
-
-$now = time();
-$start = $now - (86400 * $days);
-
-#
-# Connect and fetch the records
-#
-$dbh = DBI->connect("DBI:mysql:database=$serverDb;host=$serverName;port=$serverPort",$serverUser,$serverPass);
-if (not $dbh) {
-        die "Unable to connect to the database.  Please check your connection variables. (Bad password? Incorrect perms?)";
-}
-
-$records = $dbh->prepare("select remote_host,remote_user,request_uri,time_stamp,status,bytes_sent,referer,agent,request_method,request_protocol from `$serverTbl` where virtual_host='$virthost' and time_stamp >= $start order by time_stamp");
-$records->execute;
-if (not $records) {
-        die "No such table or the select returned no records."
-}
-
-#Right
-#ariston.netcraft.com - - [14/Nov/2001:05:13:39 -0800] "GET / HTTP/1.0" 200 502 "-" "Mozilla/4.08 [en] (Win98; I)"
-#ariston.netcraft.com - - [14/Nov/2001:05:13:39 -0800] "GET / HTTP/1.0" 200 502 "-" "Mozilla/4.08 [en] (Win98; I)"
-
-#Bad
-#ariston.netcraft.com - - [2001-11-14 05:13:39 -0800] "GET / HTTP/1.1" 200 502 "-" "Mozilla/4.08 [en] (Win98; I)"
-#ariston.netcraft.com - - [2001-11-14 05:13:39 -0800] "GET / HTTP/1.1" 200 502 "-" "Mozilla/4.08 [en] (Win98; I)"
-
-
-#
-# Pull out the data row by row and format it
-#
-while (@data = $records->fetchrow_array) {
-        ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($data[3]);
-        $year=$year+1900;
-
-        # Create format for leading-zero formatting
-        if ($mday < 10) { $mday = "0$mday"; }
-        if ($mon < 10) { $mon = "0$mon"; }      
-        if ($hour < 10) { $hour = "0$hour"; }
-        if ($min < 10) { $min = "0$min"; }
-        if ($sec < 10) { $sec = "0$sec"; }
-        
-        # Convert numeric month to string month
-    for ($mon) {
-                if    (/00/)  { $mon = "Jan";} 
-                elsif (/01/)  { $mon = "Feb";} 
-                elsif (/02/)  { $mon = "Mar";} 
-                elsif (/03/)  { $mon = "Apr";}
-                elsif (/04/)  { $mon = "May";}
-                elsif (/05/)  { $mon = "Jun";}
-                elsif (/06/)  { $mon = "Jul";}
-                elsif (/07/)  { $mon = "Aug";}
-                elsif (/08/)  { $mon = "Sep";}
-                elsif (/09/)  { $mon = "Oct";}
-                elsif (/10/)  { $mon = "Nov";}
-                elsif (/11/)  { $mon = "Dec";}
-    }
-    
-    # Create the output
-        print "$data[0] $data[1] - [$mday/$mon/$year:$hour:$min:$sec ";
-        if ($isdst) {
-                print "$dt_tz\] ";
-        } else {
-                print "$st_tz\] ";
-        }
-        print "\"$data[8] $data[2] $data[9]\" $data[4] $data[5] \"$data[6]\" \"$data[7]\"\n";
-}
-
-#
-# Done
-#
-$records->finish;
diff --git a/contrib/mysql_import_combined_log.pl b/contrib/mysql_import_combined_log.pl
index bffec20..1c801f2 100644
--- a/contrib/mysql_import_combined_log.pl
+++ b/contrib/mysql_import_combined_log.pl
@@ -1,8 +1,4 @@
 #!/usr/bin/perl -w
-# $Id: mysql_import_combined_log.pl,v 1.4 2004/02/21 18:09:50 urkle Exp $
-# Written by Aaron Jenson.
-# Original source: http://www.visualprose.com/software.php
-# Updated to work under Perl 5.6.1 by Edward Rudd
 use strict;
 use Getopt::Long qw(:config bundling);
 use DBI;
@@ -37,44 +33,47 @@ my @cols = (
 );
 my $col = '';
 
+%options = (
+        "version" => sub { VERSION_MESSAGE(); exit 0; },
+        "help|?" => sub { HELP_MESSAGE(); exit 0; },
+        );
+
 GetOptions (\%options,
-                "version" => sub { VERSION_MESSAGE(); exit 0; },
-                "help|?" => sub { HELP_MESSAGE(); exit 0; },
-                "host|h=s",
-                "database|d=s",
-                "table|t=s",
-                "username|u=s",
-                "password|p=s",
-                "logfile|f=s");
-
-$options{host} ||= 'localhost';
-$options{database} ||= '';
-$options{username} ||= '';
-$options{password} ||= '';
-$options{logfile} ||= '';
-
-if( ! $options{database} )
+                "h|host=s",
+                "d|database=s",
+                "t|table=s",
+                "u|username=s",
+                "p|password=s",
+                "f|logfile=s");
+
+$options{h} ||= 'localhost';
+$options{d} ||= '';
+$options{u} ||= '';
+$options{p} ||= '';
+$options{f} ||= '';
+
+if( ! $options{d} )
 {
         HELP_MESSAGE();
         print "Must supply a database to connect to.\n";
         exit 1;
 }
 
-if( ! $options{table} )
+if( ! $options{t} )
 {
         HELP_MESSAGE();
         print "Must supply table name.\n";
         exit 1;
 }
 
-if( $options{logfile} )
+if( $options{f} )
 {
-        if( ! -e $options{logfile} )
+        if( ! -e $options{f} )
         {
-                print  "File '$options{logfile}' doesn't exist.\n";
+                print  "File '$options{f}' doesn't exist.\n";
                 exit 1;
         }
-        open(STDIN, "<$options{logfile}") || die "Can't open $options{logfile} for reading.";
+        open(STDIN, "<$options{f}") || die "Can't open $options{f} for reading.";
 }
 
 $dbh = Connect();
@@ -82,7 +81,7 @@ if (! $dbh) {
         exit 1;
 }
 
-$sql = "INSERT INTO $options{table} (";
+$sql = "INSERT INTO $options{t} (";
 foreach $col (@cols)
 {
         $sql .= "$col," if( $col );
@@ -115,15 +114,15 @@ while($line = <STDIN>)
 }
 print "Parsed $linecount Log lines\n";
 print "Inserted $insertcount records\n";
-print "to table '$options{table}' in database '$options{database}' on '$options{host}'\n";
+print "to table '$options{t}' in database '$options{d}' on '$options{h}'\n";
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 # Connects to a MySQL database and returns the connection.
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 sub Connect
 {
-        my $dsn = "DBI:mysql:$options{database};hostname=$options{host}";
-        return DBI->connect( $dsn, $options{username}, $options{password} );
+        my $dsn = "DBI:mysql:$options{d};hostname=$options{h}";
+        return DBI->connect( $dsn, $options{u}, $options{p} );
 }
 
 
@@ -216,9 +215,7 @@ EOF
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 sub VERSION_MESSAGE
 {
-        print "mysql_import_combined_log.pl version 1.2\n";
-        print "Version 1.0 Written by Aaron Jenson.\n";
-        print "Update to work with perl 5.6.1 by Edward Rudd\n";
+        print "mysql_import_combined_log.pl version 1.1\n";
 }
 
 1;