[m-rev.] for review: fix web site install

[Ian MacLarty]

On Wed, Apr 09, 2008 at 03:29:35PM +1000, Julien Fischer wrote:
>
> On Wed, 9 Apr 2008, Ian MacLarty wrote:
>
>> On Wed, Apr 9, 2008 at 1:29 PM, Julien Fischer
>> <juliensf at csse.unimelb.edu.au> wrote:
>>>
>>>  On Wed, 9 Apr 2008, Ian MacLarty wrote:
>>>
>>>
>>>> For review by anyone.
>>>>
>>>> Estimated hours taken: 0.5
>>>> Branches: main
>>>>
>>>> Fix Mercury web site install problem.  The problem seems to be that
>>>> the cp option "--preserve=modes" (implied by -a) is not supported.  The
>>> fix
>>>> here is to just remove this option.
>>>>
>>>> Makefile.common:
>>>> tutorial/Makefile:
>>>> tutorial/tutorial/Makefile:
>>>>   Change cp command options.
>>>>
>>>
>>>  Oddly enough --preserve=modes seems to work everywhere except when
>>>  copying the images.
>>>
>>>  The diff is fine.
>>>
>>
>> Committed.  I noticed that the htdig search doesn't work either.  Any 
>> ideas why?
>> It returns no results for search terms like "type".
>
> The configuration file we have is several versions older than the htdig
> on earth; I thought we were just going to get rid of it and use the
> google search thing instead.
>

For review:

Estimated hours taken: 0.5
Branches: main

Remove links to htdig search, which no longer works.

include/search.inc:
	Remove htdig form from site search page.

mailing-lists/include/mailing-lists.inc:
include/menubar.inc:
	Replace links to the mailing list search page with direct links to
	the custome google search page for the Mercury mailing lists.

Index: include/menubar.inc
===================================================================
RCS file: /home/mercury1/repository/w3/include/menubar.inc,v
retrieving revision 1.23
diff -u -r1.23 menubar.inc
--- include/menubar.inc	21 Sep 2007 04:35:42 -0000	1.23
+++ include/menubar.inc	9 Apr 2008 07:47:38 -0000
@@ -69,7 +69,7 @@
     <a href="<?echo $root?>/mailing-lists/mercury-developers/list.html">Developers</a><BR>
     <a href="<?echo $root?>/mailing-lists/mercury-reviews/list.html">Reviews</a><BR>
     <a href="<?echo $root?>/mailing-lists/mercury-users/list.html">Users</a><BR>
-    <a href="<?echo $root?>/mailing-lists/search.html">Search</a><BR>
+    <a href="http://www.google.com/coop/cse?cx=012477532374267650353%3Aiclg2f0j3-s">Search</a><BR>
 </SMALL>
 <?
 }
Index: include/search.inc
===================================================================
RCS file: /home/mercury1/repository/w3/include/search.inc,v
retrieving revision 1.4
diff -u -r1.4 search.inc
--- include/search.inc	13 Feb 2001 01:26:42 -0000	1.4
+++ include/search.inc	9 Apr 2008 07:49:32 -0000
@@ -1,36 +1,5 @@
-<h1>
-Mercury Web Site Search</H1>
+<h1>Mercury Web Site Search</h1>
 <hr noshade size=4>
-This search will allow you to search the contents of
-the Mercury web site <B>excluding</B> the mailing lists.
-<A HREF="mailing-lists/search.html">Click here</A> to search
-the mailing list archive.
-<br>
-<p>
-<form method="post" action="http://www.mercury.cs.mu.oz.au/cgi-bin/htsearch">
-<font size=-1>
-Match: <select name=method>
-<option value=and>All
-<option value=or>Any
-</select>
-Format: <select name=format>
-<option value=builtin-long>Long
-<option value=builtin-short>Short
-</select>
-</font>
-<input type=hidden name=config value=htdig-mercury>
-<input type=hidden name=restrict value="">
-<input type=hidden name=exclude value="mailing-lists">
-<br>
-Search:
-<input type="text" size="30" name="words" value="">
-<input type="submit" value="Search">
-<a href="http://htdig.sdsu.edu"><IMG SRC="<?echo $root?>/images/htdig.gif" align=bottom alt="ht://Dig" border=0></a>
-</form>
-<hr noshade size=4>
-
-You may also wish to try searching this site using Google.
-
 <!-- Search Google -->
 <center>
 <FORM method=GET action=http://www.google.com/search>
Index: mailing-lists/include/mailing-lists.inc
===================================================================
RCS file: /home/mercury1/repository/w3/mailing-lists/include/mailing-lists.inc,v
retrieving revision 1.6
diff -u -r1.6 mailing-lists.inc
--- mailing-lists/include/mailing-lists.inc	8 Jan 2004 02:29:01 -0000	1.6
+++ mailing-lists/include/mailing-lists.inc	9 Apr 2008 07:39:20 -0000
@@ -14,21 +14,21 @@
 The <code>mercury-users</code> list is intended for general discussion
 about Mercury and related matters of interest to Mercury users.<br>
 It is <A HREF="mercury-users/list.html">archived</A> and
-<A HREF="search.html">searchable</A>.
+<A HREF="http://www.google.com/coop/cse?cx=012477532374267650353%3Aiclg2f0j3-s">searchable</A>.
 
 <li> The <code>mercury-ads</code> list is intended for advertisments of things
 that are not directly related to Mercury but which may be of interest to
 Mercury users, e.g. job ads, conference announcements, calls for
 papers/participation, and the like.<br>
 It is <A HREF="mercury-ads/list.html">archived</A> and
-<A HREF="search.html">searchable</A>.
+<A HREF="http://www.google.com/coop/cse?cx=012477532374267650353%3Aiclg2f0j3-s">searchable</A>.
 
 <li>
 The <code>mercury-developers</code> list is intended for general discussion
 about the development of Mercury and the Mercury implementation and related
 matters of interest to the developers of Mercury.<br>
 It is <A HREF="mercury-developers/list.html">archived</A> and
-<A HREF="search.html">searchable</A>.
+<A HREF="http://www.google.com/coop/cse?cx=012477532374267650353%3Aiclg2f0j3-s">searchable</A>.
 Note that in recent times, most the actual development discussion seems to be
 done on the mercury-reviews list, rather than mercury-developers.<br>
 
@@ -39,7 +39,7 @@
 list is specifically for posting diffs, reviews of diffs, and discussion of
 issues raised in such reviews.  It tends to be a fairly high-volume list.<br>
 It is <A HREF="mercury-reviews/list.html">archived</A> and
-<A HREF="search.html">searchable</A>.
+<A HREF="http://www.google.com/coop/cse?cx=012477532374267650353%3Aiclg2f0j3-s">searchable</A>.
 </ul>
 
 <h3>Subscribing and unsubscribing</h3>
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------