Remove things related to no longer existing show parsetree, ESIS, and raw errors options.

11 files changed, 22 insertions, 118 deletions

diff --git a/htdocs/config/validator.conf b/htdocs/config/validator.conf
index a123857..a36532d 100644
--- a/htdocs/config/validator.conf
+++ b/htdocs/config/validator.conf
@@ -1,7 +1,7 @@
 
 # Main Configuration File for the W3C Markup Validation Service.
 #
-# $Id: validator.conf,v 1.34 2009-03-26 19:41:02 ot Exp $
+# $Id: validator.conf,v 1.35 2009-09-05 11:45:16 ville Exp $
 #
 # See 'perldoc Config::General' for the syntax, and be aware that the
 # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*',
@@ -77,10 +77,6 @@ Maintainer = www-validator@w3.org
 # The "Home Page" for the service.  Make sure this ends with a slash.
 Home Page = http://validator.w3.org/
 
-#
-# Base URI for the Element Reference.
-Element Ref URI = http://www.htmlhelp.com/reference/html40/
-
 # Localization
 # only English available for now
 Languages = en
@@ -92,7 +88,7 @@ Languages = en
 #
 
 #
-# Maps element names to URLs (cf. "Element Ref URI" above).
+# Maps element names to URLs.
 <Elements>
   Include eref.cfg
 </Elements>
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index 9ebaf5e..ed82ec5 100755
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: install.html,v 1.53 2009-06-29 20:30:47 ville Exp $"
---><!--#set var="date" value="\$Date: 2009-06-29 20:30:47 $"
+<!--#set var="revision" value="\$Id: install.html,v 1.54 2009-09-05 11:45:16 ville Exp $"
+--><!--#set var="date" value="\$Date: 2009-09-05 11:45:16 $"
 --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -320,8 +320,7 @@ HTML5 = http://localhost:8888/html5/
 		        <dt>eref.cfg</dt>
 		        <dd>
 		          Contains the mappings from element names to a URL path
-		          (relative to a configurable URL) for their definitions. Used
-		          in output when the "Show Parse Tree" option is enabled.
+		          (relative to a configurable URL) for their definitions.
 		        </dd>
 		        <dt>types.conf</dt>
 		        <dd>
diff --git a/htdocs/docs/install_win.html b/htdocs/docs/install_win.html
index e3a7d68..2a2a3c9 100644
--- a/htdocs/docs/install_win.html
+++ b/htdocs/docs/install_win.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: install_win.html,v 1.20 2009-06-29 18:21:16 ville Exp $" 
---><!--#set var="date" value="\$Date: 2009-06-29 18:21:16 $" 
+<!--#set var="revision" value="\$Id: install_win.html,v 1.21 2009-09-05 11:45:16 ville Exp $" 
+--><!--#set var="date" value="\$Date: 2009-09-05 11:45:16 $" 
 --><!--#set var="title" value="Installation Documentation for The W3C Markup Validation Service (Windows, Apache)" 
 --><!--#set var="relroot" value="../" 
 --><!--#include virtual="../header.html" -->
@@ -270,7 +270,7 @@ Include conf/extra/httpd-manual.conf
 <pre>#
 # Main Configuration File for the W3C Markup Validation Service.
 #
-# $Id: install_win.html,v 1.20 2009-06-29 18:21:16 ville Exp $
+# $Id: install_win.html,v 1.21 2009-09-05 11:45:16 ville Exp $
 #
 # See 'perldoc Config::General' for the syntax, and be aware that the
 # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*',
@@ -346,10 +346,6 @@ Maintainer = www-validator@w3.org
 # The &quot;Home Page&quot; for the service.  Make sure this ends with a slash.
 Home Page = http://validator.example.org/
 
-#
-# Base URI for the Element Reference.
-Element Ref URI = http://www.htmlhelp.com/reference/html40/
-
 # Localization
 # only English available for now
 Languages = en
@@ -361,7 +357,7 @@ Languages = en
 #
 
 #
-# Maps element names to URLs (cf. &quot;Element Ref URI&quot; above).
+# Maps element names to URLs.
 &lt;Elements&gt;
   Include eref.cfg
 &lt;/Elements&gt;
diff --git a/htdocs/docs/users.html b/htdocs/docs/users.html
index 2b9dc9c..0173402 100755
--- a/htdocs/docs/users.html
+++ b/htdocs/docs/users.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: users.html,v 1.32 2008-07-22 13:04:52 ot Exp $"
---><!--#set var="date" value="\$Date: 2008-07-22 13:04:52 $"
+<!--#set var="revision" value="\$Id: users.html,v 1.33 2009-09-05 11:45:16 ville Exp $"
+--><!--#set var="date" value="\$Date: 2009-09-05 11:45:16 $"
 --><!--#set var="title" value="User Documentation for The W3C Markup Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -104,13 +104,13 @@
         will validate the www.example.com home page.
       </p>
       <p>
-        The various options are listed above in the section
-        "<a href="#Options">The Options</a>" in parenthesis after the long
-        name. To add options to your links directly, append the options
-        separated by a semi-colon. For example
-        &lt;<a href="http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1;sp=1">http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1;sp=1</a>&gt;
-        will validate the example.com home page with "Show Source", "Outline" and
-        "Show Parse Tree" on, but "Exclude Attributes" off.
+        The various options are listed below in the section
+        "<a href="#Options">Options and Parameters</a>" in parenthesis after
+        the longname. To add options to your links directly, append the options
+        separated by a semicolon. For example
+        &lt;<a href="http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1">http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1</a>&gt;
+        will validate the example.com home page with "Show Source", and
+        "Outline" on, but "Verbose" off.
       </p>
       <p>
         You may also see these separated by ampersands, but this usage is
diff --git a/htdocs/results.css b/htdocs/results.css
index fbcea24..aae76ae 100644
--- a/htdocs/results.css
+++ b/htdocs/results.css
@@ -1,5 +1,5 @@
 /* style sheet for the validator's results page          */
-/* $Id: results.css,v 1.33 2007-02-07 15:25:10 ot Exp $ */
+/* $Id: results.css,v 1.34 2009-09-05 11:45:16 ville Exp $ */
 
 .input {
   color: black;
@@ -275,10 +275,3 @@ td.invalid
 img.inline-badge {
   float: left;
 }
-
-
-div.mtb { /* "Medium Thematic Break" */
-  margin-top: 5em;
-  border-top: 1px solid black;
-}
-
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index b4ccff7..4e5790e 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -14,7 +14,7 @@
 # This source code is available under the license at:
 #     http://www.w3.org/Consortium/Legal/copyright-software
 #
-# $Id: check,v 1.684 2009-09-05 10:46:02 ville Exp $
+# $Id: check,v 1.685 2009-09-05 11:45:16 ville Exp $
 #
 # Disable buffering on STDOUT!
 $| = 1;
@@ -206,7 +206,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.684 $;
+  $VERSION =  q$Revision: 1.685 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -416,10 +416,6 @@ $q = &prepCGI($File, $q);
 $File->{Opt}->{'Outline'}        = $q->param('outline') ? TRUE                   :  FALSE;
 $File->{Opt}->{'Show Source'}    = $q->param('ss')      ? TRUE                   :  FALSE;
 $File->{Opt}->{'Show Tidy'}      = $q->param('st')      ? TRUE                   :  FALSE;
-$File->{Opt}->{'Show Parsetree'} = $q->param('sp')      ? TRUE                   :  FALSE;
-$File->{Opt}->{'No Attributes'}  = $q->param('noatt')   ? TRUE                   :  FALSE;
-$File->{Opt}->{'Show ESIS'}      = $q->param('esis')    ? TRUE                   :  FALSE;
-$File->{Opt}->{'Show Errors'}    = $q->param('errors')  ? TRUE                   :  FALSE;
 $File->{Opt}->{'Verbose'}        = $q->param('verbose') ? TRUE                   :  FALSE;
 $File->{Opt}->{'Group Errors'}   = $q->param('group') ? TRUE                   :  FALSE;
 $File->{Opt}->{'Debug'}          = $q->param('debug')   ? TRUE                   :  FALSE;
@@ -427,7 +423,6 @@ $File->{Opt}->{'No200'}          = $q->param('No200')   ? TRUE
 $File->{Opt}->{'Charset'}        = $q->param('charset') ? lc $q->param('charset'):     '';
 $File->{Opt}->{'DOCTYPE'}        = $q->param('doctype') ? $q->param('doctype')   :     '';
 $File->{Opt}->{'Output'}         = $q->param('output')  ? $q->param('output')    : 'html';
-$File->{Opt}->{'Max Errors'}     = $q->param('me')      ? $q->param('me')        :     '';
 $File->{Opt}->{'Prefill'}        = $q->param('prefill') ? TRUE                   :  FALSE;
 $File->{Opt}->{'Prefill Doctype'}        = $q->param('prefill_doctype') ? $q->param('prefill_doctype')   :     'html401';
 
@@ -1282,12 +1277,6 @@ $template->param(file_warnings => $File->{Warnings});
 $template->param(tidy_output => $File->{'Tidy'});
 $template->param(file_source => &source($File))
   if ($template->param('opt_show_source') or ($File->{'Is Upload'}) or ($File->{'Direct Input'}));
-#$template->param('opt_show_esis' => TRUE)
-#  if $File->{Opt}->{'Show ESIS'};
-#$template->param('opt_show_raw_errors' => TRUE)
-#  if $File->{Opt}->{'Show Errors'};
-#$template->param('file_raw_errors' => &show_errors($File))
-#  if $template->param('opt_show_raw_errors');
 
 if ($File->{Opt}->{Output} eq 'json') {
   # No JSON escaping in HTML::Template (and "JS" is not the right thing here)
@@ -1357,8 +1346,6 @@ sub prep_template ($$) {
   $T->param(opt_show_source    => $File->{Opt}->{'Show Source'});
   $T->param(opt_show_tidy    => $File->{Opt}->{'Show Tidy'});
   $T->param(opt_show_outline   => $File->{Opt}->{'Outline'});
-  $T->param(opt_show_parsetree => $File->{Opt}->{'Show Parsetree'});
-  $T->param(opt_show_noatt     => $File->{Opt}->{'No Attributes'});
   $T->param(opt_verbose        => $File->{Opt}->{'Verbose'});
   $T->param(opt_group_errors        => $File->{Opt}->{'Group Errors'});
   $T->param(opt_no200          => $File->{Opt}->{'No200'});
@@ -2423,17 +2410,6 @@ sub preparse_doctype {
 
 
 #
-# Print out the raw error output for debugging.
-sub show_errors ($) {
-  # @@FIXME This is broken with SGML::Parser::OpenSP
-  my $file_raw_errors = "";
-  for (@{shift->{DEBUG}->{Errors}}) {
-    $file_raw_errors .= ent $_;
-  }
-  return $file_raw_errors;
-}
-
-#
 # Preprocess CGI parameters.
 sub prepCGI {
   my $File = shift;
@@ -2945,7 +2921,7 @@ sub self_url_q {
   }
 
   # Boolean parameters
-  for my $param (qw(ss sp noatt outline No200 verbose group)) {
+  for my $param (qw(ss outline No200 verbose group)) {
     $thispage .= "$param=1;" if $q->param($param);
   }
 
@@ -2982,8 +2958,6 @@ sub self_url_file {
   $thispage .= qq(?uri=$escaped_uri);
   $thispage .= ';ss=1'      if $File->{Opt}->{'Show Source'};
   $thispage .= ';st=1'      if $File->{Opt}->{'Show Tidy'};
-  $thispage .= ';sp=1'      if $File->{Opt}->{'Show Parsetree'};
-  $thispage .= ';noatt=1'   if $File->{Opt}->{'No Attributes'};
   $thispage .= ';outline=1' if $File->{Opt}->{'Outline'};
   $thispage .= ';No200=1'   if $File->{Opt}->{'No200'};
   $thispage .= ';verbose=1' if $File->{Opt}->{'Verbose'};
diff --git a/share/templates/en_US/jumpbar.tmpl b/share/templates/en_US/jumpbar.tmpl
index 9d72a9c..32d449f 100644
--- a/share/templates/en_US/jumpbar.tmpl
+++ b/share/templates/en_US/jumpbar.tmpl
@@ -20,17 +20,7 @@
   <TMPL_IF NAME="opt_show_tidy">
           <li><a title="Listing of cleaned-up Source Input" href="#tidy">Tidy Source</a></li>
   </TMPL_IF>
-
-  <TMPL_IF NAME="opt_show_parsetree">
-          <li><a title="Document Parse Tree" href="#parse">Parse&nbsp;Tree</a></li>
-  </TMPL_IF>
   <TMPL_IF NAME="opt_show_outline">
           <li><a title="Document Outline" href="#outlineresult">Outline</a></li>
   </TMPL_IF>
-  <TMPL_IF NAME="opt_show_esis">
-          <li><a title="ESIS" href="#raw_esis">ESIS</a></li>
-  </TMPL_IF>
-  <TMPL_IF NAME="opt_show_raw_errors">
-          <li><a title="Raw Errors" href="#raw_errors">Raw Errors</a></li>
-  </TMPL_IF>
         </ul>
diff --git a/share/templates/en_US/opt_show_esis.tmpl b/share/templates/en_US/opt_show_esis.tmpl
deleted file mode 100644
index e4ccc64..0000000
--- a/share/templates/en_US/opt_show_esis.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
- <div id="raw_esis" class="mtb">
-    <hr />
-    <h3><a name="raw_esis">Raw ESIS Output</a></h3>
-    <pre>
-      <TMPL_VAR NAME="file_esis">
-    </pre>
- </div>
-
diff --git a/share/templates/en_US/opt_show_parsetree.tmpl b/share/templates/en_US/opt_show_parsetree.tmpl
deleted file mode 100644
index 52dd1c7..0000000
--- a/share/templates/en_US/opt_show_parsetree.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-  <div id="parse">
-    <h3>Parse Tree</h3>
-    <p class="note">
-<TMPL_IF NAME="file_parsetree_noatt">
-      I am excluding the attributes, as you requested.
-<TMPL_ELSE>
-      You can also view this parse tree without attributes by selecting the
-      appropriate option on <a href="#form">the form</a>.
-</TMPL_IF>
-    </p>
-    <pre>
-<TMPL_VAR NAME="file_parsetree">
-    </pre>
-  </div>
diff --git a/share/templates/en_US/opt_show_raw_errors.tmpl b/share/templates/en_US/opt_show_raw_errors.tmpl
deleted file mode 100644
index 3c5b981..0000000
--- a/share/templates/en_US/opt_show_raw_errors.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
-  <div id="raw_errors" class="mtb">
-    <hr />
-    <h3><a name="raw_errors">Raw Error Output</a></h3>
-    <pre>
-      <TMPL_VAR NAME="file_raw_errors">
-    </pre>
-  </div>
-
diff --git a/share/templates/en_US/result.tmpl b/share/templates/en_US/result.tmpl
index 25de72c..86fd95d 100644
--- a/share/templates/en_US/result.tmpl
+++ b/share/templates/en_US/result.tmpl
@@ -32,19 +32,5 @@
         <TMPL_INCLUDE NAME="opt_show_outline.tmpl">
       </TMPL_IF>
 
-      <TMPL_IF NAME="opt_show_parsetree">
-        <TMPL_INCLUDE NAME="opt_show_parsetree.tmpl">
-      </TMPL_IF>
-
-      <TMPL_IF NAME="opt_show_esis">
-        <TMPL_INCLUDE NAME="opt_show_esis.tmpl">
-      </TMPL_IF>
-
-      <TMPL_IF NAME="opt_show_raw_errors">
-        <TMPL_INCLUDE NAME="opt_show_raw_errors.tmpl">
-      </TMPL_IF>
-
-
-
 
 <TMPL_INCLUDE NAME="footer.tmpl">