darlinghq/darling-libxslt
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-libxslt.git synced 2024-12-04 18:28:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added the --stringparam option applied John Fleck's patch to correct the

Browse Source 
* xsltproc/xsltproc.c: added the --stringparam option
* xsltproc/xsltproc.c: applied John Fleck's patch to correct
  the --novalid behaviour.
Daniel
This commit is contained in:
Daniel Veillard 2002-01-08 16:25:24 +00:00
parent 87f19fd476
commit 8b43203f5d
3 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Jan 8 17:21:02 CET 2002 Daniel Veillard <daniel@veillard.com>
* xsltproc/xsltproc.c: added the --stringparam option
* xsltproc/xsltproc.c: applied John Fleck's patch to correct
the --novalid behaviour.
Tue Jan 8 13:51:08 CET 2002 Daniel Veillard <daniel@veillard.com>
* doc/site.xsl doc/*.html: added a DocBook section docbook.html

5
tests/REC/Makefile.am
View File

@ -67,7 +67,10 @@ EXTRA_DIST = \
test-8-1.out test-8-1.xml test-8-1.xsl \
test-9.1-1.out test-9.1-1.xml test-9.1-1.xsl \
test-9.1-2.out test-9.1-2.xml test-9.1-2.xsl \
test-9.2-1.xsl
test-9.2-1.xsl \
stand-2.7-1.dtd stand-2.7-1.stand.out stand-2.7-1.xsl \
stand-2.7-1.out stand-2.7-1.xml
all: test

52
xsltproc/xsltproc.c
View File

@ -102,6 +102,8 @@ static int profile = 0;
static const char *params[MAX_PARAMETERS + 1];
static int nbparams = 0;
static xmlChar *strparams[MAX_PARAMETERS + 1];
static int nbstrparams = 0;
static const char *output = NULL;
static int errorno = 0;
@ -306,7 +308,7 @@ static void usage(const char *name) {
printf("\t--timing: display the time used\n");
printf("\t--repeat: run the transformation 20 times\n");
printf("\t--debug: dump the tree of the result instead\n");
printf("\t--novalid: skip the Dtd loading phase\n");
printf("\t--novalid skip the Dtd loading phase\n");
printf("\t--noout: do not dump the result\n");
printf("\t--maxdepth val : increase the maximum depth\n");
#ifdef LIBXML_HTML_ENABLED
@ -316,7 +318,10 @@ static void usage(const char *name) {
printf("\t--docbook: the input document is SGML docbook\n");
#endif
printf("\t--param name value : pass a (parameter,value) pair\n");
printf("\t string values must be quoted like \"'string'\"\n");
printf("\t value is an XPath expression.");
printf("\t string values must be quoted like \"'string'\"\n or");
printf("\t use stringparam to avoid it\n");
printf("\t--stringparam name value : pass a (parameter,string value) pair\n");
printf("\t--nonet refuse to fetch DTDs or entities over network\n");
#ifdef LIBXML_CATALOG_ENABLED
printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n");
@ -347,10 +352,6 @@ main(int argc, char **argv)
xmlLineNumbersDefault(1);
if (novalid == 0)
xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
else
xmlLoadExtDtdDefaultValue = 0;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-"))
break;
@ -444,6 +445,37 @@ main(int argc, char **argv)
fprintf(stderr, "too many params increase MAX_PARAMETERS \n");
return (2);
}
} else if ((!strcmp(argv[i], "-stringparam")) ||
(!strcmp(argv[i], "--stringparam"))) {
const xmlChar *string;
xmlChar *value;
int len;
i++;
params[nbparams++] = argv[i++];
string = (const xmlChar *) argv[i];
len = xmlStrlen(string);
if (xmlStrchr(string, '"')) {
if (xmlStrchr(string, '\'')) {
fprintf(stderr,
"stringparam contains both quote and double-quotes !\n");
return(8);
}
value = xmlStrdup((const xmlChar *)"'");
value = xmlStrcat(value, string);
value = xmlStrcat(value, (const xmlChar *)"'");
} else {
value = xmlStrdup((const xmlChar *)"\"");
value = xmlStrcat(value, string);
value = xmlStrcat(value, (const xmlChar *)"\"");
}
params[nbparams++] = (const char *) value;
strparams[nbstrparams++] = value;
if (nbparams >= MAX_PARAMETERS) {
fprintf(stderr, "too many params increase MAX_PARAMETERS \n");
return (2);
}
} else if ((!strcmp(argv[i], "-maxdepth")) ||
(!strcmp(argv[i], "--maxdepth"))) {
int value;
@ -461,6 +493,12 @@ main(int argc, char **argv)
}
params[nbparams] = NULL;
if (novalid == 0)
xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
else
xmlLoadExtDtdDefaultValue = 0;
/*
* Replace entities with their content.
*/
@ -557,6 +595,8 @@ main(int argc, char **argv)
}
if (cur != NULL)
xsltFreeStylesheet(cur);
for (i = 0;i < nbstrparams;i++)
xmlFree(strparams[i]);
done:
xsltCleanupGlobals();
xmlCleanupParser();