projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Work on scan.
[egate.git] / www / search.egw
diff --git a/www/search.egw b/www/search.egw
index c25bfb9..c72263e 100644 (file)
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,6 +1,86 @@
 <html>
 {
-# $Id: search.egw,v 1.18 1995/12/20 16:31:31 adam Exp $
+# $Id: search.egw,v 1.19 1995/12/21 15:49:52 adam Exp $
+
+proc perform-scan {} {
+    global sessionId
+    global sessionParms
+    global sessionWait
+    global setNo
+    global hist
+    global targets
+    global nextSetNo
+    global env
+
+    set scanNo 1000
+
+    set termPlusAttr [build-scan $hist($setNo,host) 3]
+
+    if {"$termPlusAttr" == ""} {
+        html "<head><title> WWW/Z39.50 Gateway Scan</title>\n<body>\n"
+        displayError "Empty query" \
+            "You must specify at least one search word"
+        html "</body></html>\n"
+        wabort
+    }
+    set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
+    set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
+    
+    set hist($setNo,form,menu1) [wform menu1]
+    set hist($setNo,form,menu2) ""
+    set hist($setNo,form,menu3) ""
+
+    set hist($setNo,form,entry1) [wform entry1]
+    set hist($setNo,form,entry2) ""
+    set hist($setNo,form,entry3) ""
+
+    set hist($setNo,form,logic1) ""
+    set hist($setNo,form,logic2) ""
+
+    incr nextSetNo
+
+    set host $hist($setNo,host)
+    set databases [lindex $targets($host) 1]
+
+    set b [wform base]
+    if {[wform baseall] != ""} {
+       set hist($setNo,database) $databases
+    } elseif {$b == ""} {
+        set hist($setNo,database) $databases
+    } else {
+        set hist($setNo,database) $b
+    }
+    set hist($setNo,maxPresent) [wform hits]
+    if {$hist($setNo,maxPresent) == ""} {
+        set hist($setNo,maxPresent) 30
+    }
+    set host $hist($setNo,host)
+    set databases [lindex $targets($host) 1]
+
+    html "<head><title> WWW/Z39.50 Gateway Scan " $host " </title>\n"
+    html "</head><body>\n"
+
+    if {[z39scan $setNo $scanNo 0 20 10] != "1"} {
+        return
+    }
+    display-scan $setNo $scanNo 0
+
+    html "<hr>\n"
+    html "<h3>Debug information</h3>\n"
+    html "sessionId: $sessionId <br>\n"
+    html "sessionParms: $sessionParms <br>\n"
+    foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
+        html $e {: } $env($e) {<br>} \n
+    }
+    html "form: " [wform] " <br>\n"
+    html "target: " $host " <br>\n"
+    html "databases: " $hist($setNo,database) " <br>\n"
+    html "selected: " [wform base] " <br>\n"
+    html "setNo: " $setNo " <br>\n"
+    html "nextSetNo: " $nextSetNo " <br>\n"
+    
+    html "</body>\n"
+}
 
 proc buttons {setNo setMax startPos after} {
     global sessionId
@@ -81,11 +161,11 @@ proc buttons {setNo setMax startPos after} {
 
     set setNo [lindex $sessionParms 0]
     if {[wform menu1] != ""} {
-        set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication)
-        set hist($nextSetNo,host) $hist($setNo,host)
-        set setNo $nextSetNo
-
-        set query [build-query $hist($setNo,host)]
+        if {[wform submit] == "Scan"} {
+            perform-scan
+            wabort
+        }
+        set query [build-query $hist($setNo,host) 3]
         if {"x$query" == "x"} {
             html "<head><title> WWW/Z39.50 Gateway Search</title>\n<body>\n"
             displayError "Empty query" \
@@ -139,7 +219,7 @@ proc buttons {setNo setMax startPos after} {
             return
         }
         set r [z39.$setNo resultCount]
-        html "<h2> Search result $r hits</h2>\n"
+        html "<h3> Search result $r hits</h3>\n"
         wflush
         set setOffset [z39.$setNo numberOfRecordsReturned]
         display-rec 1 $setOffset display-brief 0
@@ -153,8 +233,6 @@ proc buttons {setNo setMax startPos after} {
             return 
         }
         set r [z39.$setNo resultCount]
-        html "<h2> Search result $r hits</h2>\n"
-        wflush
         set setOffset $startPos
         set setMax [z39.$setNo resultCount]
         if {$setMax > $endPos} {
@@ -163,6 +241,8 @@ proc buttons {setNo setMax startPos after} {
         if {$setMax > 0} {
             buttons $setNo $setMax $startPos 0
         }
+        html "<h3> Search result $r hits</h3>\n"
+        wflush
     }
     if {$setMax > 0} {
         z39present $setNo 0 $setOffset $setMax display-brief B
Europgate