lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

fix bug #109395 as pointed out by Ben Phillips and avoid some warnings

Browse Source 
* python/libxsl.py: fix bug #109395 as pointed out by Ben Phillips
  and avoid some warnings when loading the python modules on non
  Linux platforms.
* libxslt/transform.c: fix a bug introduced in the document lookup
  and exhibited by the keys test.
Daniel
This commit is contained in:
Daniel Veillard
2003-03-28 11:23:00 +00:00
parent d56e5f9e61
commit bb5c8d8a8b
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Mar 28 12:19:35 CET 2003 Daniel Veillard <daniel@veillard.com>
* python/libxsl.py: fix bug #109395 as pointed out by Ben Phillips
and avoid some warnings when loading the python modules on non
Linux platforms.
* libxslt/transform.c: fix a bug introduced in the document lookup
and exhibited by the keys test.
Wed Mar 26 22:41:00 CET 2003 Daniel Veillard <daniel@veillard.com> Wed Mar 26 22:41:00 CET 2003 Daniel Veillard <daniel@veillard.com>
* tests/docs/Makefile.am tests/docs/bug-113.* * tests/docs/Makefile.am tests/docs/bug-113.*

6
libxslt/transform.c
View File

@ -3064,7 +3064,8 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
(list->nodeTab[i]->doc->doc)!=ctxt->xpathCtxt->doc) { (list->nodeTab[i]->doc->doc)!=ctxt->xpathCtxt->doc) {
/* The nodeset is from another document, so must change */ /* The nodeset is from another document, so must change */
ctxt->xpathCtxt->doc=list->nodeTab[i]->doc->doc; ctxt->xpathCtxt->doc=list->nodeTab[i]->doc->doc;
if (list->nodeTab[i]->doc->name != NULL) { if ((list->nodeTab[i]->doc->name != NULL) ||
(list->nodeTab[i]->doc->URL != NULL)) {
ctxt->document = xsltFindDocument(ctxt, ctxt->document = xsltFindDocument(ctxt,
list->nodeTab[i]->doc->doc); list->nodeTab[i]->doc->doc);
ctxt->xpathCtxt->node = list->nodeTab[i]; ctxt->xpathCtxt->node = list->nodeTab[i];
@ -3419,7 +3420,8 @@ xsltForEach(xsltTransformContextPtr ctxt, xmlNodePtr node,
(list->nodeTab[i]->doc->doc)!=ctxt->xpathCtxt->doc) { (list->nodeTab[i]->doc->doc)!=ctxt->xpathCtxt->doc) {
/* The nodeset is from another document, so must change */ /* The nodeset is from another document, so must change */
ctxt->xpathCtxt->doc=list->nodeTab[i]->doc->doc; ctxt->xpathCtxt->doc=list->nodeTab[i]->doc->doc;
if (list->nodeTab[i]->doc->name != NULL) { if ((list->nodeTab[i]->doc->name != NULL) ||
(list->nodeTab[i]->doc->URL != NULL)) {
ctxt->document = xsltFindDocument(ctxt, ctxt->document = xsltFindDocument(ctxt,
list->nodeTab[i]->doc->doc); list->nodeTab[i]->doc->doc);
ctxt->xpathCtxt->node = list->nodeTab[i]; ctxt->xpathCtxt->node = list->nodeTab[i];

13
python/libxsl.py
View File

@ -17,18 +17,19 @@ else:
try: try:
import os import os
osname = os.uname()[0] osname = os.uname()[0]
if osname == 'Linux': if osname == 'Linux' or osname == 'SunOS':
RTLD_GLOBAL = 0x00100 RTLD_GLOBAL = 0x00100
RTLD_NOW = 0x00002 RTLD_NOW = 0x00002
# #
# is there a better method ? # is there a better method ?
# #
else: # else:
print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \ # print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
"on this platform: %s" % (osname) # "on this platform: %s" % (osname)
except: except:
print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \ pass
"on this platform: %s" % (osname) # print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
# "on this platform: %s" % (osname)
if RTLD_GLOBAL != -1 and RTLD_NOW != -1: if RTLD_GLOBAL != -1 and RTLD_NOW != -1:
try: try: