- Add constant XSLT_SABOPT_FILES_TO_HANDLER overriding the default

  behavior of Sablotron to handle files itself, even if a scheme-handler
  is registered.
- Implement xslt_getopt
- Modify behavior of xslt_setopt, so that it returns the previous value.

# All these need Sab CVS version > 2002/10/31

diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4
index 4b466e0299668240ae3f52df5a1f310ee0d01bd2..9d69355f3ac181a331def7694721aeab7b82648f 100644 (file)
--- a/ext/xslt/config.m4
+++ b/ext/xslt/config.m4
@@ -133,6 +133,12 @@ int main ()
       -L$XSLT_DIR/lib
     ])
 
+    dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31
+    AC_CHECK_LIB(sablot, SablotGetOptions,
+    [
+      AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions])
+    ])
+
     AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ])
   fi
 

diff --git a/ext/xslt/php_sablot.h b/ext/xslt/php_sablot.h
index fde066bc0bf87552b6a312977f6d95cc83c29d47..c35c9e001ecf134217605295f1a9ce6ee641ecf9 100644 (file)
--- a/ext/xslt/php_sablot.h
+++ b/ext/xslt/php_sablot.h
@@ -67,6 +67,9 @@ PHP_FUNCTION(xslt_errno);
 PHP_FUNCTION(xslt_free);
 PHP_FUNCTION(xslt_set_object);
 PHP_FUNCTION(xslt_setopt);
+#ifdef HAVE_SABLOT_GET_OPTIONS
+PHP_FUNCTION(xslt_getopt);
+#endif
 PHP_FUNCTION(xslt_backend_version);
 PHP_FUNCTION(xslt_backend_name);
 

diff --git a/ext/xslt/sablot.c b/ext/xslt/sablot.c
index 628a547699988f5697cf548df067cc0cc0adb633..12e5016447e32775b1bcd3db7dd6177b9bb36700 100644 (file)
--- a/ext/xslt/sablot.c
+++ b/ext/xslt/sablot.c
@@ -91,6 +91,9 @@ function_entry xslt_functions[] = {
        PHP_FE(xslt_free,                NULL)
        PHP_FE(xslt_set_object,          second_args_force_ref)
        PHP_FE(xslt_setopt,              NULL)
+#ifdef HAVE_SABLOT_GET_OPTIONS
+       PHP_FE(xslt_getopt,              NULL)
+#endif
        PHP_FE(xslt_backend_version,     NULL)
        PHP_FE(xslt_backend_name,        NULL)
        {NULL, NULL, NULL}
@@ -167,6 +170,9 @@ PHP_MINIT_FUNCTION(xslt)
        REGISTER_LONG_CONSTANT("XSLT_SABOPT_DISABLE_ADDING_META", SAB_DISABLE_ADDING_META, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("XSLT_SABOPT_DISABLE_STRIPPING", SAB_DISABLE_STRIPPING, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("XSLT_SABOPT_IGNORE_DOC_NOT_FOUND", SAB_IGNORE_DOC_NOT_FOUND, CONST_CS | CONST_PERSISTENT);
+#ifdef SAB_FILES_TO_HANDLER
+       REGISTER_LONG_CONSTANT("XSLT_SABOPT_FILES_TO_HANDLER", SAB_FILES_TO_HANDLER, CONST_CS | CONST_PERSISTENT);
+#endif
 
        return SUCCESS;
 }
@@ -669,7 +675,7 @@ PHP_FUNCTION(xslt_set_object)
 }
 /* }}} */
 
-/* {{{ proto int xslt_setopt(resource processor, int bitmask)
+/* {{{ proto int xslt_setopt(resource processor, int newmask)
    Set options on a given xsl processor */
 PHP_FUNCTION(xslt_setopt)
 {
@@ -677,7 +683,10 @@ PHP_FUNCTION(xslt_setopt)
        zval      **zbitmask;    /* A bitmask created by through processor specific constants */
        php_xslt  *handle;       /* A PHP-XSLT processor */
        int       error;         /* Error return codes */
-       int       bitmask;
+       int       newmask;       /* New mask */
+#ifdef HAVE_SABLOT_GET_OPTIONS
+       int       prevmask;      /* Previous mask */
+#endif
 
        if (ZEND_NUM_ARGS() != 2 ||
                zend_get_parameters_ex(2, &processor_p, &zbitmask) == FAILURE) {
@@ -687,36 +696,51 @@ PHP_FUNCTION(xslt_setopt)
        ZEND_FETCH_RESOURCE(handle, php_xslt *, processor_p, -1, le_xslt_name, le_xslt);
        convert_to_long_ex(zbitmask);
 
-       bitmask = Z_LVAL_PP(zbitmask);
-       if (bitmask < 0) {
-               php_error_docref("function.xslt-setopt" TSRMLS_CC, E_WARNING, "Invalid bitmask: %i", bitmask);
+       newmask = Z_LVAL_PP(zbitmask);
+       if (newmask < 0) {
+               php_error_docref("function.xslt-setopt" TSRMLS_CC, E_WARNING, "Invalid bitmask: %i", newmask);
                RETURN_FALSE;
        }
 
-       error = SablotSetOptions(XSLT_SITUATION(handle), bitmask);
+#ifdef HAVE_SABLOT_GET_OPTIONS
+       prevmask = SablotGetOptions(XSLT_SITUATION(handle));
+#endif
+       error = SablotSetOptions(XSLT_SITUATION(handle), newmask);
        if (error) {
                /* FIXME: Need to analyze the return code to give a more verbose error description */
                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to set options");
        }
 
-       /* FIXME:
-               now returning TRUE/FALSE, but should return the previous bitmask, so users can
-               temporarily set a certain option and restore the old value.
-               However - there's no API function in Sablotron to retrieve the current option set.
-               If that becomes available, the second argument should become optional, and if not 
-               specified the function should return the current value.
-               This would allow for:
-               <?php
-               $current_settings = xslt_setopt($xh);
-               // Add public entity support, retaining any options set at present
-               xslt_setopt($xh, $current_settings & XSLT_SAB_PARSE_PUBLIC_ENTITIES);
-               ?>
-       */
+#ifdef HAVE_SABLOT_GET_OPTIONS
+       RETURN_LONG(prevmask);
+#else
        RETURN_TRUE;
+#endif
 }
 
 /* }}} */
 
+#ifdef HAVE_SABLOT_GET_OPTIONS
+/* {{{ proto int xslt_getopt(resource processor)
+   Get options on a given xsl processor */
+PHP_FUNCTION(xslt_getopt)
+{
+       zval      **processor_p; /* Resource pointer to a PHP-XSLT processor */
+       php_xslt  *handle;       /* A PHP-XSLT processor */
+
+       if (ZEND_NUM_ARGS() != 1 ||
+               zend_get_parameters_ex(1, &processor_p) == FAILURE) {
+               WRONG_PARAM_COUNT;
+       }
+
+       ZEND_FETCH_RESOURCE(handle, php_xslt *, processor_p, -1, le_xslt_name, le_xslt);
+
+       RETURN_LONG(SablotGetOptions(XSLT_SITUATION(handle)));
+}
+
+/* }}} */
+#endif
+
 /* {{{ proto void xslt_backend_version()
    Returns the version number of Sablotron (if available) */
 PHP_FUNCTION(xslt_backend_version)