enable fmlthread options:

--article_id_max=\d+  to override /var/spool/ml/$ml/seq
--reverse             to reverse time order in showing "review"

4 files changed, 25 insertions, 12 deletions

diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm
index 722c9d74..3e59ebc4 100644
--- a/fml/lib/FML/Process/Switch.pm
+++ b/fml/lib/FML/Process/Switch.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Switch.pm,v 1.29 2001/11/07 03:14:22 fukachan Exp $
+# $FML: Switch.pm,v 1.30 2001/11/07 04:31:13 fukachan Exp $
 #
 
 package FML::Process::Switch;
@@ -342,7 +342,12 @@ sub _module_specific_options
 	return qw(ctladdr! debug! params=s -c=s);
     }
     elsif ($myname eq 'fmlthread'|| $myname eq 'fmlthread.cgi') {
-	return qw(debug! spool_dir=s base_url=s params=s -f=s -c=s -A=s -R=s);
+	return qw(debug! 
+		  article_id_max=i
+		  spool_dir=s
+		  base_url=s
+		  reverse!
+		  params=s -f=s -c=s);
     }
     elsif ($myname eq 'fmlconf') {
 	return qw(debug! params=s -c=s n!);
diff --git a/fml/lib/FML/Process/ThreadTrack.pm b/fml/lib/FML/Process/ThreadTrack.pm
index cb2e700a..03b8eb53 100644
--- a/fml/lib/FML/Process/ThreadTrack.pm
+++ b/fml/lib/FML/Process/ThreadTrack.pm
@@ -4,7 +4,7 @@
 # Copyright (C) 2000-2001 Ken'ichi Fukamachi
 #          All rights reserved. 
 #
-# $FML: ThreadTrack.pm,v 1.8 2001/11/07 04:08:30 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.9 2001/11/07 04:31:13 fukachan Exp $
 #
 
 package FML::Process::ThreadTrack;
@@ -83,13 +83,15 @@ sub run
     my $ml_name       = $config->{ ml_name };
     my $thread_db_dir = $config->{ thread_db_dir };
     my $spool_dir     = $mydir || $config->{ spool_dir };
-    my $max_id        = $curproc->article_id_max();
+    my $max_id        = defined $options->{ article_id_max } ?
+	$options->{ article_id_max } : $curproc->article_id_max();
     my $ttargs        = {
-	logfp       => \&Log,
-	fd          => \*STDOUT,
-	db_base_dir => $thread_db_dir,
-	ml_name     => $ml_name,
-	spool_dir   => $spool_dir,
+	logfp         => \&Log,
+	fd            => \*STDOUT,
+	db_base_dir   => $thread_db_dir,
+	ml_name       => $ml_name,
+	spool_dir     => $spool_dir,
+	reverse_order => (defined $options->{ reverse } ? 1 : 0),
     };
 
     use Mail::ThreadTrack;
diff --git a/fml/lib/Mail/ThreadTrack.pm b/fml/lib/Mail/ThreadTrack.pm
index 001c98ff..4edfa071 100755
--- a/fml/lib/Mail/ThreadTrack.pm
+++ b/fml/lib/Mail/ThreadTrack.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: ThreadTrack.pm,v 1.10 2001/11/05 14:34:50 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.11 2001/11/07 04:05:25 fukachan Exp $
 #
 
 package Mail::ThreadTrack;
@@ -82,7 +82,7 @@ sub new
 	db_type => 'AnyDBM_File',
     };
 
-    my @keys = qw(ml_name spool_dir article_id db_base_dir);
+    my @keys = qw(ml_name spool_dir article_id db_base_dir reverse_order);
     my %must = ('ml_name' => 1, 'spool_dir' => 1, 'db_base_dir' => 1);
 
     for my $key (@keys) {
diff --git a/fml/lib/Mail/ThreadTrack/Print.pm b/fml/lib/Mail/ThreadTrack/Print.pm
index b0bc1dd7..272a8470 100644
--- a/fml/lib/Mail/ThreadTrack/Print.pm
+++ b/fml/lib/Mail/ThreadTrack/Print.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Print.pm,v 1.6 2001/11/05 14:35:47 fukachan Exp $
+# $FML: Print.pm,v 1.7 2001/11/07 04:07:23 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Print;
@@ -79,6 +79,9 @@ sub review
     use Mail::Message::MH;
     my $ra = Mail::Message::MH->expand($str, $min, $max);
     my $first = 0;
+
+    if (defined $config->{ reverse_order }) { @$ra = reverse @$ra;}
+
     for my $id (@$ra) {
 	if ($id =~ /^\d+$/) { 
 	    my $tid = $self->_create_thread_id_strings($id);
@@ -332,6 +335,9 @@ sub _valid_buf
     elsif ($str =~ /\w+\@\w+/) { # mail address ?
 	return 0;
     }
+    elsif ($str =~ /^\S+\>/) { # quotation ?
+	return 0;
+    }
 
     return 1;
 }