move FML::SequenceFile and Utils to File::

add File::Errors also to avoid errors

7 files changed, 109 insertions, 22 deletions

diff --git a/fml/lib/FML/Article.pm b/fml/lib/FML/Article.pm
index 31a81121..19571e61 100644
--- a/fml/lib/FML/Article.pm
+++ b/fml/lib/FML/Article.pm
@@ -64,8 +64,8 @@ sub increment_id
     my $pcb      = $curproc->{ pcb };
     my $seq_file = $config->{ sequence_file };
 
-    use FML::SequenceFile;
-    my $sfh = new FML::SequenceFile { sequence_file => $seq_file };
+    use File::Sequence;
+    my $sfh = new File::Sequence { sequence_file => $seq_file };
     my $id  = $sfh->increment_id;
     if ($sfh->error) { Log( $sfh->error ); }
 
diff --git a/fml/lib/FML/Checksum.pm b/fml/lib/FML/Checksum.pm
index d65b19e3..e338eeef 100644
--- a/fml/lib/FML/Checksum.pm
+++ b/fml/lib/FML/Checksum.pm
@@ -64,7 +64,7 @@ sub _init
 	$self->{ _type } = 'native';
     }
     else {
-	eval qq{ require FML::Utils; import FML::Utils qw(search_program);};
+	eval qq{ require File::Utils; import File::Utils qw(search_program);};
 	my $prog = search_program('md5') || search_program('md5sum');
 	if (defined $prog) {
 	    $self->{ _program } = $prog;
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index c8568544..8cbf854a 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -190,7 +190,7 @@ sub _deliver_article
 
     { # debug
 	my $dir = $config->{ smtp_log_dir };
-	use FML::Utils qw(mkdirhier);
+	use File::Utils qw(mkdirhier);
 	mkdirhier($dir) unless -d $dir;
 
 	my $f = $config->{ smtp_log_file };
diff --git a/fml/lib/FML/Ticket/System.pm b/fml/lib/FML/Ticket/System.pm
index 8e2c2def..67ffe5c3 100644
--- a/fml/lib/FML/Ticket/System.pm
+++ b/fml/lib/FML/Ticket/System.pm
@@ -33,8 +33,8 @@ sub increment_id
 {
     my ($self, $seq_file) = @_;
 
-    use FML::SequenceFile;
-    my $sfh = new FML::SequenceFile { sequence_file => $seq_file };
+    use File::Sequence;
+    my $sfh = new File::Sequence { sequence_file => $seq_file };
     my $id  = $sfh->increment_id;
     $self->error_reason( $sfh->error );
 
@@ -66,9 +66,9 @@ sub _init_ticket_db_dir
     if (defined $self->{ _db_dir }) {
 	my $db_dir    = $self->{ _db_dir };
 	unless (-d $db_dir) {
-	    use FML::Utils qw(mkdirhier);
+	    use File::Utils qw(mkdirhier);
 	    mkdirhier($db_dir, $config->{ default_directory_mode }) || do {
-		$self->error_reason( FML::Utils->error() );
+		$self->error_reason( File::Utils->error() );
 		return undef;
 	    };
 	}
diff --git a/fml/lib/File/Errors.pm b/fml/lib/File/Errors.pm
new file mode 100644
index 00000000..4d5399a3
--- /dev/null
+++ b/fml/lib/File/Errors.pm
@@ -0,0 +1,87 @@
+#-*- perl -*-
+#
+#  Copyright (C) 2001 Ken'ichi Fukamachi
+#   All rights reserved. This program is free software; you can
+#   redistribute it and/or modify it under the same terms as Perl itself. 
+#
+# $Id$
+# $FML$
+#
+
+package File::Errors;
+use strict;
+use vars qw(@ISA @EXPORT @EXPORT_OK);
+use Carp;
+
+require Exporter;
+@ISA       = qw(Exporter);
+@EXPORT_OK = qw(error_reason error error_reset);
+
+=head1 NAME
+
+File::Errors.pm - error handling utilities
+
+=head1 SYNOPSIS
+
+	package Something;
+	use File::Errors qw(error_reason error error_reset);
+
+	sub xxx
+	{
+		if something errors ...
+		$self->error_reason( error reason );
+	}
+
+When you use Something module,
+
+	use Something;
+	$obj = new Something;
+	unless ($obj->error) { $obj->do_somting( ...); };
+
+
+=head1 DESCRIPTION
+
+=head1 AUTHOR
+
+Ken'ichi Fukamachi
+
+=head1 COPYRIGHT
+
+Copyright (C) 2001 Ken'ichi Fukamachi
+
+All rights reserved. This program is free software; you can
+redistribute it and/or modify it under the same terms as Perl itself. 
+
+=head1 HISTORY
+
+File::Errors appeared in fml5 mailing list driver package.
+See C<http://www.fml.org/> for more details.
+
+=cut
+
+
+sub error_reason
+{
+    my ($self, $mesg) = @_;
+    $self->{'_error_reason'} = $mesg;
+}
+
+
+sub error
+{
+    my ($self, $args) = @_;
+    return $self->{'_error_reason'};
+}
+
+
+sub error_reset
+{
+    my ($self, $args) = @_;
+    my $msg = $self->{'_error_reason'};
+    undef $self->{'_error_reason'} if defined $self->{'_error_reason'};
+    undef $self->{'_error_action'} if defined $self->{'_error_action'};
+    return $msg;
+}
+
+
+1;
diff --git a/fml/lib/FML/SequenceFile.pm b/fml/lib/File/Sequence.pm
index a68457c1..e0da18ae 100644
--- a/fml/lib/FML/SequenceFile.pm
+++ b/fml/lib/File/Sequence.pm
@@ -8,26 +8,26 @@
 # $FML$
 #
 
-package FML::SequenceFile;
+package File::Sequence;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK);
 use Carp;
-use FML::Errors qw(error_reason error error_reset);
+use File::Errors qw(error_reason error error_reset);
 
 =head1 NAME
 
-FML::SequenceFile - maintain the sequence number
+File::Sequence - maintain the sequence number
 
 =head1 SYNOPSIS
 
-   use FML::SequenceFile;
-   my $sfh = new FML::SequenceFile { sequence_file => $seq_file };
+   use File::Sequence;
+   my $sfh = new File::Sequence { sequence_file => $seq_file };
    my $id  = $sfh->increment_id;
    if ($sfh->error) { use Carp; carp( $sfh->error ); }
 
 If you divide the $id by some modulus, use
 
-   my $sfh = new FML::SequenceFile { 
+   my $sfh = new File::Sequence { 
        sequence_file => $seq_file,
        modulus       => $modules,
    };
@@ -35,7 +35,7 @@ If you divide the $id by some modulus, use
 
 For example, if you do new() with modulus 3,
 
-   my $sfh = new FML::SequenceFile { 
+   my $sfh = new File::Sequence { 
        sequence_file => $seq_file,
        modulus       => 3,
    };
@@ -82,7 +82,7 @@ sub increment_id
 
     # touch the sequence file if it does not exist.
     unless (-f $seq_file) {
-	use FML::Utils qw(touch);
+	use File::Utils qw(touch);
 	touch($seq_file);
     };
 
@@ -131,7 +131,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::SequenceFile appeared in fml5 mailing list driver package.
+File::Sequence appeared in fml5 mailing list driver package.
 See C<http://www.fml.org/> for more details.
 
 =cut
diff --git a/fml/lib/FML/Utils.pm b/fml/lib/File/Utils.pm
index 04f33f7a..448bfaa4 100644
--- a/fml/lib/FML/Utils.pm
+++ b/fml/lib/File/Utils.pm
@@ -5,10 +5,10 @@
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
 # $Id$
-# $FML$
+# $File$
 #
 
-package FML::Utils;
+package File::Utils;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $ErrorString);
 use Carp;
@@ -20,11 +20,11 @@ require Exporter;
 
 =head1 NAME
 
-FML::Utils.pm - error handling utilities
+File::Utils.pm - error handling utilities
 
 =head1 SYNOPSIS
 
-   use FML::Utils qw(mkdiehier);
+   use File::Utils qw(mkdiehier);
    mkdirhier($dir, $mode);
 
 =head1 DESCRIPTION
@@ -42,7 +42,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::Utils appeared in fml5 mailing list driver package.
+File::Utils appeared in fml5 mailing list driver package.
 See C<http://www.fml.org/> for more details.
 
 =cut