--- trunk/MWS.pm	2004/05/09 00:09:32	30
+++ trunk/MWS.pm	2004/05/10 20:26:17	41
@@ -4,8 +4,10 @@
 
 use strict;
 use warnings;
-use Carp;
 
+use lib '.';
+
+use Carp;
 use Mail::Box::Manager;
 use Config::IniFiles;
 use POSIX qw(strftime);
@@ -16,17 +18,6 @@
 use POSIX qw(strftime);
 use MIME::Base64;
 
-#use MWS_plucene;
-use MWS_swish;
-
-require Exporter;
-
-our @ISA = qw(Exporter);
-
-our %EXPORT_TAGS = ();
-our @EXPORT_OK;
-our @EXPORT;
-
 our $VERSION = '1.00';
 
 my $folder;	# placeholder for folders
@@ -35,16 +26,15 @@
 
 sub new {
 	my $class = shift;
-	my $self = {};
+	my $self = {@_};
 	bless($self, $class);
 
-	my $config_file = shift || die "need index file";
 
-	$self->{config} = new Config::IniFiles( -file => $config_file );
+	my $config_name = $self->{config_file} || croak "need config_file";
+	$config_name =~ s/\.conf.*$//;
+	$self->{config_name} = $config_name;
 
-	$self->{config_file} = $config_file;
-	$config_file =~ s/\.conf.*$//;
-	$self->{config_name} = $config_file;
+	$self->{config} = new Config::IniFiles( -file => $self->{config_file} );
 
 	my $index_dir = $self->{config}->val('global', 'index') || croak "can't find [index] section in config file with path of index";