cleaned up the output of SAX tests, Daniel
diff --git a/ChangeLog b/ChangeLog
index c24a6df..0906f23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 17 15:50:00 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * testSAX.c testHTML.c result/HTML/: cleanup of the output
+ of SAX tests
+
Mon Aug 14 13:56:33 EDT 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* Patch from Albert Chin-A-Young <china@thewrittenword.com>:
diff --git a/result/HTML/doc2.htm.sax b/result/HTML/doc2.htm.sax
index 3d02052..ee80794 100644
--- a/result/HTML/doc2.htm.sax
+++ b/result/HTML/doc2.htm.sax
@@ -1,6 +1,6 @@
SAX.setDocumentLocator()
SAX.startDocument()
-SAX.internalSubset(HTML, -//W3C//DTD HTML 4.0 Transitional//EN, (null))
+SAX.internalSubset(HTML, -//W3C//DTD HTML 4.0 Transitional//EN, )
SAX.comment( saved from url=(0016)http://intranet/ )
SAX.comment( BEGIN Naviscope Javascript )
SAX.startElement(html)
@@ -39,12 +39,12 @@
SAX.endElement(head)
SAX.startElement(body)
SAX.startElement(frameset, border='false', cols='172,*', frameBorder='0', frameSpacing='0')
-SAX.startElement(frame, marginHeight='0', marginWidth='0', name='left', noResize='(null)', scrolling='no', src='doc2_files/side.htm', target='rtop')
+SAX.startElement(frame, marginHeight='0', marginWidth='0', name='left', noResize, scrolling='no', src='doc2_files/side.htm', target='rtop')
SAX.endElement(frame)
SAX.startElement(frameset, rows='43,*')
-SAX.startElement(frame, marginHeight='0', marginWidth='0', name='rtop', noResize='(null)', scrolling='no', src='doc2_files/top.htm', target='rbottom')
+SAX.startElement(frame, marginHeight='0', marginWidth='0', name='rtop', noResize, scrolling='no', src='doc2_files/top.htm', target='rbottom')
SAX.endElement(frame)
-SAX.startElement(frame, name='rbottom', noResize='(null)', src='doc2_files/contents.htm', target='_top')
+SAX.startElement(frame, name='rbottom', noResize, src='doc2_files/contents.htm', target='_top')
SAX.endElement(frame)
SAX.endElement(frameset)
SAX.startElement(noframes)
diff --git a/result/HTML/doc3.htm.sax b/result/HTML/doc3.htm.sax
index 17c6734..4cb9ac4 100644
--- a/result/HTML/doc3.htm.sax
+++ b/result/HTML/doc3.htm.sax
Binary files differ
diff --git a/result/HTML/fp40.htm.sax b/result/HTML/fp40.htm.sax
index 94d2c5c..f181d62 100644
--- a/result/HTML/fp40.htm.sax
+++ b/result/HTML/fp40.htm.sax
@@ -1,6 +1,6 @@
SAX.setDocumentLocator()
SAX.startDocument()
-SAX.internalSubset(html, -//IETF//DTD HTML//EN, (null))
+SAX.internalSubset(html, -//IETF//DTD HTML//EN, )
SAX.startElement(html)
SAX.characters(
diff --git a/result/HTML/wired.html.sax b/result/HTML/wired.html.sax
index 75b5cea..d38d628 100644
--- a/result/HTML/wired.html.sax
+++ b/result/HTML/wired.html.sax
@@ -49,7 +49,7 @@
SAX.startElement(select, NAME='state')
SAX.characters(
, 2)
-SAX.startElement(option, VALUE='WA', SELECTED='(null)')
+SAX.startElement(option, VALUE='WA', SELECTED)
SAX.characters(WA
, 4)
SAX.startElement(option, VALUE='AL')
@@ -442,7 +442,7 @@
SAX.error: htmlParseEntityRef: expecting ';'
SAX.error: htmlParseEntityRef: expecting ';'
SAX.error: htmlParseEntityRef: expecting ';'
-SAX.startElement(option, value='http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=vignette.hts&Collection=vignette&QueryMode=Internet&Query=', selected='(null)')
+SAX.startElement(option, value='http://search.hotwired.com/search97/s97.vts?Action=FilterSearch&Filter=docs_filter.hts&ResultTemplate=vignette.hts&Collection=vignette&QueryMode=Internet&Query=', selected)
SAX.characters(Wired News, 10)
SAX.endElement(option)
SAX.characters(
diff --git a/result/noent/title.xml b/result/noent/title.xml
index 35c8fc9..1b3fe07 100644
--- a/result/noent/title.xml
+++ b/result/noent/title.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<title>my title</title>
diff --git a/result/title.xml b/result/title.xml
index 35c8fc9..1b3fe07 100644
--- a/result/title.xml
+++ b/result/title.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<title>my title</title>
diff --git a/test/title.xml b/test/title.xml
index d064d66..1b3fe07 100644
--- a/test/title.xml
+++ b/test/title.xml
@@ -1 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
<title>my title</title>
diff --git a/testHTML.c b/testHTML.c
index 721f0e5..d680cf0 100644
--- a/testHTML.c
+++ b/testHTML.c
@@ -143,20 +143,15 @@
internalSubsetDebug(void *ctx, const xmlChar *name,
const xmlChar *ExternalID, const xmlChar *SystemID)
{
- /* xmlDtdPtr externalSubset; */
-
- fprintf(stdout, "SAX.internalSubset(%s, %s, %s)\n",
- name, (ExternalID == NULL) ? "(null)" : ExternalID,
- (SystemID == NULL) ? "(null)" : SystemID);
-
-/***********
- if ((ExternalID != NULL) || (SystemID != NULL)) {
- externalSubset = xmlParseDTD(ExternalID, SystemID);
- if (externalSubset != NULL) {
- xmlFreeDtd(externalSubset);
- }
- }
- ***********/
+ fprintf(stdout, "SAX.internalSubset(%s,", name);
+ if (ExternalID == NULL)
+ fprintf(stdout, " ,");
+ else
+ fprintf(stdout, " %s,", ExternalID);
+ if (SystemID == NULL)
+ fprintf(stdout, " )\n");
+ else
+ fprintf(stdout, " %s)\n", SystemID);
}
/**
@@ -372,8 +367,9 @@
fprintf(stdout, "SAX.startElement(%s", (char *) name);
if (atts != NULL) {
for (i = 0;(atts[i] != NULL);i++) {
- fprintf(stdout, ", %s='", atts[i++]);
- fprintf(stdout, "%s'", (atts[i] == NULL) ? "(null)" : atts[i]);
+ fprintf(stdout, ", %s", atts[i++]);
+ if (atts[i] != NULL)
+ fprintf(stdout, "='%s'", atts[i]);
}
}
fprintf(stdout, ")\n");
diff --git a/testSAX.c b/testSAX.c
index fc1f573..7f3870a 100644
--- a/testSAX.c
+++ b/testSAX.c
@@ -142,19 +142,15 @@
internalSubsetDebug(void *ctx, const xmlChar *name,
const xmlChar *ExternalID, const xmlChar *SystemID)
{
- /* xmlDtdPtr externalSubset; */
-
- fprintf(stdout, "SAX.internalSubset(%s, %s, %s)\n",
- name, ExternalID, SystemID);
-
-/***********
- if ((ExternalID != NULL) || (SystemID != NULL)) {
- externalSubset = xmlParseDTD(ExternalID, SystemID);
- if (externalSubset != NULL) {
- xmlFreeDtd(externalSubset);
- }
- }
- ***********/
+ fprintf(stdout, "SAX.internalSubset(%s,", name);
+ if (ExternalID == NULL)
+ fprintf(stdout, " ,");
+ else
+ fprintf(stdout, " %s,", ExternalID);
+ if (SystemID == NULL)
+ fprintf(stdout, " )\n");
+ else
+ fprintf(stdout, " %s)\n", SystemID);
}
/**
@@ -371,7 +367,8 @@
if (atts != NULL) {
for (i = 0;(atts[i] != NULL);i++) {
fprintf(stdout, ", %s='", atts[i++]);
- fprintf(stdout, "%s'", atts[i]);
+ if (atts[i] != NULL)
+ fprintf(stdout, "%s'", atts[i]);
}
}
fprintf(stdout, ")\n");