change default target to _top

use $msg_base_url to show link to article

5 files changed, 40 insertions, 15 deletions

diff --git a/fml/lib/FML/CGI/Configure.pm b/fml/lib/FML/CGI/Configure.pm
index 11019ee9..2858171c 100644
--- a/fml/lib/FML/CGI/Configure.pm
+++ b/fml/lib/FML/CGI/Configure.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: Configure.pm,v 1.4 2001/11/09 03:14:57 fukachan Exp $
+# $FML: Configure.pm,v 1.5 2001/11/13 15:18:31 fukachan Exp $
 #
 
 package FML::CGI::Configure;
@@ -161,7 +161,7 @@ sub _show_menu
 {
     my ($curproc, $args) = @_;
     my $action  = $curproc->myname();
-    my $target  = 'ResultsWindow';
+    my $target  = '_top';
     my $ml_list = $curproc->get_ml_list($args);
     my $address = $curproc->safe_param_address() || '';
     my $command_list = [
diff --git a/fml/lib/FML/CGI/ThreadTrack.pm b/fml/lib/FML/CGI/ThreadTrack.pm
index 5c5680bd..2c242ca1 100644
--- a/fml/lib/FML/CGI/ThreadTrack.pm
+++ b/fml/lib/FML/CGI/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.8 2001/11/12 02:19:19 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.9 2001/11/13 15:18:07 fukachan Exp $
 #
 
 package FML::CGI::ThreadTrack;
@@ -84,7 +84,7 @@ sub run_cgi
     my $config = $curproc->{ config };
     my $myname = $config->{ program_name };
     my $ttargs = $curproc->_build_param($args);
-    my $action = $curproc->safe_param_action();
+    my $action = $curproc->safe_param_action() || '';
 
     use Mail::ThreadTrack;
     my $thread = new Mail::ThreadTrack $ttargs;
@@ -128,6 +128,7 @@ sub _build_param
     my ($curproc, $args) = @_;
     my $config = $curproc->{ config };
     my $myname = $config->{ program_name };
+    my $option = $curproc->command_line_options();
 
     #  argumente for thread track module
     my $ml_name       = $curproc->safe_param_ml_name();
@@ -144,6 +145,16 @@ sub _build_param
 	reverse_order => 1,
     };
 
+    # import some variables
+    for my $varname (qw(base_url msg_base_url)) { 
+	if (defined $option->{ $varname }) {
+	    $ttargs->{ $varname } = $option->{ $varname };
+	}
+	elsif (defined $config->{ $varname }) {
+	    $ttargs->{ $varname } = $config->{ $varname };
+	}
+    }
+
     return $ttargs;
 }
 
@@ -153,7 +164,7 @@ sub _show_guide
     my ($curproc, $args) = @_;
     my $config  = $curproc->{ config };
     my $action  = $curproc->myname();
-    my $target  = $config->{ thread_cgi_target_window } || 'ThreadCGIWindow';
+    my $target  = $config->{ thread_cgi_target_window } || '_top';
     my $ml_list = $curproc->get_ml_list($args);
     my $ml_name = $config->{  ml_name };
 
diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm
index 257ee957..024a8876 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.37 2001/11/12 13:41:34 fukachan Exp $
+# $FML: Switch.pm,v 1.38 2001/11/12 14:37:25 fukachan Exp $
 #
 
 package FML::Process::Switch;
@@ -361,6 +361,7 @@ sub _module_specific_options
 		  article_id_max=i
 		  spool_dir=s
 		  base_url=s
+		  msg_base_url=s
 		  reverse!
 		  params=s -f=s -c=s);
     }
diff --git a/fml/lib/Mail/ThreadTrack.pm b/fml/lib/Mail/ThreadTrack.pm
index ea97b384..5cfa1486 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.17 2001/11/11 13:37:42 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.18 2001/11/16 10:08:18 fukachan Exp $
 #
 
 package Mail::ThreadTrack;
@@ -82,7 +82,11 @@ sub new
 	db_type => 'AnyDBM_File',
     };
 
-    my @keys = qw(myname ml_name spool_dir article_id db_base_dir reverse_order);
+    my @keys = qw(myname ml_name spool_dir article_id db_base_dir
+		  reverse_order
+		  base_url msg_base_url
+		  );
+
     my %must = ('ml_name' => 1, 'spool_dir' => 1, 'db_base_dir' => 1);
 
     for my $key (@keys) {
diff --git a/fml/lib/Mail/ThreadTrack/Print/HTML.pm b/fml/lib/Mail/ThreadTrack/Print/HTML.pm
index f635d679..319f7cd9 100644
--- a/fml/lib/Mail/ThreadTrack/Print/HTML.pm
+++ b/fml/lib/Mail/ThreadTrack/Print/HTML.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: HTML.pm,v 1.5 2001/11/11 11:12:28 fukachan Exp $
+# $FML: HTML.pm,v 1.6 2001/11/11 13:37:42 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Print::HTML;
@@ -72,7 +72,7 @@ sub __start_thread_summary
     my $ml_name = $config->{ ml_name };
     my $fd      = $self->{ _fd } || \*STDOUT;
     my $action  = $config->{ myname };
-    my $target  = "ResultsWindow";
+    my $target  = '_top';
 
     # statistics
     if (defined $self->{ _ticket_id_stat }) {
@@ -138,7 +138,7 @@ sub __print_thread_summary
     my $ml_name   = $config->{ ml_name };
     my $spool_dir = $config->{ spool_dir };
     my $action    = $config->{ myname };
-    my $target    = $config->{ thread_cgi_target_window } || 'ThreadCGIWindow';
+    my $target    = $config->{ thread_cgi_target_window } || '_top';
 
     my $date     = $optargs->{ date };
     my $age      = $optargs->{ age };
@@ -162,11 +162,20 @@ sub __print_thread_summary
 
     print "<TR>\n";
 
-    # thread id
+    # show articles in this thread id
     print "<TD>";
-    print "<A HREF=\"$action&action=show\" TARGET=\"lower\">\n";
-    print $tid;
-    print "\n</A>\n";
+    if (defined $config->{ msg_base_url }) {
+	my $msg_base_url = $config->{ msg_base_url };
+	my $url          = "$msg_base_url/msg$aid.html";
+	print "<A HREF=\"$url\" TARGET=\"article\">\n";
+	print $tid;
+	print "\n</A>\n";
+    }
+    else {
+	print "<A HREF=\"$action&action=show\" TARGET=\"article\">\n";
+	print $tid;
+	print "\n</A>\n";
+    }
 
     # action
     print "<TD>";