[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/xml/rss decodeString,1.1.1.1,1.2,

[creecode <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/xml/rss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6386

Modified Files:
	decodeString 
Log Message:
replace calls to verbs at extensions.latinToMac with string.(latin/mac)To(Latin/Mac) verbs

Index: decodeString
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/xml/rss/decodeString,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** decodeString	26 Mar 2005 19:44:33 -0000	1.1.1.1
--- decodeString	7 Mar 2006 05:38:39 -0000	1.2
***************
*** 1,3 ****
! FrontierVcsFile:1:scpt:system.verbs.builtins.xml.rss.decodeString
  
! on decodeString (s, flNeuterMacros=true) {
	ÇChanges
		Ç11/30/02; 5:33:41 PM by JES
			ÇNew optional parameter, flNeuterMacros. Defaults to true, preserving existing behavior.
		Ç10/2/02; 9:04:47 PM by JES
			ÇDon't decode entities that were already decoded by xml.compile when the channel was loaded. Fixes the double-decoding bug where sample HTML text was being displayed in the news page as actual HTML.
		Ç3/15/02; 5:54:43 PM by DW
			ÇCreated. Factored out of xml.rss.compileService, so drivers can get at it.
	Çbundle //old code which caused double-decoding
		Çs = string.replaceAll (s, "'", "'") //work around a bug in xml.entityDecode
		Çs = xml.entitydecode (s, true, true)
	s = string.replaceAll (s, "'", "'");
	s = string.replaceAll (s, """, "\"");
	s = xml.entityDecode (s, false, true); //false means we don't want to decide &, > and < -- they've already been decoded by xml.compile.
	
	if flNeuterMacros {
		s = string.replaceall (s, "{", "{");
		s = string.replaceall (s, "}", "}");
		s = string.replaceall (s, "<%", "&lt;%")};
	if system.environment.isMac { //02/22/2001 JES: convert to Mac text on Macintoshes
		s = latinToMac.convert (s)};
	return (s)}
\ No newline at end of file
--- 1,30 ----
! FrontierVcsFile:2:scpt:system.verbs.builtins.xml.rss.decodeString
  
! on decodeString (s, flNeuterMacros=true) {
! 	«Changes
! 		«2/28/06; 12:34:02 PM by TAC
! 			«replace extensions.latinToMac.convert with string.latinToMac
! 		«2002
! 			«11/30/02; 5:33:41 PM by JES
! 				«New optional parameter, flNeuterMacros. Defaults to true, preserving existing behavior.
! 			«10/2/02; 9:04:47 PM by JES
! 				«Don't decode entities that were already decoded by xml.compile when the channel was loaded. Fixes the double-decoding bug where sample HTML text was being displayed in the news page as actual HTML.
! 			«3/15/02; 5:54:43 PM by DW
! 				«Created. Factored out of xml.rss.compileService, so drivers can get at it.
! 		«bundle //old code which caused double-decoding
! 			«s = string.replaceAll (s, "&apos;", "'") //work around a bug in xml.entityDecode
! 			«s = xml.entitydecode (s, true, true)
! 	
! 	s = string.replaceAll (s, "&apos;", "'");
! 	s = string.replaceAll (s, "&quot;", "\"");
! 	s = xml.entityDecode (s, false, true); //false means we don't want to decide &amp;, &gt; and &lt; -- they've already been decoded by xml.compile.
! 	
! 	if flNeuterMacros {
! 		s = string.replaceall (s, "{", "&#123;");
! 		s = string.replaceall (s, "}", "&#125;");
! 		s = string.replaceall (s, "<%", "&lt;%")};
! 	
! 	if system.environment.isMac { //02/22/2001 JES: convert to Mac text on Macintoshes
! 		s = string.latinToMac (s)};
! 	
! 	return (s)}
\ No newline at end of file