CVS: mhonarc/MHonArc/lib mhamain.pl,2.41,2.42 mhdb.pl,2.19,2.20 mhindex.

Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv4069/lib

Modified Files:
	mhamain.pl mhdb.pl mhindex.pl mhinit.pl mhrcfile.pl 
	mhthread.pl 
Log Message:
* Added the following resources:
    IDXPGSSMARKUP   Markup at the beginning of all index pages.
    MSGPGSSMARKUP   Markup at the beginning of all message pages.
    TIDXPGSSMARKUP  Markup at the beginning of all thread index pages.
  Each resource will default to the value of the SSMARKUP resource
  if not defined.


Index: mhamain.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhamain.pl,v
retrieving revision 2.41
retrieving revision 2.42
diff -C2 -r2.41 -r2.42
*** mhamain.pl	21 Jun 2002 22:30:12 -0000	2.41
--- mhamain.pl	27 Jun 2002 00:12:40 -0000	2.42
***************
*** 30,34 ****
  require 5;
  
! $VERSION = "2.5.7";
  $VINFO =<<EndOfInfo;
    MHonArc v$VERSION (Perl $] $^O)
--- 30,34 ----
  require 5;
  
! $VERSION = "2.5.8";
  $VINFO =<<EndOfInfo;
    MHonArc v$VERSION (Perl $] $^O)
***************
*** 1042,1047 ****
  	#&defineIndex2MsgId();
  
! 	($template = $SSMARKUP) =~ s/$VarExp/&replace_li_var($1,$index)/geo;
! 	print $msghandle $template;
  
  	# Output comments -- more informative, but can be used for
--- 1042,1050 ----
  	#&defineIndex2MsgId();
  
! 	$template = ($MSGPGSSMARKUP ne '') ? $MSGPGSSMARKUP : $SSMARKUP
! 	if ($template ne '') {
! 	    $template =~ s/$VarExp/&replace_li_var($1,$index)/geo;
! 	    print $msghandle $template;
! 	}
  
  	# Output comments -- more informative, but can be used for

Index: mhdb.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhdb.pl,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** mhdb.pl	7 Jun 2002 17:45:09 -0000	2.19
--- mhdb.pl	27 Jun 2002 00:12:40 -0000	2.20
***************
*** 168,171 ****
--- 168,174 ----
  print_var(\*DB,'VarExp',    	 \$VarExp);
  
+ print_var(\*DB,'MSGPGSSMARKUP',  \$MSGPGSSMARKUP);
+ print_var(\*DB,'IDXPGSSMARKUP',  \$IDXPGSSMARKUP);
+ print_var(\*DB,'TIDXPGSSMARKUP', \$TIDXPGSSMARKUP);
  print_var(\*DB,'SSMARKUP',       \$SSMARKUP);
  print_var(\*DB,'SpamMode',       \$SpamMode);

Index: mhindex.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhindex.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** mhindex.pl	5 Sep 2001 15:57:29 -0000	1.8
--- mhindex.pl	27 Jun 2002 00:12:40 -0000	1.9
***************
*** 186,191 ****
      my($tmp);
  
!     ($tmp = $SSMARKUP) =~ s/$VarExp/&replace_li_var($1,'')/geo;
!     print $handle $tmp;
  
      print $handle "<!-- ", &commentize("MHonArc v$VERSION"), " -->\n";
--- 186,194 ----
      my($tmp);
  
!     $tmp = ($IDXPGSSMARKUP ne '') ? $IDXPGSSMARKUP : $SSMARKUP
!     if ($tmp ne '') {
! 	$tmp =~ s/$VarExp/&replace_li_var($1,'')/geo;
! 	print $handle $tmp;
!     }
  
      print $handle "<!-- ", &commentize("MHonArc v$VERSION"), " -->\n";

Index: mhinit.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhinit.pl,v
retrieving revision 2.32
retrieving revision 2.33
diff -C2 -r2.32 -r2.33
*** mhinit.pl	7 Jun 2002 17:45:09 -0000	2.32
--- mhinit.pl	27 Jun 2002 00:12:40 -0000	2.33
***************
*** 575,579 ****
  $SCAN		= 0;	# Flag if doing an archive scan
  
! $SSMARKUP	= '';	# Initial markup of all pages
  
  $IDXLABEL	= '';	# Label for main index
--- 575,582 ----
  $SCAN		= 0;	# Flag if doing an archive scan
  
! $MSGPGSSMARKUP	= '';	# Initial markup of message pages
! $IDXPGSSMARKUP	= '';	# Initial markup of index pages
! $TIDXPGSSMARKUP	= '';	# Initial markup of thread index pages
! $SSMARKUP	= '';	# (Default) initial markup of all pages
  
  $IDXLABEL	= '';	# Label for main index

Index: mhrcfile.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhrcfile.pl,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** mhrcfile.pl	7 Jun 2002 17:45:09 -0000	2.21
--- mhrcfile.pl	27 Jun 2002 00:12:40 -0000	2.22
***************
*** 767,770 ****
--- 767,782 ----
  	    last FMTSW;
  	}
+ 	if ($elem eq 'msgpgssmarkup') {		# Initial message page markup
+ 	    $MSGPGSSMARKUP = &get_elem_content($handle, $elem, $chop);
+ 	    last FMTSW;
+ 	}
+ 	if ($elem eq 'idxpgssmarkup') {		# Initial index page markup
+ 	    $IDXPGSSMARKUP = &get_elem_content($handle, $elem, $chop);
+ 	    last FMTSW;
+ 	}
+ 	if ($elem eq 'tidxpgssmarkup') {	# Initial thread idx page markup
+ 	    $TIDXPGSSMARKUP = &get_elem_content($handle, $elem, $chop);
+ 	    last FMTSW;
+ 	}
  	if ($elem eq 'subjectarticlerxp') {	# Regex for language articles
  	    if ($line = &get_elem_last_line($handle, $elem)) {

Index: mhthread.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhthread.pl,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** mhthread.pl	5 Sep 2001 15:58:48 -0000	2.8
--- mhthread.pl	27 Jun 2002 00:12:40 -0000	2.9
***************
*** 94,99 ****
  	print STDOUT "Writing $TIDXPATHNAME ...\n"  unless $QUIET;
  
! 	($tmpl = $SSMARKUP) =~ s/$VarExp/&replace_li_var($1,'')/geo;
! 	print $handle $tmpl;
  
  	print $handle "<!-- ", &commentize("MHonArc v$VERSION"), " -->\n";
--- 94,102 ----
  	print STDOUT "Writing $TIDXPATHNAME ...\n"  unless $QUIET;
  
! 	$tmpl = ($TIDXPGSSMARKUP ne '') ? $TIDXPGSSMARKUP : $SSMARKUP
! 	if ($tmpl ne '') {
! 	    $tmpl =~ s/$VarExp/&replace_li_var($1,'')/geo;
! 	    print $handle $tmpl;
! 	}
  
  	print $handle "<!-- ", &commentize("MHonArc v$VERSION"), " -->\n";

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV