diff --git a/ChangeLog b/ChangeLog index 5d166a0e..876f7814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sun Sep 24 20:32:52 CEST 2000 Daniel Veillard + + * xpath.c: patch for normalize-string() substring-before(), + substring-after() and translate() functions from Bjorn Reese + + * libxml.m4 Makefile.am: added libxml.m4 from Debian ? + Fredrik Hallenberg + * TODO: updated + Sun Sep 24 10:00:49 CEST 2000 Daniel Veillard * xmlversion.h.in nanoftp.c nanohttp.c: traying to work out the diff --git a/Makefile.am b/Makefile.am index 3383660f..9368c662 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,8 @@ LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@ man_MANS = xmllint.1 libxml.4 +m4datadir = $(datadir)/aclocal m4data_DATA = libxml.m4 + xmllint_SOURCES=xmllint.c xmllint_LDFLAGS = xmllint_DEPENDENCIES = $(DEPS) @@ -352,7 +354,7 @@ CLEANFILES=xmlConf.sh confexecdir=$(libdir) confexec_DATA = xmlConf.sh -EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec \ +EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \ example/Makefile.am example/gjobread.c example/gjobs.xml \ $(man_MANS) diff --git a/TODO b/TODO index 1fd2e445..0b1dd36c 100644 --- a/TODO +++ b/TODO @@ -35,6 +35,9 @@ TODO: the old document, for example namespace declarations or entities references can also be a nasty problem, far more than updating the doc values. +- jamesh suggestion: SAX like functions to save a document ie. call a + function to open a new element with given attributes, write character + data, close last element, etc TODO: ===== diff --git a/libxml.m4 b/libxml.m4 new file mode 100644 index 00000000..1a03d570 --- /dev/null +++ b/libxml.m4 @@ -0,0 +1,144 @@ +dnl Code shamelessly stolen from glib-config by Sebastian Rittau +dnl AM_PATH_XML([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +AC_DEFUN(AM_PATH_XML,[ +AC_ARG_WITH(xml-prefix, + [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], + xml_config_prefix="$withval", xml_config_prefix="") +AC_ARG_ENABLE(xmltest, + [ --disable-xmltest Do not try to compile and run a test XML program],, + enable_xmltest=yes) + + if test x$xml_config_prefix != x ; then + xml_config_args="$xml_config_args --prefix=$xml_config_prefix" + if test x${XML_CONFIG+set} != xset ; then + XML_CONFIG=$xml_config_prefix/bin/xml-config + fi + fi + + AC_PATH_PROG(XML_CONFIG, xml-config, no) + min_xml_version=ifelse([$1], ,2.0.0, [$1]) + AC_MSG_CHECKING(for libxml - version >= $min_xml_version) + no_xml="" + if test "$XML_CONFIG" = "no" ; then + no_xml=yes + else + XML_CFLAGS=`$XML_CONFIG $xml_config_args --cflags` + XML_LIBS=`$XML_CONFIG $xml_config_args --libs` + xml_config_major_version=`$XML_CONFIG $xml_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + xml_config_minor_version=`$XML_CONFIG $xml_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + xml_config_micro_version=`$XML_CONFIG $xml_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_xmltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $XML_CFLAGS" + LIBS="$XML_LIBS $LIBS" +dnl +dnl Now check if the installed libxml is sufficiently new. +dnl + rm -f conf.xmltest + AC_TRY_RUN([ +#include +#include +#include +#include + +int +main() +{ + int major, minor, micro; + char *tmp_version; + + system("touch conf.xmltest"); + + tmp_version = g_strdup("$min_xml_version"); + if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_xml_version"); + exit(1); + } + + return 0; /* FIXME */ +#if 0 /* FIXME */ + if((xml_major_version != $xml_config_major_version) || + (xml_minor_version != $xml_config_minor_version) || + (xml_micro_version != $xml_config_micro_version)) + { + printf("\n*** 'xml-config --version' returned %d.%d.%d, but libxml (%d.%d.%d)\n", + $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version, + xml_major_version, xml_minor_version, xml_micro_version); + printf("*** was found! If xml-config was correct, then it is best\n"); + printf("*** to remove the old version of libxml. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If xml-config was wrong, set the environment variable XML_CONFIG\n"); + printf("*** to point to the correct copy of xml-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else + { + if ((xml_major_version > major) || + ((xml_major_version == major) && (xml_minor_version > minor)) || + ((xml_major_version == major) && (xml_minor_version == minor) && + (xml_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", + xml_major_version, xml_minor_version, xml_micro_version); + printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** libxml is always available from ftp://ftp.gnome.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the xml-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of libxml, but you can also set the XML_CONFIG environment to point to the\n"); + printf("*** correct copy of xml-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } +#endif + return 1; +} +],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + + if test "x$no_xml" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$XML_CONFIG" = "no" ; then + echo "*** The xml-config script installed by libxml could not be found" + echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the XML_CONFIG environment variable to the" + echo "*** full path to xml-config." + else + if test -f conf.xmltest ; then + : + else + echo "*** Could not run libxml test program, checking why..." + CFLAGS="$CFLAGS $XML_CFLAGS" + LIBS="$LIBS $XML_LIBS" + dnl FIXME: AC_TRY_LINK + fi + fi + + XML_CFLAGS="" + XML_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(XML_CFLAGS) + AC_SUBST(XML_LIBS) + rm -f conf.xmltest +]) diff --git a/xpath.c b/xpath.c index 03b5392f..7826a72b 100644 --- a/xpath.c +++ b/xpath.c @@ -2760,8 +2760,29 @@ xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs) { */ void xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs) { - CHECK_ARITY(2); - TODO /* substring before */ + xmlXPathObjectPtr str; + xmlXPathObjectPtr find; + xmlBufferPtr target; + const xmlChar *point; + int offset; + + CHECK_ARITY(2); + find = valuePop(ctxt); + str = valuePop(ctxt); + + target = xmlBufferCreate(); + if (target) { + point = xmlStrstr(str->stringval, find->stringval); + if (point) { + offset = (int)(point - str->stringval); + xmlBufferAdd(target, str->stringval, offset); + } + valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + xmlBufferFree(target); + } + + xmlXPathFreeObject(str); + xmlXPathFreeObject(find); } /** @@ -2778,8 +2799,30 @@ xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs) { */ void xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs) { - CHECK_ARITY(2); - TODO /* substring after */ + xmlXPathObjectPtr str; + xmlXPathObjectPtr find; + xmlBufferPtr target; + const xmlChar *point; + int offset; + + CHECK_ARITY(2); + find = valuePop(ctxt); + str = valuePop(ctxt); + + target = xmlBufferCreate(); + if (target) { + point = xmlStrstr(str->stringval, find->stringval); + if (point) { + offset = (int)(point - str->stringval) + xmlStrlen(find->stringval); + xmlBufferAdd(target, &str->stringval[offset], + xmlStrlen(str->stringval) - offset); + } + valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + xmlBufferFree(target); + } + + xmlXPathFreeObject(str); + xmlXPathFreeObject(find); } /** @@ -2796,8 +2839,49 @@ xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs) { */ void xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs) { + xmlXPathObjectPtr obj = NULL; + xmlChar *source = NULL; + xmlBufferPtr target; + xmlChar blank; + + if (nargs < 1) { + /* Use current context node */ + CHECK_ARITY(0); + TODO /* source = xmlNodeGetContent(ctxt->context->node); */ + } else if (nargs >= 1) { + /* Use argument */ CHECK_ARITY(1); - TODO /* normalize isn't as boring as translate, but pretty much */ + obj = valuePop(ctxt); + if (obj == NULL) XP_ERROR(XPATH_INVALID_OPERAND); + source = obj->stringval; + } + target = xmlBufferCreate(); + if (target && source) { + + /* Skip leading whitespaces */ + while (IS_BLANK(*source)) + source++; + + /* Collapse intermediate whitespaces, and skip trailing whitespaces */ + blank = 0; + while (*source) { + if (IS_BLANK(*source)) { + blank = *source; + } else { + if (blank) { + xmlBufferAdd(target, &blank, 1); + blank = 0; + } + xmlBufferAdd(target, source, 1); + } + source++; + } + + valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + xmlBufferFree(target); + } + if (obj) + xmlXPathFreeObject(obj); } /** @@ -2821,8 +2905,39 @@ xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs) { */ void xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { - CHECK_ARITY(3); - TODO /* translate is boring, waiting for UTF-8 representation too */ + xmlXPathObjectPtr str; + xmlXPathObjectPtr from; + xmlXPathObjectPtr to; + xmlBufferPtr target; + int i, offset, max; + xmlChar ch; + const xmlChar *point; + + CHECK_ARITY(3); + + to = valuePop(ctxt); + from = valuePop(ctxt); + str = valuePop(ctxt); + + target = xmlBufferCreate(); + if (target) { + max = xmlStrlen(to->stringval); + for (i = 0; (ch = str->stringval[i]); i++) { + point = xmlStrchr(from->stringval, ch); + if (point) { + /* Warning: This may not work with UTF-8 */ + offset = (int)(point - from->stringval); + if (offset < max) + xmlBufferAdd(target, &to->stringval[offset], 1); + } else + xmlBufferAdd(target, &ch, 1); + } + } + valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + xmlBufferFree(target); + xmlXPathFreeObject(str); + xmlXPathFreeObject(from); + xmlXPathFreeObject(to); } /**