mhonarc-commits
[Top] [All Lists]

CVS: mhonarc/MHonArc/lib mhrcfile.pl,2.40,2.41

2004-03-15 13:28:32
Update of /home/users/mhonarc.org/ehood/cvs/mhonarc/mhonarc/MHonArc/lib
In directory denethor.mallorn.com:/tmp/cvs-serv13528

Modified Files:
	mhrcfile.pl 
Log Message:
[bug #7628]: Support either "BEG" or "BEGIN" for *BEG{IN} resources.


Index: mhrcfile.pl
===================================================================
RCS file: /home/users/mhonarc.org/ehood/cvs/mhonarc/mhonarc/MHonArc/lib/mhrcfile.pl,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -r2.40 -r2.41
*** mhrcfile.pl	15 Mar 2004 20:12:35 -0000	2.40
--- mhrcfile.pl	15 Mar 2004 20:28:23 -0000	2.41
***************
*** 130,134 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'authorbegin') {		# Begin for author group
  	    $AUTHBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 130,135 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'authorbegin' ||
! 	    $elem eq 'authorbeg') {		# Begin for author group
  	    $AUTHBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 189,193 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'daybegin') {		# Begin for day group
  	    $DAYBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 190,195 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'daybegin' ||
! 	    $elem eq 'daybeg') {		# Begin for day group
  	    $DAYBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 289,293 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'fieldsbeg') {		# Begin markup of mail head
  	    $FIELDSBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 291,296 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'fieldsbeg' ||
! 	    $elem eq 'fieldsbegin') {		# Begin markup of mail head
  	    $FIELDSBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 308,312 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'fldbeg') {		# Begin markup of field text
  	    $FLDBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 311,316 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'fldbeg' ||
! 	    $elem eq 'fldbegin') {		# Begin markup of field text
  	    $FLDBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 319,323 ****
  	    $DoFolRefs = 1; last FMTSW;
  	}
! 	if ($elem eq 'folupbegin') {		# Begin markup for follow-ups
  	    $FOLUPBEGIN = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 323,328 ----
  	    $DoFolRefs = 1; last FMTSW;
  	}
! 	if ($elem eq 'folupbegin' ||
! 	    $elem eq 'folupbeg') {		# Begin markup for follow-ups
  	    $FOLUPBEGIN = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 396,400 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'idxpgbegin') {		# Opening markup of index
  	    $IDXPGBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 401,406 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'idxpgbegin' ||
! 	    $elem eq 'idxpgbeg') {		# Opening markup of index
  	    $IDXPGBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 436,440 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'labelbeg') {		# Begin markup of label
  	    $LABELBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 442,447 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'labelbeg' ||
! 	    $elem eq 'labelbegin') {		# Begin markup of label
  	    $LABELBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 458,462 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'listbegin') {		# List begin
  	    $LIBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 465,470 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'listbegin' ||
! 	    $elem eq 'listbeg') {		# List begin
  	    $LIBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 642,646 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'msgpgbegin') {		# Opening markup of message
  	    $MSGPGBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 650,655 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'msgpgbegin' ||
! 	    $elem eq 'msgpgbeg') {		# Opening markup of message
  	    $MSGPGBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 863,867 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'refsbegin') {		# Explicit ref links begin
  	    $REFSBEGIN = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 872,877 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'refsbegin' ||
! 	    $elem eq 'refsbeg') {		# Explicit ref links begin
  	    $REFSBEGIN = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 932,936 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'subjectbegin') {		# Begin for subject group
  	    $SUBJECTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 942,947 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'subjectbegin' ||
! 	    $elem eq 'subjectbeg') {		# Begin for subject group
  	    $SUBJECTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 944,948 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'tcontbegin') {		# Thread cont. start
  	    $TCONTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 955,960 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'tcontbegin' ||
! 	    $elem eq 'tcontbeg') {		# Thread cont. start
  	    $TCONTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 1026,1030 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'tidxpgbegin') {		# Opening markup of thread idx
  	    $TIDXPGBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 1038,1043 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'tidxpgbegin' ||
! 	    $elem eq 'tidxpgbeg') {		# Opening markup of thread idx
  	    $TIDXPGBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 1052,1056 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'tindentbegin') {		# Thread indent start
  	    $TINDENTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 1065,1070 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'tindentbegin' ||
! 	    $elem eq 'tindentbeg') {		# Thread indent start
  	    $TINDENTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 1099,1103 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'tslicebeg') {		# Start of thread slice
  	    $TSLICEBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 1113,1118 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'tslicebeg' ||
! 	    $elem eq 'tslicebegin') {		# Start of thread slice
  	    $TSLICEBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 1117,1121 ****
            last FMTSW;
          }
!         if ($elem eq 'tslicetopbegin') {
            $TSLICETOPBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
--- 1132,1137 ----
            last FMTSW;
          }
!         if ($elem eq 'tslicetopbegin' ||
! 	    $elem eq 'tslicetopbeg') {
            $TSLICETOPBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
***************
*** 1125,1129 ****
            last FMTSW;
          }
!         if ($elem eq 'tslicesublistbeg') {
            $TSLICESUBLISTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
--- 1141,1146 ----
            last FMTSW;
          }
!         if ($elem eq 'tslicesublistbeg' ||
! 	    $elem eq 'tslicesublistbegin') {
            $TSLICESUBLISTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
***************
*** 1149,1153 ****
            last FMTSW;
          }
!         if ($elem eq 'tslicesubjectbeg') {
            $TSLICESUBJECTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
--- 1166,1171 ----
            last FMTSW;
          }
!         if ($elem eq 'tslicesubjectbeg' ||
! 	    $elem eq 'tslicesubjectbegin') {
            $TSLICESUBJECTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
***************
*** 1157,1161 ****
            last FMTSW;
          }
!         if ($elem eq 'tsliceindentbegin') {
            $TSLICEINDENTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
--- 1175,1180 ----
            last FMTSW;
          }
!         if ($elem eq 'tsliceindentbegin' ||
! 	    $elem eq 'tsliceindentbeg') {
            $TSLICEINDENTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
***************
*** 1165,1169 ****
            last FMTSW;
          }
!         if ($elem eq 'tslicecontbegin') {
            $TSLICECONTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
--- 1184,1189 ----
            last FMTSW;
          }
!         if ($elem eq 'tslicecontbegin' ||
! 	    $elem eq 'tslicecontbeg') {
            $TSLICECONTBEG = &get_elem_content($handle, $elem, $chop);
            last FMTSW;
***************
*** 1201,1205 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'tsublistbeg') {		# List begin in sub-thread
  	    $TSUBLISTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 1221,1226 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'tsublistbeg' ||
! 	    $elem eq 'tsublistbegin') {		# List begin in sub-thread
  	    $TSUBLISTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 1209,1213 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'tsubjectbeg') {		# Begin markup for sub thread
  	    $TSUBJECTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 1230,1235 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'tsubjectbeg' ||
! 	    $elem eq 'tsubjectbegin') {		# Begin markup for sub thread
  	    $TSUBJECTBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
***************
*** 1221,1225 ****
  	    last FMTSW;
  	}
! 	if ($elem eq 'ttopbegin') {		# Begin for top of a thread
  	    $TTOPBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;
--- 1243,1248 ----
  	    last FMTSW;
  	}
! 	if ($elem eq 'ttopbegin' ||		# Begin for top of a thread
! 	    $elem eq 'ttopbeg') {		# (more consistent name)
  	    $TTOPBEG = &get_elem_content($handle, $elem, $chop);
  	    last FMTSW;

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