X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=bfbe03b7c3993de464ce77cc5e59744dc2d3be03;hb=b52740e82ab92e99a6982bf5c99a30ac404bd557;hp=4322d2c8d8f456f6afa25f92d40c283c46bc17ce;hpb=74a4580ba9945fc86b47654230865a68089245b6;p=egate.git

diff --git a/www/z39util.tcl b/www/z39util.tcl
index 4322d2c..bfbe03b 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.7 1995/11/10 14:47:32 adam Exp $
+# $Id: z39util.tcl,v 1.8 1995/11/13 15:41:46 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -377,7 +377,7 @@ proc build-query {t} {
     return $q
 }
 
-proc z39search {setNo piggy tno} {
+proc z39search {setNo piggy tno elements} {
     global hist
     global sessionWait
 
@@ -405,7 +405,6 @@ proc z39search {setNo piggy tno} {
     if {$oldHost != $host} {
         catch [list $zz disconnect]
 
-        html "Connecting to target " $host " <br>\n"
         set sessionWait 0
         if {[catch [list $zz connect $host]]} {
             html "Cannot connect to target ${host} <br>\n"
@@ -444,8 +443,12 @@ proc z39search {setNo piggy tno} {
         return 1
     }
     ir-set $zz.$setNo $zz
+    $zz.$setNo smallSetElementSetNames $elements
+    $zz.$setNo mediumSetElementSetNames $elements
+    $zz.$setNo recordElements $elements
     eval $zz.$setNo databaseNames $database
 
+
     $zz.$setNo preferredRecordSyntax USMARC
 
     $zz callback search-response $setNo
@@ -523,7 +526,7 @@ proc search-m-response {setNo i} {
     set zstatus($i) 2
 }
 
-proc z39msearch {setNo piggy} {
+proc z39msearch {setNo piggy elements} {
     global zleft
     global zstatus
     global hist
@@ -552,6 +555,7 @@ proc z39msearch {setNo piggy} {
             set zstatus($i) 1
             continue
         }
+        z39$i idAuthentication $hist($setNo,$i,idAuthentication)
         html "Connecting to target " $host " <br>\n"
         set zstatus($i) -1
         if {![catch {z39$i connect $host}]} {
@@ -572,6 +576,11 @@ proc z39msearch {setNo piggy} {
             ir-set z39$i.$setNo z39$i
             set hist($setNo,$i,offset) 0
             eval z39$i.$setNo databaseNames $hist($setNo,$i,database)
+
+            z39$i.$setNo smallSetElementSetNames $elements
+            z39$i.$setNo mediumSetElementSetNames $elements
+            z39$i.$setNo recordElements $elements
+
             z39$i.$setNo preferredRecordSyntax USMARC
             z39$i callback [list search-m-response $setNo $i]
 
@@ -607,7 +616,7 @@ proc z39msearch {setNo piggy} {
     }
 }
 
-proc z39present {setNo tno setOffset setMax dfunc} {
+proc z39present {setNo tno setOffset setMax dfunc elements} {
     global hist
     global sessionWait
 
@@ -617,6 +626,8 @@ proc z39present {setNo tno setOffset setMax dfunc} {
         set zz z39
     }
 
+    $zz.$setNo elementSetNames $elements
+    $zz.$setNo recordElements $elements
     set toGet [expr 1 + $setMax - $setOffset]
     while {$setMax > 0 && $toGet > 0} {
         for {set got 0} {$got < $toGet} {incr got} {