cvs: php4 /ext/xslt sablot.c

sterling Sat Apr 20 20:41:37 2002 EDT Modified files: /php4/ext/xslt sablot.c Log: expletives deleted. Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.45 php4/ext/xslt/sablot.c:1.46 --- php4/ext/xslt/sablot.c:1.45 Sat Apr 20 20:27:04 2002 +++ php4/ext/xslt/sablot.c Sat Apr 20 20:41:37 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.45 2002/04/21 00:27:04 sterling Exp $ */ +/* $Id: sablot.c,v 1.46 2002/04/21 00:41:37 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,6 +30,7 @@ #if HAVE_SABLOT_BACKEND #include <sablot.h> +#include <sdom.h> #include <string.h> #include <stdarg.h> @@ -528,7 +529,7 @@ int argc; /* The number of arguments given */ int error; /* Our error container */ ulong num_key; /* Numerical key */ - + argc = ZEND_NUM_ARGS(); if (argc < 3 || argc > 6 || @@ -558,6 +559,7 @@ RETURN_FALSE; } + SablotAddArgTree(XSLT_CONTEXT(handle), XSLT_PROCESSOR(handle), "xml", @@ -570,8 +572,10 @@ /* Well, no result file was given or result buffer, that means (guess what?) * we're returning the result yipp di doo! */ - if (argc < 4 || Z_TYPE_PP(result_p) == IS_NULL) { - result = "arg:/result"; + if (argc < 4 || + Z_TYPE_PP(result_p) == IS_NULL || + !strcmp(Z_STRVAL_PP(result_p), "arg:/result")) { + result = "result"; SablotAddArgBuffer(XSLT_CONTEXT(handle), XSLT_PROCESSOR(handle), result,