From: Per M. Hansen <perhans@indexdata.dk>
Date: Mon, 12 Oct 1998 08:33:38 +0000 (+0000)
Subject: Items added to medium-MARC record display.
X-Git-Tag: IRTCL.1.4~45
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=b9f97a478872ed0bdb483e50805529b0d73cf6fc;p=ir-tcl-moved-to-github.git

Items added to medium-MARC record display.
Bug in choosing record syntax fixed.
---

diff --git a/client2/client.tcl b/client2/client.tcl
index 86c66d9..eeac5d8 100644
--- a/client2/client.tcl
+++ b/client2/client.tcl
@@ -970,9 +970,6 @@ proc open-target {target base} {
     }
     set hostid $target
     set currentDb $base
-#	changeQueryButtons $target $base
-    
-#    .top.options.m.query.slist entryconfigure 2 -state normal
     configure-disable-e .top.target.m 0
     configure-enable-e .top.target.m 1
     configure-enable-e .top.target.m 2
@@ -1151,7 +1148,7 @@ proc ready-response {base target} {
 #This procedure take care of all the actions that should start if connect is succesfull.
 proc ready-response-actions {target base} {
 	global profile queryAuto
-	get-attributeDetails $target $base
+#	get-attributeDetails $target $base
 	changeQueryButtons $target $base 
 	configureOptionsSyntax $target $base
 	if {[info exists profile($target,AttributeDetails,$base,Bib1Use)] && $queryAuto == 1} {
@@ -2330,7 +2327,7 @@ proc listbuttonx {button no names handle user} {
         ${button}.m delete 0 last
     } else {
         menubutton $button -text [lindex [lindex $names $no] 0] \
-			-width 10 -menu ${button}.m -relief raised -border 1
+			-width 15 -menu ${button}.m -relief raised -border 1
         irmenu ${button}.m
         ${button}.m configure -tearoff off
     }
@@ -3156,7 +3153,7 @@ proc search-fields {w buttondefs} {
 #base 		database name
 #Changes the Options|Syntax menu acording to the information obtained via explain.
 proc configureOptionsSyntax {target base} {
-	global profile syntaxList
+	global profile syntaxList recordSyntax syntax
 	set activate 0
 	set i -1
 	if {[info exists profile($target,RecordSyntaxes,$base)]} {
@@ -3168,6 +3165,9 @@ proc configureOptionsSyntax {target base} {
 				configure-enable-e .top.options.m.syntax $i
 				if {$activate == 0} {
 					.top.options.m.syntax invoke $i
+					set recordSyntax $syntax
+#					.debug-window.top.t insert end $recordSyntax\n
+#					.debug-window.top.t insert end $syntax
 					set activate 1
 				}
 			} else {
diff --git a/client2/explain.tcl b/client2/explain.tcl
index fcf2455..7a3af17 100644
--- a/client2/explain.tcl
+++ b/client2/explain.tcl
@@ -200,7 +200,7 @@ proc prettyDumpR {x ind} {
 
 # Procedure explain-check-ok
 proc explain-check-ok {target zz category finish} {
-    global profile settingsChanged
+    global profile settingsChanged currentDb
 
     puts ""
     puts ""
@@ -259,6 +259,7 @@ proc explain-check-ok {target zz category finish} {
 		[lindex [lindex [lindex [lindex [lindex $trec 10] 1] 1] 1] 1]
     
     set settingsChanged 1
+    get-attributeDetails $target $currentDb
 
     eval $finish [list $target]
 }
@@ -295,7 +296,6 @@ proc explain-check {target finish base} {
     }
     if {$refresh} {
 		explain-refresh $target $finish
-#		get-attributeDetails $target $base
     } else {
 		eval $finish [list $target]
     }
diff --git a/client2/formats/medium.tcl b/client2/formats/medium.tcl
index 7b12b7c..06452a9 100644
--- a/client2/formats/medium.tcl
+++ b/client2/formats/medium.tcl
@@ -1,70 +1,16 @@
-# IR toolkit for tcl/tk
-# (c) Index Data 1995
-# See the file LICENSE for details.
-# Sebastian Hammer, Adam Dickmeiss
-#
-# $Log: medium.tcl,v $
-# Revision 1.1  1998-09-30 10:53:54  perhans
-# New client with better Explain support and nice icons.
-#
-# Revision 1.15  1997/11/19 11:22:10  adam
-# Object identifiers can be accessed in GRS-1 records.
-#
-# Revision 1.14  1996/04/12 13:45:49  adam
-# Minor changes.
-#
-# Revision 1.13  1996/04/12  12:25:27  adam
-# Modified display of GRS-1 records to include headings for standard
-# tag sets.
-#
-# Revision 1.12  1996/03/29  16:05:36  adam
-# Bug fix: GRS records wasn't recognized.
-#
-# Revision 1.11  1996/01/23  15:24:23  adam
-# Wrore more comments.
-#
-# Revision 1.10  1996/01/11  09:31:05  quinn
-# Small.
-#
-# Revision 1.9  1995/10/17  14:18:10  adam
-# Minor changes in presentation formats.
-#
-# Revision 1.8  1995/10/17  10:58:09  adam
-# More work on presentation formats.
-#
-# Revision 1.7  1995/10/16  17:01:03  adam
-# Medium presentation format looks better.
-#
-# Revision 1.6  1995/09/20  11:37:06  adam
-# Work on GRS.
-#
-# Revision 1.5  1995/06/22  13:16:29  adam
-# Feature: SUTRS. Setting getSutrs implemented.
-# Work on display formats.
-#
-# Revision 1.4  1995/06/14  12:16:42  adam
-# Minor presentation format changes.
-#
-# Revision 1.3  1995/06/13  14:39:06  adam
-# Fix: if {$var != ""} doesn't work if var is a large numerical!
-# Highlight when line format is used.
-#
-# Revision 1.2  1995/06/12  15:18:10  adam
-# Work on presentation formats. These are used in the main window as well
-# as popup windows.
-#
-#
+#Procedure display-grs-medium {w r i}
+#  w      	text widget in which the record should be displayed
+#  r		record
+#  i		indent
+#This procedure displaies the GRS-1 records in a medium sized format and 
+#puts tags around the text in order to format the output.
 proc display-grs-medium {w r i} {
     global tagSet
     
+	$w tag configure indent$i -lmargin1 [expr $i * 16] \
+		-lmargin2 [expr $i * 16 + 8]
     foreach e $r {
-        if {[tk4]} {
-            set start [$w index insert]
-        } else {
-            for {set j 0} {$j < $i} {incr j} {
-                insertWithTags $w "  " marc-tag
-            }
-        }
+        set start [$w index insert]
         set ttype [lindex $e 0]
         set tval [lindex $e 2]
         if {$ttype == 3} {
@@ -83,12 +29,7 @@ proc display-grs-medium {w r i} {
             insertWithTags $w [lindex $e 4] {}
             insertWithTags $w " \n" {}
         }
-        if {[tk4]} {
-            $w tag configure indent$i \
-                    -lmargin1 [expr $i * 16] \
-                    -lmargin2 [expr $i * 16 + 8]
-            $w tag add indent$i $start insert
-        }
+		$w tag add indent$i $start insert
         if {[lindex $e 3] == "subtree"} {
             display-grs-medium $w [lindex $e 4] [expr $i+1]
         }
@@ -183,7 +124,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [concat [z39.$sno getMarc $no field 260 * a] \
-            [z39.$sno getMarc $no field 260 * b]]
+            [z39.$sno getMarc $no field 260 * b] [z39.$sno getMarc $no field 260 * c]]
     if {[llength $i]} {
         insertWithTags $w "Publisher " marc-pref
         foreach x $i {
@@ -191,6 +132,14 @@ proc display-medium {sno no w hflag} {
         }
         $w insert end "\n"
     }
+    set i [z39.$sno getMarc $no field 300 * a]
+    if {[llength $i]} {
+        insertWithTags $w "Phys. Desc. " marc-pref
+        foreach x $i {
+            insertWithTags $w $x marc-text
+        }
+        $w insert end "\n"
+    }
     set i [z39.$sno getMarc $no field 020 * a]
     if {[llength $i]} {
         insertWithTags $w "ISBN " marc-pref
diff --git a/client2/irtdb.tcl b/client2/irtdb.tcl
index 2e3616e..a6190d4 100644
--- a/client2/irtdb.tcl
+++ b/client2/irtdb.tcl
@@ -55,8 +55,8 @@ set profile(Bagel:210,recentNews) {}
 set profile(Bagel:210,smallSetUpperBound) 0
 set profile(Bagel:210,targetInfoName) Zebra
 set profile(Bagel:210,timeDefine) {}
-set profile(Bagel:210,timeLastExplain) 907773347
-set profile(Bagel:210,timeLastInit) 907773347
+set profile(Bagel:210,timeLastExplain) 908180779
+set profile(Bagel:210,timeLastInit) 908180779
 set profile(Bagel:210,welcomeMessage) {}
 set profile(Bagel:210,windowNumber) 1
 set {profile(Bell Laboratories Library Network,authentication)} {}
@@ -82,8 +82,8 @@ set {profile(Bell Laboratories Library Network,recentNews)} {}
 set {profile(Bell Laboratories Library Network,smallSetUpperBound)} 0
 set {profile(Bell Laboratories Library Network,targetInfoName)} {Lucent Technologies Research Server}
 set {profile(Bell Laboratories Library Network,timeDefine)} 878567355
-set {profile(Bell Laboratories Library Network,timeLastExplain)} 887288368
-set {profile(Bell Laboratories Library Network,timeLastInit)} 887288368
+set {profile(Bell Laboratories Library Network,timeLastExplain)} 907838464
+set {profile(Bell Laboratories Library Network,timeLastInit)} 907838464
 set {profile(Bell Laboratories Library Network,welcomeMessage)} {Salutations - this is Lucent Technologies experimental Z39.50 server. No guarentees, but free and unlimited access!}
 set {profile(Bell Laboratories Library Network,windowNumber)} 15
 set {profile(Bibliothèque Nationale du Québec,authentication)} {}
@@ -225,7 +225,7 @@ set profile(LOC,targetMaxResultSize) {}
 set profile(LOC,targetMaxTerms) {}
 set profile(LOC,timeDefine) 878567355
 set profile(LOC,timeLastExplain) {}
-set profile(LOC,timeLastInit) 907587281
+set profile(LOC,timeLastInit) 907942726
 set profile(LOC,welcomeMessage) {}
 set profile(LOC,windowNumber) 12
 set {profile(OCLC FirstSearch,authentication)} {}