mhonarc-commits
[Top] [All Lists]

CVS: mhonarc/MHonArc/lib mhinit.pl,2.33,2.34 mhopt.pl,2.27,2.28

2002-06-26 22:30:04
Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv23128/lib

Modified Files:
	mhinit.pl mhopt.pl 
Log Message:
* Release notes updated about upgrading from v2.1.x, or earlier archive.
  Running a later version is safe, but all MIME-related resources will
  be reset to default values.  For v2.5.8, and later, the MIMEARGS
  setting will preserved.
* DOCURL set to 'http://www.mhonarc.org/' if it is equal to old
  value of 'http://www.oac.uci.edu/indiv/ehood/mhonarc.html'.


Index: mhinit.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhinit.pl,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** mhinit.pl	27 Jun 2002 00:12:40 -0000	2.33
--- mhinit.pl	27 Jun 2002 05:00:01 -0000	2.34
***************
*** 275,422 ****
  $DBPathName	= '';	# Full pathname of database file
  
! ##----------------------------------------------------------------------
! ##	BEGIN readmail.pl variable settings
! ##----------------------------------------------------------------------
! ##	Default filters
! ##
! %readmail::MIMEFilters = (
!     # Content-type			Filter
!     #-------------------------------------------------------------------
!     "application/ms-tnef",		"m2h_null::filter",
!     "application/octet-stream",		"m2h_external::filter",
!     "application/x-patch",		"m2h_text_plain::filter",
!     "message/delivery-status",  	"m2h_text_plain::filter",
!     "message/external-body",   		"m2h_msg_extbody::filter",
!     "message/partial",   		"m2h_text_plain::filter",
!     "text/enriched",    		"m2h_text_enriched::filter",
!     "text/html",			"m2h_text_html::filter",
!     "text/plain",			"m2h_text_plain::filter",
!     "text/richtext",    		"m2h_text_enriched::filter",
!     "text/setext",			"m2h_text_setext::filter",
!     "text/tab-separated-values",	"m2h_text_tsv::filter",
!     "text/x-html",			"m2h_text_html::filter",
!     "text/x-setext",    		"m2h_text_setext::filter",
! 
!     "application/*",		 	"m2h_external::filter",
!     "audio/*",				"m2h_external::filter",
!     "chemical/*",  			"m2h_external::filter",
!     "image/*",  			"m2h_external::filter",
!     "model/*",  			"m2h_external::filter",
!     "text/*",   			"m2h_text_plain::filter",
!     "video/*",  			"m2h_external::filter",
! 
!     "x-sun-attachment",			"m2h_text_plain::filter",
! );
! %readmail::MIMEFiltersSrc = (
!     # Content-type			Filter
!     #-------------------------------------------------------------------
!     "application/ms-tnef",		"mhnull.pl",
!     "application/octet-stream",		"mhexternal.pl",
!     "application/x-patch",		"mhtxtplain.pl",
!     "message/delivery-status",  	"mhtxtplain.pl",
!     "message/external-body",   		"mhmsgextbody.pl",
!     "message/partial",   		"mhtxtplain.pl",
!     "text/enriched",    		"mhtxtenrich.pl",
!     "text/html",			"mhtxthtml.pl",
!     "text/plain",			"mhtxtplain.pl",
!     "text/richtext",    		"mhtxtenrich.pl",
!     "text/setext",			"mhtxtsetext.pl",
!     "text/tab-separated-values",	"mhtxttsv.pl",
!     "text/x-html",			"mhtxthtml.pl",
!     "text/x-setext",    		"mhtxtsetext.pl",
! 
!     "application/*",		 	"mhexternal.pl",
!     "audio/*",				"mhexternal.pl",
!     "chemical/*",  			"mhexternal.pl",
!     "image/*",  			"mhexternal.pl",
!     "model/*",  			"mhexternal.pl",
!     "text/*",   			"mhtxtplain.pl",
!     "video/*",  			"mhexternal.pl",
! 
!     "x-sun-attachment",			"mhtxtplain.pl",
! );
! $IsDefault{'MIMEFILTERS'} = 1;
! 
! ##  Default filter arguments
! ##
! %readmail::MIMEFiltersArgs = (
!     # Content-type			Arguments
!     #-------------------------------------------------------------------
!     'm2h_external::filter',		'inline',
! );
! $IsDefault{'MIMEARGS'} = 1;
! 
! ##  Charset filters
! ##
! %readmail::MIMECharSetConverters = (
!     # Character set			Converter Function
!     #-------------------------------------------------------------------
!     "plain",     			"mhonarc::htmlize",
!     "us-ascii",   			"mhonarc::htmlize",
!     "iso-8859-1",   			"mhonarc::htmlize",
!     "iso-8859-2",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-3",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-4",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-5",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-6",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-7",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-8",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-9",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-10",   			"MHonArc::CharEnt::str2sgml",
!     "iso-8859-15",   			"MHonArc::CharEnt::str2sgml",
!     "iso-2022-jp",   			"iso_2022_jp::str2html",
!     "latin1",   			"mhonarc::htmlize",
!     "latin2",   			"MHonArc::CharEnt::str2sgml",
!     "latin3",   			"MHonArc::CharEnt::str2sgml",
!     "latin4",   			"MHonArc::CharEnt::str2sgml",
!     "latin5",   			"MHonArc::CharEnt::str2sgml",
!     "latin6",   			"MHonArc::CharEnt::str2sgml",
!     "latin9",   			"MHonArc::CharEnt::str2sgml",
!     "windows-1250",   			"MHonArc::CharEnt::str2sgml",
!     "windows-1252",   			"MHonArc::CharEnt::str2sgml",
!     "default",     			"-ignore-",
! );
! %readmail::MIMECharSetConvertersSrc = (
!     # Character set			Converter Function
!     #-------------------------------------------------------------------
!     "plain",     			undef,
!     "us-ascii",   			undef,
!     "iso-8859-1",   			undef,
!     "iso-8859-2",   			"MHonArc/CharEnt.pm",
!     "iso-8859-3",   			"MHonArc/CharEnt.pm",
!     "iso-8859-4",   			"MHonArc/CharEnt.pm",
!     "iso-8859-5",   			"MHonArc/CharEnt.pm",
!     "iso-8859-6",   			"MHonArc/CharEnt.pm",
!     "iso-8859-7",   			"MHonArc/CharEnt.pm",
!     "iso-8859-8",   			"MHonArc/CharEnt.pm",
!     "iso-8859-9",   			"MHonArc/CharEnt.pm",
!     "iso-8859-10",   			"MHonArc/CharEnt.pm",
!     "iso-8859-15",   			"MHonArc/CharEnt.pm",
!     "iso-2022-jp",   			"iso2022jp.pl",
!     "latin1",   			undef,
!     "latin2",   			"MHonArc/CharEnt.pm",
!     "latin3",   			"MHonArc/CharEnt.pm",
!     "latin4",   			"MHonArc/CharEnt.pm",
!     "latin5",   			"MHonArc/CharEnt.pm",
!     "latin6",   			"MHonArc/CharEnt.pm",
!     "latin9",   			"MHonArc/CharEnt.pm",
!     "windows-1250",   			"MHonArc/CharEnt.pm",
!     "windows-1252",   			"MHonArc/CharEnt.pm",
!     "default",     			undef,
! );
! $IsDefault{'CHARSETCONVERTERS'} = 1;
! 
! ##  Content-Transfer-Encoding decoders:
! ##    readmail.pl has a default set, so we just use it.
! ##
! $IsDefault{'MIMEDECODERS'} = 1;
! 
! ##  Content-Types to exclude:
! ##    Nothing is excluded by default.
! $IsDefault{'MIMEEXCS'} = 1;
! 
! ##------------------------------------------------------------------------
! ##	END readmail.pl variable settings
! ##------------------------------------------------------------------------
  
  ##  Variable to hold function for converting message header text.
--- 275,280 ----
  $DBPathName	= '';	# Full pathname of database file
  
! ##  Initialize readmail variables
! mhinit_readmail_vars();
  
  ##  Variable to hold function for converting message header text.
***************
*** 734,737 ****
--- 592,740 ----
  		#	indexes of messages or for processing
  		#	old version data.
+ 
+ }
+ 
+ ##---------------------------------------------------------------------------##
+ 
+ sub mhinit_readmail_vars {
+ 
+ ##----------------------------------------------------------------------
+ ##	Default filters
+ ##
+ %readmail::MIMEFilters = (
+     # Content-type			Filter
+     #-------------------------------------------------------------------
+     "application/ms-tnef",		"m2h_null::filter",
+     "application/octet-stream",		"m2h_external::filter",
+     "application/x-patch",		"m2h_text_plain::filter",
+     "message/delivery-status",  	"m2h_text_plain::filter",
+     "message/external-body",   		"m2h_msg_extbody::filter",
+     "message/partial",   		"m2h_text_plain::filter",
+     "text/enriched",    		"m2h_text_enriched::filter",
+     "text/html",			"m2h_text_html::filter",
+     "text/plain",			"m2h_text_plain::filter",
+     "text/richtext",    		"m2h_text_enriched::filter",
+     "text/setext",			"m2h_text_setext::filter",
+     "text/tab-separated-values",	"m2h_text_tsv::filter",
+     "text/x-html",			"m2h_text_html::filter",
+     "text/x-setext",    		"m2h_text_setext::filter",
+ 
+     "application/*",		 	"m2h_external::filter",
+     "audio/*",				"m2h_external::filter",
+     "chemical/*",  			"m2h_external::filter",
+     "image/*",  			"m2h_external::filter",
+     "model/*",  			"m2h_external::filter",
+     "text/*",   			"m2h_text_plain::filter",
+     "video/*",  			"m2h_external::filter",
+ 
+     "x-sun-attachment",			"m2h_text_plain::filter",
+ );
+ %readmail::MIMEFiltersSrc = (
+     # Content-type			Filter
+     #-------------------------------------------------------------------
+     "application/ms-tnef",		"mhnull.pl",
+     "application/octet-stream",		"mhexternal.pl",
+     "application/x-patch",		"mhtxtplain.pl",
+     "message/delivery-status",  	"mhtxtplain.pl",
+     "message/external-body",   		"mhmsgextbody.pl",
+     "message/partial",   		"mhtxtplain.pl",
+     "text/enriched",    		"mhtxtenrich.pl",
+     "text/html",			"mhtxthtml.pl",
+     "text/plain",			"mhtxtplain.pl",
+     "text/richtext",    		"mhtxtenrich.pl",
+     "text/setext",			"mhtxtsetext.pl",
+     "text/tab-separated-values",	"mhtxttsv.pl",
+     "text/x-html",			"mhtxthtml.pl",
+     "text/x-setext",    		"mhtxtsetext.pl",
+ 
+     "application/*",		 	"mhexternal.pl",
+     "audio/*",				"mhexternal.pl",
+     "chemical/*",  			"mhexternal.pl",
+     "image/*",  			"mhexternal.pl",
+     "model/*",  			"mhexternal.pl",
+     "text/*",   			"mhtxtplain.pl",
+     "video/*",  			"mhexternal.pl",
+ 
+     "x-sun-attachment",			"mhtxtplain.pl",
+ );
+ $IsDefault{'MIMEFILTERS'} = 1;
+ 
+ ##  Default filter arguments
+ ##
+ %readmail::MIMEFiltersArgs = (
+     # Content-type			Arguments
+     #-------------------------------------------------------------------
+     'm2h_external::filter',		'inline',
+ );
+ $IsDefault{'MIMEARGS'} = 1;
+ 
+ ##  Charset filters
+ ##
+ %readmail::MIMECharSetConverters = (
+     # Character set			Converter Function
+     #-------------------------------------------------------------------
+     "plain",     			"mhonarc::htmlize",
+     "us-ascii",   			"mhonarc::htmlize",
+     "iso-8859-1",   			"mhonarc::htmlize",
+     "iso-8859-2",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-3",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-4",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-5",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-6",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-7",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-8",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-9",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-10",   			"MHonArc::CharEnt::str2sgml",
+     "iso-8859-15",   			"MHonArc::CharEnt::str2sgml",
+     "iso-2022-jp",   			"iso_2022_jp::str2html",
+     "latin1",   			"mhonarc::htmlize",
+     "latin2",   			"MHonArc::CharEnt::str2sgml",
+     "latin3",   			"MHonArc::CharEnt::str2sgml",
+     "latin4",   			"MHonArc::CharEnt::str2sgml",
+     "latin5",   			"MHonArc::CharEnt::str2sgml",
+     "latin6",   			"MHonArc::CharEnt::str2sgml",
+     "latin9",   			"MHonArc::CharEnt::str2sgml",
+     "windows-1250",   			"MHonArc::CharEnt::str2sgml",
+     "windows-1252",   			"MHonArc::CharEnt::str2sgml",
+     "default",     			"-ignore-",
+ );
+ %readmail::MIMECharSetConvertersSrc = (
+     # Character set			Converter Function
+     #-------------------------------------------------------------------
+     "plain",     			undef,
+     "us-ascii",   			undef,
+     "iso-8859-1",   			undef,
+     "iso-8859-2",   			"MHonArc/CharEnt.pm",
+     "iso-8859-3",   			"MHonArc/CharEnt.pm",
+     "iso-8859-4",   			"MHonArc/CharEnt.pm",
+     "iso-8859-5",   			"MHonArc/CharEnt.pm",
+     "iso-8859-6",   			"MHonArc/CharEnt.pm",
+     "iso-8859-7",   			"MHonArc/CharEnt.pm",
+     "iso-8859-8",   			"MHonArc/CharEnt.pm",
+     "iso-8859-9",   			"MHonArc/CharEnt.pm",
+     "iso-8859-10",   			"MHonArc/CharEnt.pm",
+     "iso-8859-15",   			"MHonArc/CharEnt.pm",
+     "iso-2022-jp",   			"iso2022jp.pl",
+     "latin1",   			undef,
+     "latin2",   			"MHonArc/CharEnt.pm",
+     "latin3",   			"MHonArc/CharEnt.pm",
+     "latin4",   			"MHonArc/CharEnt.pm",
+     "latin5",   			"MHonArc/CharEnt.pm",
+     "latin6",   			"MHonArc/CharEnt.pm",
+     "latin9",   			"MHonArc/CharEnt.pm",
+     "windows-1250",   			"MHonArc/CharEnt.pm",
+     "windows-1252",   			"MHonArc/CharEnt.pm",
+     "default",     			undef,
+ );
+ $IsDefault{'CHARSETCONVERTERS'} = 1;
+ 
+ ##  Content-Transfer-Encoding decoders:
+ ##    readmail.pl has a default set, so we just use it.
+ ##
+ $IsDefault{'MIMEDECODERS'} = 1;
+ 
+ ##  Content-Types to exclude:
+ ##    Nothing is excluded by default.
+ $IsDefault{'MIMEEXCS'} = 1;
  
  }

Index: mhopt.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhopt.pl,v
retrieving revision 2.27
retrieving revision 2.28
diff -C2 -r2.27 -r2.28
*** mhopt.pl	7 Jun 2002 17:45:09 -0000	2.27
--- mhopt.pl	27 Jun 2002 05:00:01 -0000	2.28
***************
*** 379,382 ****
--- 379,383 ----
  		    unless $QUIET;
  		&update_data_1_to_2();
+ 		&update_data_2_1_to_later();
  		&update_data_2_4_to_later();
  	    }
***************
*** 385,388 ****
--- 386,392 ----
  		print STDOUT "Updating database $DbVERSION data ...\n"
  		    unless $QUIET;
+ 		if ($DbVERSION =~ /^2\.[01]\./) {
+ 		    &update_data_2_1_to_later();
+ 		}
  		&update_data_2_4_to_later();
  	    }
***************
*** 674,677 ****
--- 678,686 ----
      delete($Refs{''});
  
+     # update DOCURL if default old value
+     if ($DOCURL eq 'http://www.oac.uci.edu/indiv/ehood/mhonarc.html') {
+ 	$DOCURL = 'http://www.mhonarc.org/';
+     }
+ 
      ## Check if printing process time
      $TIME = $opt{'time'};
***************
*** 738,744 ****
--- 747,766 ----
  
  ##---------------------------------------------------------------------------
+ ##	Update 2.1, or earlier, data.
+ ##
+ sub update_data_2_1_to_later {
+     # we can preserve filter arguments
+     if (defined(%main::MIMEFiltersArgs)) {
+ 	warn qq/         preserving MIMEARGS...\n/;
+ 	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
+ 	$IsDefault{'MIMEARGS'} = 0;
+     }
+ }
+ 
+ ##---------------------------------------------------------------------------
  ##	Update 2.4, or earlier, data.
  ##
  sub update_data_2_4_to_later {
+     # convert Perl 4 style data to Perl 5 style
      my($index, $value);
      while (($index, $value) = each(%Refs)) {

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