DOn't use ZOOM -- layout.mc does that.

Refactor to make only a single call to form.mc

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index 28f46db..e66684d 100644 (file)
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -1,17 +1,12 @@
-%# $Id: edit.mc,v 1.11 2006-11-15 17:56:23 mike Exp $
+%# $Id: edit.mc,v 1.12 2006-11-16 11:50:03 mike Exp $

 <%args>
 $id => undef
 </%args>
 <%args>
 $id => undef
 </%args>

-<%once>
-use ZOOM;
-</%once>

 <%perl>
 my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
                                user => "admin", password => "fruitbat");
 <%perl>
 my $conn = new ZOOM::Connection("localhost:3313/IR-Explain---1", 0,
                                user => "admin", password => "fruitbat");

-if (!defined $id || $id eq "") {
-    $m->comp("/details/form.mc", id => undef, conn => $conn,
-            rec => '<explain xmlns="http://explain.z3950.org/dtd/2.0/"/>');
-} else {
+my $rec = '<explain xmlns="http://explain.z3950.org/dtd/2.0/"/>';
+if (defined $id && $id ne "") {

     $conn->option(elementSetName => "zeerex");
     my $qid = $id;
     $qid =~ s/"/\\"/g;
     $conn->option(elementSetName => "zeerex");
     my $qid = $id;
     $qid =~ s/"/\\"/g;

@@ -19,11 +14,10 @@ if (!defined $id || $id eq "") {
     my $rs = $conn->search(new ZOOM::Query::CQL($query));
     my $n = $rs->size();
     if ($n == 0) {
     my $rs = $conn->search(new ZOOM::Query::CQL($query));
     my $n = $rs->size();
     if ($n == 0) {

-       $m->comp("/details/form.mc", id => undef, conn => $conn,
-                rec => '<explain xmlns="http://explain.z3950.org/dtd/2.0/"/>');
+       $id = undef;

     } else {
     } else {

-       my $rec = $rs->record(0);
-       $m->comp("/details/form.mc", id => $id, conn => $conn, rec => $rec);
+       $rec = $rs->record(0);

     }
 }
 </%perl>
     }
 }
 </%perl>

+<& /details/form.mc, id => $id, conn => $conn, rec => $rec &>