PATCH: restore search functionality

PATCH: restore search functionality

[Gerald Pfeifer]

This has been in my local tree for a few days (weeks), and I can't help
wondering why nobody complained about the missing search functionality?

  Use MetaHTML's <include> instead of Apache's, which has been
  recently disabled on gcc.gnu.org.

Gerald

Index: index.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/index.html,v
retrieving revision 1.317
diff -u -3 -p -r1.317 index.html
--- index.html	4 Jul 2002 21:29:39 -0000	1.317
+++ index.html	17 Jul 2002 14:13:58 -0000
@@ -257,7 +257,7 @@ microprocessor architecture, extending t
 </tr>
 </table>

-<!--#include virtual="/searchbox.ihtml"-->
+<include searchbox.ihtml>

 </body>
 </html>
Index: lists.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/lists.html,v
retrieving revision 1.77
diff -u -3 -p -r1.77 lists.html
--- lists.html	18 Feb 2002 18:24:37 -0000	1.77
+++ lists.html	17 Jul 2002 14:13:58 -0000
@@ -305,7 +305,7 @@ can do right now.</p>
 the lists</a>.</p>

 <a name="searchbox"></a>
-<!--#include virtual="/searchbox.ihtml"-->
+<include searchbox.ihtml>

 </body>
 </html>

Re: PATCH: restore search functionality

[Gerald Pfeifer]

On Wed, 17 Jul 2002, Gerald Pfeifer wrote:
> This has been in my local tree for a few days (weeks), and I can't help
> wondering why nobody complained about the missing search functionality?

And this is the second piece we need to make this work (and which should
also prove useful in the future):

  Set the MetaHTML include directory.

Gerald

Index: preprocess
===================================================================
RCS file: /cvs/gcc/wwwdocs/bin/preprocess,v
retrieving revision 1.30
diff -u -3 -p -r1.30 preprocess
--- preprocess	8 Jan 2002 13:01:22 -0000	1.30
+++ preprocess	17 Jul 2002 15:09:53 -0000
@@ -105,8 +105,11 @@ process_file()
             copy_if_different $f $DESTTREE/$f
             ;;
         *.html)
-            # Prepend the MetaHTML style and process the page.
-            cat $STYLE $f > $TMPDIR/input
+            # Prepend the MetaHTML style, set the MetaHTML include directory,
+            # and process the page.
+            cat $STYLE > $TMPDIR/input
+            printf '<set-var MHTML::INCLUDE-PREFIX="%s">\n' `pwd` >> $TMPDIR/input
+            cat $f >> $TMPDIR/input
             ${MHC} $TMPDIR/input > $TMPDIR/output

             # Copy the page only if it's new or there has been a change.