X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=737ca46c040b82fc4b6ec19744f214524376d4ac;hb=0d7108cd3425504a09522f915dda5c9158443084;hp=23fabd6bc6b7fb7bbb3d7393625dcf4b823f14ea;hpb=5bbe4c302d2d105aea7806317e9f31d5773a9536;p=egate.git

diff --git a/www/z39util.tcl b/www/z39util.tcl
index 23fabd6..737ca46 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.10 1995/11/14 09:53:16 adam Exp $
+# $Id: z39util.tcl,v 1.21 1996/01/12 13:08:30 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -43,6 +43,18 @@ proc search-response {zz} {
     }
 }
 
+proc scan-response {zz} {
+    global sessionWait
+
+    set status [$zz scanStatus]
+    if {$status == 6} {
+        displayError "Scan fail" ""
+        set sessionWait -2
+    } else {
+        set sessionWait 1
+    }
+}
+
 proc ok-response {} {
     global sessionWait
     set sessionWait 1
@@ -58,6 +70,8 @@ proc display-brief {zset no tno} {
     global setNo
     global sessionId
 
+
+    html {<li>}
     set type [$zset type $no]
     if {$type == "SD"} {
         set err [lindex [$zset diag $no] 1]
@@ -71,7 +85,6 @@ proc display-brief {zset no tno} {
     if {$type != "DB"} {
         return
     }
-    html "${no}"
     set rtype [$zset recordType $no]
     if {$rtype == "SUTRS"} {
         html [join [$zset getSutrs $no]]
@@ -79,12 +92,29 @@ proc display-brief {zset no tno} {
         return
     } 
     if {![catch {
+        set author [$zset getMarc $no field 100 * a]
         set title [lindex [$zset getMarc $no field 245 * a] 0]
         set year [lindex [$zset getMarc $no field 260 * c] 0]
     } ] } {
+        set p 0
+        foreach a $author {
+            if {$p} {
+                html ", "
+            }
+            html $a
+            set p 1
+        }
+        if {$p} {
+            html ": "
+        }
         html {<a href="http:} $env(SCRIPT_NAME) /
-        html $sessionId {/showfull.egw/} $setNo + $tno + $no + full 
-        html {"> } $title {</a>} " <i> ${year} </i>"
+        html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
+        if {[string length $title] == 0} {
+            html {No title}
+        } else {
+            html $title
+        }
+        html {</a>} " <i> ${year} </i>"
     }
     html "<br>\n"
 }
@@ -118,7 +148,7 @@ proc display-raw {zset no tno} {
         set indicator [lindex $line 1]
         set fields [lindex $line 2]
         set l [string length $indicator]
-        html "$tag "
+        html "<tt>$tag "
         if {$l > 0} {
             for {set i 0} {$i < $l} {incr i} {
                 if {[string index $indicator $i] == " "} {
@@ -128,6 +158,7 @@ proc display-raw {zset no tno} {
                 }
             }
         }
+        html "</tt>"
         foreach field $fields {
             set id [lindex $field 0]
             set data [lindex $field 1]
@@ -155,7 +186,7 @@ proc put-marc-contents {cc} {
     }
     html $cc
     if {$ref != ""} {
-        html {">} $urltype { reference</a>}
+        html {">} $cc {</a>}
     }
 }
 
@@ -318,7 +349,7 @@ proc display-full {zset no tno} {
     if {"x$url" != "x"} {
         html "<dt><b>URL</b>\n"
         if {"x$sp" == "x"} {
-            set sp reference
+            set sp $url
         }
         html {<dd><a href="} $url {">} [join $sp] "</a>\n"
     }
@@ -348,15 +379,32 @@ proc display-rec {from to dfunc tno} {
     }
 }
 
-proc build-query {t} {
+proc build-scan {t i} {
+    global targets
+
+    set term [wform entry$i]
+    if {$term != ""} {
+        set field [join [wform menu$i]]
+        set attr {Title}
+        foreach x [lindex $targets($t) 2] {
+            if {[lindex $x 0] == $field} {
+                set attr [lindex $x 1]
+            }
+        }
+        return [list $term $attr]
+    }
+    return ""
+}
+
+proc build-query {t ilines} {
     global targets
 
     set op {}
     set q {}
-    for {set i 1} {$i < 4} {incr i} {
-        set term [wform entry$i]
-        if {$term != ""} {
-            set field [wform menu$i]
+    for {set i 1} {$i <= $ilines} {incr i} {
+        set term [join [wform entry$i]]
+        if {[string length $term] > 0} {
+            set field [join [wform menu$i]]
             foreach x [lindex $targets($t) 2] {
                 if {[lindex $x 0] == $field} {
                     set attr [lindex $x 1]
@@ -378,6 +426,151 @@ proc build-query {t} {
     return $q
 }
 
+proc z39scan {setNo scanNo tno scanLines scanPos cache} {
+    global hist
+    global sessionWait
+    global targets
+
+    if {$tno > 0} {
+        set zz z39$tno
+        set host $hist($setNo,$tno,host)
+        set idAuth $hist($setNo,$tno,idAuthentication)
+        set database $hist($setNo,$tno,database)
+        set scanAttr $hist($setNo,$tno,scanAttr)
+        set scanTerm $hist($setNo,$tno,$scanNo,scanTerm)
+    } else {
+        set zz z39
+        set host $hist($setNo,host)
+        set idAuth $hist($setNo,idAuthentication)
+        set database $hist($setNo,database)
+        set scanAttr $hist($setNo,scanAttr)
+        set scanTerm $hist($setNo,$scanNo,scanTerm)
+    }
+    if {[catch [list $zz failback fail-response]]} {
+        ir $zz
+    }
+    if {[catch [list set oldHost [$zz connect]]]} {
+        set oldHost ""
+    }
+    set zs $zz.s$scanNo.$setNo
+    $zz callback ok-response
+    $zz failback fail-response
+    if {$oldHost != $host} {
+        catch [list $zz disconnect]
+
+        set sessionWait 0
+        if {[catch [list $zz connect $host]]} {
+            displayError "Cannot connect to target" $host
+            return 0
+        } elseif {$sessionWait == 0} {
+            if {[catch {zwait sessionWait 300}]} {
+		$zz disconnect
+                displayError "Cannot connect to target" $host
+                return 0
+            }
+            if {$sessionWait != 1} {
+                displayError "Cannot connect to target" $host
+                return 0
+            }
+        }
+        $zz idAuthentication $idAuth
+        set sessionWait 0
+        if {[catch {$zz init}]} {
+            displayError "Cannot initialize target" $host
+	    $zz disconnect
+            return 0
+        }
+        if {[catch {zwait sessionWait 60}]} {
+            displayError "Cannot initialize target" $host
+	    $zz disconnect
+            return 0
+        }
+        if {$sessionWait != "1"} {
+            displayError "Cannot initialize target" $host
+	    $zz disconnect
+            return 0
+        }
+        if {![$zz initResult]} {
+            set u [$zz userInformationField]
+            $zz disconnect
+            displayError "Cannot initialize target $host" $u
+            return 0
+        }
+    } else {
+        if {$cache && ![catch [list $zs numberOfTermsRequested 5]]} {
+            return 1
+        }
+    }
+    eval $zz databaseNames $database
+
+    ir-scan $zs $zz
+
+    $zs numberOfTermsRequested $scanLines
+    $zs preferredPositionInResponse $scanPos
+
+    $zz callback [list scan-response $zs]
+
+    set sessionWait 0
+    $zs scan "${scanAttr} ${scanTerm}"
+
+    if {[catch {zwait sessionWait 60}]} {
+        wlog debug "timeout/cancel in scan"
+        displayError "Timeout in scan" {}
+        html "</body></html>\n"
+        $zz disconnect
+        return 0
+    }
+    if {$sessionWait == -1} {
+        displayError "Scan fail" "Connection closed"
+        html "</body></html>\n"
+        $zz disconnect
+    }
+    if {$sessionWait != 1} {
+	return 0
+    }
+    return 1
+}
+
+proc display-scan {setNo scanNo tno} {
+    global hist
+    global targets
+    global env
+    global sessionId
+
+    if {$tno > 0} {
+        set zz z39$tno
+    } else {
+        set zz z39
+    }
+    set zs $zz.s$scanNo.$setNo
+    set m [$zs numberOfEntriesReturned]
+        
+    if {$m > 0} {
+        set t [lindex [$zs scanLine 0] 1]
+        if {$tno > 0} {
+            set hist($setNo,$tno,[expr $scanNo - 1],scanTerm) $t
+        } else {
+            set hist($setNo,[expr $scanNo - 1],scanTerm) $t
+        }
+        set t [lindex [$zs scanLine [expr $m - 1]] 1]
+        if {$tno > 0} {
+            set hist($setNo,$tno,[expr $scanNo + 1],scanTerm) $t
+        } else {
+            set hist($setNo,[expr $scanNo + 1],scanTerm) $t
+        }
+    }
+    for {set i 0} {$i < $m} {incr i} {
+        regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
+        html {<a href="http:} $env(SCRIPT_NAME)
+        html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo +
+        html $hist($setNo,scan) +  $tterm {">}
+        html [lindex [$zs scanLine $i] 1]
+        html {</a>: <em>}
+        html [lindex [$zs scanLine $i] 2]
+        html "</em><br>\n"
+    }
+}
+
 proc z39search {setNo piggy tno elements} {
     global hist
     global sessionWait
@@ -412,7 +605,11 @@ proc z39search {setNo piggy tno elements} {
             displayError "Cannot connect to target" $host
             return 0
         } elseif {$sessionWait == 0} {
-            zwait sessionWait
+            if {[catch {zwait sessionWait 300}]} {
+		$zz disconnect
+                displayError "Cannot connect to target" $host
+                return 0
+            }
             if {$sessionWait != 1} {
                 displayError "Cannot connect to target" $host
                 return 0
@@ -422,6 +619,7 @@ proc z39search {setNo piggy tno elements} {
         set sessionWait 0
         if {[catch {$zz init}]} {
             displayError "Cannot initialize target" $host
+	    $zz disconnect
             return 0
         }
         if {[catch {zwait sessionWait 60}]} {
@@ -441,9 +639,11 @@ proc z39search {setNo piggy tno elements} {
             return 0
         }
     } else {
-        if {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
+        if {[info exists hist($setNo,hits)] && \
+                ![catch [list $zz.$setNo smallSetUpperBound 0]]} {
             return 1
         }
+        
     }
     ir-set $zz.$setNo $zz
     
@@ -454,6 +654,7 @@ proc z39search {setNo piggy tno elements} {
     $zz.$setNo mediumSetElementSetNames $elements
     $zz.$setNo recordElements $elements
 
+    wlog debug "database=$database"
     eval $zz.$setNo databaseNames $database
 
     $zz.$setNo preferredRecordSyntax USMARC
@@ -472,27 +673,20 @@ proc z39search {setNo piggy tno elements} {
     $zz.$setNo search $query
 
     if {[catch {zwait sessionWait 600}]} {
-        wlog debug "timeout/cancel in present"
+        wlog debug "timeout/cancel in search"
         displayError "Timeout in search" {}
         html "</body></html>\n"
         $zz disconnect
         return 0
     }
         
-    if {$sessionWait != 1} {
+    if {$sessionWait == -1} {
         displayError "Search fail" "Connection closed"
         html "</body></html>\n"
         $zz disconnect
-        return 0
     }
-    set status [$zz.$setNo responseStatus]
-    if {[lindex $status 0] == "NSD"} {
-        set code [lindex $status 1]
-        set msg [lindex $status 2]
-        set addinfo [lindex $status 3]
-        displayError "Diagnostic message" \
-                "$msg: $addinfo\n<br>(error code $code)"
-        return 0
+    if {$sessionWait != 1} {
+	return 0
     }
     set hist($setNo,hits) [$zz.$setNo resultCount]
     return 1
@@ -698,36 +892,150 @@ proc z39history {} {
     if {![info exists nextSetNo]} {
         return
     }
-    html "<hr><h3>History</h3><dl>\n"
+    html "<h2>History</h2><dl><br>\n"
     for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
-        html {<dt> <a href="http:} $env(SCRIPT_NAME)
-        html / $sessionId {/search.egw/} $setNo + 1
-        html + $hist($setNo,maxPresent)
-        html {"> } [lindex $targets($hist($setNo,host)) 0]
-        if {[llength $hist($setNo,database)] > 1} {
+        if {$hist($setNo,scan) > 0} continue
+        set host $hist($setNo,host)
+        html {<dt> } [lindex $targets($host) 0]
+        if {[llength [lindex $targets($host) 1]] > 1} {
             html ": "
             foreach b $hist($setNo,database) {
                 html " $b"
             }
         }
-        html "</a>\n"
-        html "<dd> "
+        html {. }
+
         if {[info exists hist($setNo,hits)]} {
-            html $hist($setNo,hits) " hits"
+            html { <a href="http:} $env(SCRIPT_NAME)
+            html / $sessionId {/search.egw/} $setNo + 1
+            html + $hist($setNo,maxPresent)
+            html {">Result</a>: } $hist($setNo,hits) { hits.}
         } else {
-            html failed
+            html {Search failed.}
+        }
+        html "<dd>\n"
+        html { <a href="http:} $env(SCRIPT_NAME)
+        html / $sessionId {/query.egw/} $host + $setNo 
+        html {">Query</a>: }
+        set op {}
+        for {set i 1} {$i <= 3} {incr i} {
+            if {[string length $hist($setNo,form,entry$i)] > 0} {
+                html " <b>" [join $op " "] "</b> "
+                html $hist($setNo,form,menu$i) "=" $hist($setNo,form,entry$i)
+                set op $hist($setNo,form,logic$i)
+            }
         }
-        html "\n"
     }
     html "</dl>\n"
 }
 
 proc displayError {msga msgb} {
     html "<p><center>\n"
-    html {<img src="/gif/noway.gif">}
+    html {<img src="/egwgif/noway.gif" alt="Error">}
     html "<h2>" $msga "</h2>\n"
     if {$msgb != ""} {
         html "<h3>" $msgb "</h3>\n"
     }
     html "</center><p>\n"
 }
+
+proc button-europagate {} {
+    global useIcons
+    if {$useIcons} {
+        html {<img src="/egwgif/button-egw.gif" alt="Europagate" border=0></a>}
+    } else {
+        html {Europagate | }
+    }
+}
+
+proc button-new-target {more} {
+    global useIcons
+    global env
+    global sessionId
+
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/targets.egw}
+    if {$useIcons} {
+        html {"><img src="/egwgif/button-new-target.gif" }
+	html {alt="New Target" border=0></a>}
+    } else {
+        html {">New Target</a>}
+        if {$more} {
+            html " | \n"
+        } else {
+            html "\n"
+        }
+    }
+}
+
+proc button-view-history {more} {
+    global useIcons
+    global env
+    global sessionId
+    global nextSetNo
+
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/history.egw;}
+    catch { html "/" $nextSetNo}
+    if {$useIcons} {
+        html {"><img src="/egwgif/button-view-history.gif" alt="View History" }
+        html {border=0></a>}
+    } else {
+        html {">View History</a>}
+        if {$more} {
+            html " | \n"
+        } else {
+            html "\n"
+        }
+    }
+}
+
+proc button-new-query {more setNo} {
+    global useIcons
+    global env
+    global sessionId
+    global hist
+
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo {">}
+    if {$useIcons} {
+        html {<img src="/egwgif/button-new-query.gif" }
+	html {alt="New Query" border=0></a>}
+    } else {
+        html {New Query</a>}
+        if {$more} {
+            html " | \n"
+        } else {
+            html "\n"
+        }
+    }
+}
+
+proc button-scan-window {more setNo} {
+    global useIcons
+    global env
+    global sessionId
+    global hist
+
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/search.egw/} $setNo + {scan} {">}
+    if {$useIcons} {
+        html {<img src="/egwgif/button-scan-window.gif" }
+	html {alt="Scan" border=0></a>}
+    } else {
+        html {Scan</a>}
+        if {$more} {
+            html " | \n"
+        } else {
+            html "\n"
+        }
+    }
+}
+
+proc maintenance {} {
+    html {<hr>This page is maintained by }
+    html {<a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.}
+    html {Last modified 9. january 1996. <br>}
+    html {<em> This and the following pages are under construction and }
+    html {will continue to be so until the end of January 1996.</em>}
+}