From b9dbc3e5b8d00a1bdcaff7949876fd34243dabb0 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Thu, 16 Nov 2006 17:02:30 +0000
Subject: [PATCH] Generation of ID from host/port/db moved from layout.mc to
 menu.mc, and no longer lodges the new ID in the params

---
 web/htdocs/chrome/layout.mc |   26 +++-----------------------
 web/htdocs/chrome/menu.mc   |   27 ++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index db22429..83614a0 100644
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -1,35 +1,15 @@
-%# $Id: layout.mc,v 1.17 2006-11-16 11:49:30 mike Exp $
+%# $Id: layout.mc,v 1.18 2006-11-16 17:02:30 mike Exp $
 <%args>
 $debug => undef
 $title
 $component
 </%args>
-<%perl>
-{
-    # Make up ID for newly created records.  It would be more
-    # rigorously correct, but insanely inefficient, to submit the
-    # record to Zebra and then search for it; but since we know the
-    # formula for IDs anyway, we just build one by hand.
-    my $id = $r->param("id");
-    my $host = $r->param("host");
-    my $port = $r->param("port");
-    my $dbname = $r->param("dbname");
-    #warn "id='$id', host='$host', port='$port', dbname='$dbname'";
-    #warn "%ARGS = {\n" . join("", map { "\t'$_' => '" . $ARGS{$_} . ",'\n" } sort keys %ARGS) . "}\n";
-    if ((!defined $id || $id eq "") &&
-	defined $host && defined $port && defined $dbname) {
-	$id = "$host:$port/$dbname";
-	$r->param(id => $id);
-	$ARGS{id} = $id;
-	#warn "id set to '$id'";
-    }
-}
-</%perl>
 <%once>
 use URI::Escape;
 use ZOOM;
 use ZOOM::IRSpy::Web;
-use ZOOM::IRSpy::Utils qw(irspy_xpath_context xml_encode modify_xml_document);
+use ZOOM::IRSpy::Utils qw(xml_encode cql_quote cql_target
+                          irspy_xpath_context modify_xml_document);
 </%once>
 <& /chrome/head.mc, title => $title &>
   <table border="0" cellpadding="0" cellspacing="0" width="100%">
diff --git a/web/htdocs/chrome/menu.mc b/web/htdocs/chrome/menu.mc
index d4d905b..9747b54 100644
--- a/web/htdocs/chrome/menu.mc
+++ b/web/htdocs/chrome/menu.mc
@@ -1,4 +1,4 @@
-%# $Id: menu.mc,v 1.13 2006-11-15 17:44:35 mike Exp $
+%# $Id: menu.mc,v 1.14 2006-11-16 17:02:30 mike Exp $
      <p>
       <a href="/"><b>Home</b></a><br/>
       <a href="/all.html">Test&nbsp;all&nbsp;targets</a><br/>
@@ -12,8 +12,29 @@
       <a href="/find.html?dc.title=^<% $i %>*&amp;_sort=dc.title&amp;_count=9999&amp;_search=Search"><tt><% uc($i) %></tt></a>
 % }
      </p>
-% our $rec;
-% my $id = $r->param("id");
+<%perl>
+our $rec;
+my $id = $r->param("id");
+{
+    # Make up ID for newly created records.  It would be more
+    # rigorously correct, but insanely inefficient, to submit the
+    # record to Zebra and then search for it; but since we know the
+    # formula for IDs anyway, we just build one by hand.
+    my $id = $r->param("id");
+    my $host = $r->param("host");
+    my $port = $r->param("port");
+    my $dbname = $r->param("dbname");
+    #warn "id='$id', host='$host', port='$port', dbname='$dbname'";
+    #warn "%ARGS = {\n" . join("", map { "\t'$_' => '" . $ARGS{$_} . ",'\n" } sort keys %ARGS) . "}\n";
+    if ((!defined $id || $id eq "") &&
+	defined $host && defined $port && defined $dbname) {
+	$id = "$host:$port/$dbname";
+#	$r->param(id => $id);
+#	$ARGS{id} = $id;
+	#warn "id set to '$id'";
+    }
+}
+</%perl>
 % if (!defined $id) {
 %    $rec = undef;
 % } else {
-- 
1.7.10.4