mhonarc-commits
[Top] [All Lists]

CVS: mhonarc/MHonArc/lib mhdb.pl,2.18,2.19 mhdysub.pl,2.5,2.6 mhinit.pl,2.31,2.32 mhopt.pl,2.26,2.27 mhrcfile.pl,2.20,2.21 mhrcvars.pl,2.19,2.20 mhusage.pl,2.18,2.19

2002-06-07 11:30:07
Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv5457/lib

Modified Files:
	mhdb.pl mhdysub.pl mhinit.pl mhopt.pl mhrcfile.pl mhrcvars.pl 
	mhusage.pl 
Log Message:
* Added NOSUBJECTTXT resource: Defines raw subject text to use
  for messages that do not have a subject.


Index: mhdb.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhdb.pl,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** mhdb.pl	2 May 2002 01:34:30 -0000	2.18
--- mhdb.pl	7 Jun 2002 17:45:09 -0000	2.19
***************
*** 157,160 ****
--- 157,161 ----
  print_var(\*DB,'NoMsgPgs',       \$NoMsgPgs);
  print_var(\*DB,'NoSubjectThreads', \$NoSubjectThreads);
+ print_var(\*DB,'NoSubjectTxt',   \$NoSubjectTxt);
  print_var(\*DB,'NoteDir',        \$NoteDir);
  print_var(\*DB,'POSIXstrftime',  \$POSIXstrftime);

Index: mhdysub.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhdysub.pl,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** mhdysub.pl	25 Aug 2001 20:09:21 -0000	2.5
--- mhdysub.pl	7 Jun 2002 17:45:09 -0000	2.6
***************
*** 121,125 ****
  	1 while $ret =~ s/$SubReplyRxp//io;
  	if ($ret eq "") {
! 	    return '[no subject]';
  	}
  	$ret;
--- 121,125 ----
  	1 while $ret =~ s/$SubReplyRxp//io;
  	if ($ret eq "") {
! 	    return $NoSubjectTxt;
  	}
  	$ret;

Index: mhinit.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhinit.pl,v
retrieving revision 2.31
retrieving revision 2.32
diff -C2 -r2.31 -r2.32
*** mhinit.pl	2 May 2002 01:34:30 -0000	2.31
--- mhinit.pl	7 Jun 2002 17:45:09 -0000	2.32
***************
*** 476,479 ****
--- 476,481 ----
  $MsgLocalDateFmt= $ENV{'M2H_MSGLOCALDATEFMT'}	|| '';
  
+ $NoSubjectTxt	= $ENV{'M2H_NOSUBJECTTXT'}	|| '[no subject]';
+ 
  $NoteDir	= $ENV{'M2H_NOTEDIR'} 		|| 'notes';
  

Index: mhopt.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhopt.pl,v
retrieving revision 2.26
retrieving revision 2.27
diff -C2 -r2.26 -r2.27
*** mhopt.pl	2 May 2002 01:34:30 -0000	2.26
--- mhopt.pl	7 Jun 2002 17:45:09 -0000	2.27
***************
*** 130,133 ****
--- 130,135 ----
  	"nosubjectthreads",
  			# Do not do subject based threading
+ 	"nosubjecttxt=s",
+ 			# Text to use if message has no subject
  	"notedir",	# Location of notes
  	"notetext=s@",	# Text data of note
***************
*** 491,494 ****
--- 493,498 ----
      $SubStripCode  = $opt{'subjectstripcode'}   if $opt{'subjectstripcode'};
      $MsgExcFilter  = $opt{'msgexcfilter'}    if defined($opt{'msgexcfilter'});
+ 
+     $NoSubjectTxt  = $opt{'nosubjecttxt'}	if $opt{'nosubjecttxt'};
  
      $IdxPageNum  = $opt{'pagenum'}   if defined($opt{'pagenum'});

Index: mhrcfile.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhrcfile.pl,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** mhrcfile.pl	2 May 2002 01:34:30 -0000	2.20
--- mhrcfile.pl	7 Jun 2002 17:45:09 -0000	2.21
***************
*** 642,645 ****
--- 642,649 ----
  	    last FMTSW;
  	}
+ 	if ($elem eq 'nosubjecttxt') {		# Text to use if no subject
+ 	    $NoSubjectTxt = &get_elem_content($handle, $elem, $chop);
+ 	    last FMTSW;
+ 	}
  	if ($elem eq 'nosubsort') {		# Do not sort msgs by subject
  	    $SUBSORT = 0;

Index: mhrcvars.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhrcvars.pl,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** mhrcvars.pl	4 May 2002 05:01:20 -0000	2.19
--- mhrcvars.pl	7 Jun 2002 17:45:09 -0000	2.20
***************
*** 252,256 ****
  	    if (defined($key)) {
  		$tmp = $Subject{$key};
! 		$tmp = '[no subject]'  if $tmp eq "";
  	    } else {
  		$tmp = "";
--- 252,256 ----
  	    if (defined($key)) {
  		$tmp = $Subject{$key};
! 		$tmp = $NoSubjectTxt  if $tmp eq "";
  	    } else {
  		$tmp = "";
***************
*** 263,267 ****
  	    if (defined($key)) {
  		$tmp = $Subject{$key};
! 		$tmp = '[no subject]'  if $tmp eq "";
  	    } else {
  		$tmp = "";
--- 263,267 ----
  	    if (defined($key)) {
  		$tmp = $Subject{$key};
! 		$tmp = $NoSubjectTxt  if $tmp eq "";
  	    } else {
  		$tmp = "";

Index: mhusage.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhusage.pl,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** mhusage.pl	30 Sep 2001 09:24:02 -0000	2.18
--- mhusage.pl	7 Jun 2002 17:45:09 -0000	2.19
***************
*** 56,61 ****
    option can be used to convert a single mail message to standard output.
  
!   Read the full documentation included with the distribution for more
!   complete usage information.
  
  Options:
--- 56,61 ----
    option can be used to convert a single mail message to standard output.
  
!   Read the full documentation included with the distribution, or at
!   <http://www.mhonarc.org/>, for more complete usage information.
  
  Options:
***************
*** 146,149 ****
--- 146,150 ----
    -nospammode              : Do not obfuscate addresses
    -nosubjectthreads        : Do not check subjects for threads
+   -nosubjecttxt <text>     : Text to use if message has no subject
    -nosubsort               : Do not sort messages by subject
    -notetext <text>         : Text data of annotation if -annotation specified

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