Commit1646586

committed

Attached is a patch that adds the function xml_encode_special_chars to

the xml2 contrib module. It's against 8.0beta4. It's intended forcommit.Markus Bertheau <twanger@bluetwanger.de>

1 parent7af770d commit1646586Copy full SHA for 1646586

File tree

+32

-0

lines changed

+32

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`CREATE OR REPLACE FUNCTION xml_valid(text) RETURNS bool`
`4`	`4`	`AS 'MODULE_PATHNAME' LANGUAGE 'c' WITH (isStrict);`
`5`	`5`
	`6`	`+CREATE OR REPLACE FUNCTION xml_encode_special_chars(text) RETURNS text`
	`7`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' WITH (isStrict);`
	`8`	`+`
`6`	`9`	`CREATE OR REPLACE FUNCTION xpath_string(text,text) RETURNS text`
`7`	`10`	`AS 'MODULE_PATHNAME' LANGUAGE 'c' WITH (isStrict);`
`8`	`11`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ static xmlXPathObjectPtr pgxml_xpath(text document, xmlChar xpath);`
`40`	`40`
`41`	`41`
`42`	`42`	`Datumxml_valid(PG_FUNCTION_ARGS);`
	`43`	`+Datumxml_encode_special_chars(PG_FUNCTION_ARGS);`
`43`	`44`	`Datumxpath_nodeset(PG_FUNCTION_ARGS);`
`44`	`45`	`Datumxpath_string(PG_FUNCTION_ARGS);`
`45`	`46`	`Datumxpath_number(PG_FUNCTION_ARGS);`
`@@ -186,6 +187,34 @@ xml_valid(PG_FUNCTION_ARGS)`
`186`	`187`	`}`
`187`	`188`
`188`	`189`
	`190`	`+/* Encodes special characters (<, >, &, " and \r) as XML entities */`
	`191`	`+`
	`192`	`+PG_FUNCTION_INFO_V1(xml_encode_special_chars);`
	`193`	`+`
	`194`	`+Datum`
	`195`	`+xml_encode_special_chars(PG_FUNCTION_ARGS)`
	`196`	`+{`
	`197`	`+text*tin=PG_GETARG_TEXT_P(0);`
	`198`	`+text*tout;`
	`199`	`+int32ressize;`
	`200`	`+xmlCharts,tt;`
	`201`	`+`
	`202`	`+ts=pgxml_texttoxmlchar(tin);`
	`203`	`+`
	`204`	`+tt=xmlEncodeSpecialChars(NULL,ts);`
	`205`	`+`
	`206`	`+pfree(ts);`
	`207`	`+`
	`208`	`+ressize=strlen(tt);`
	`209`	`+tout= (text*)palloc(ressize+VARHDRSZ);`
	`210`	`+memcpy(VARDATA(tout),tt,ressize);`
	`211`	`+VARATT_SIZEP(tout)=ressize+VARHDRSZ;`
	`212`	`+`
	`213`	`+xmlFree(tt);`
	`214`	`+`
	`215`	`+PG_RETURN_TEXT_P(tout);`
	`216`	`+}`
	`217`	`+`
`189`	`218`	`staticxmlChar`
`190`	`219`	`*`
`191`	`220`	`pgxmlNodeSetToText(xmlNodeSetPtrnodeset,`

Comments

(0)