X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client2%2Fformats%2Fline.tcl;fp=client2%2Fformats%2Fline.tcl;h=01f249f8d84ed31d533d0b37755bf7560b0c4137;hb=62201bf1c9bd66af8bea08dada947f5b9e0cfc9a;hp=38573209ad0d9b761127aa89cf6a4ca7ab5a6dc7;hpb=3ca1b546b314b8d6f380322d5158de716fcfab2f;p=ir-tcl-moved-to-github.git

diff --git a/client2/formats/line.tcl b/client2/formats/line.tcl
index 3857320..01f249f 100644
--- a/client2/formats/line.tcl
+++ b/client2/formats/line.tcl
@@ -4,95 +4,43 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: line.tcl,v $
-# Revision 1.1  1998-09-30 10:53:54  perhans
+# Revision 1.2  1999-03-17 09:24:11  perhans
+# Explain now also finds Gils attributes.
+# Support for search with Gils attributes added.
+# Stop button added.
+# The medium format extended and cleaned up (kommas between termes).
+# Lots of minor but fixes.
+#
+# Revision 1.1  1998/09/30 10:53:54  perhans
 # New client with better Explain support and nice icons.
-#
-# Revision 1.15  1997/11/24 11:34:38  adam
-# Using odr_nullval() instead of ODR_NULLVAL when appropriate.
-#
-# Revision 1.14  1997/11/19 11:22:10  adam
-# Object identifiers can be accessed in GRS-1 records.
-#
-# 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:21  adam
-# Wrore more comments.
-#
-# Revision 1.10  1995/10/17  17:39:46  adam
-# Minor bug fix in call to display-grs-line.
-#
-# Revision 1.9  1995/10/17  14:18:09  adam
-# Minor changes in presentation formats.
-#
-# Revision 1.8  1995/10/17  10:58:08  adam
-# More work on presentation formats.
-#
-# Revision 1.7  1995/09/20  11:37:06  adam
-# Work on GRS.
-#
-# Revision 1.6  1995/06/29  12:34:20  adam
-# IrTcl now works with both tk4.0b4/tcl7.4b4 and tk3.6/tcl7.3
-#
-# Revision 1.5  1995/06/22  13:16:28  adam
-# Feature: SUTRS. Setting getSutrs implemented.
-# Work on display formats.
-#
-# Revision 1.4  1995/06/19  08:10:21  adam
-# Inverse highligt colours in monochrome mode.
-#
-# Revision 1.3  1995/06/16  12:29:00  adam
-# Use insertWithTags on diagnostic errors.
-#
-# Revision 1.2  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.1  1995/06/12  15:18:10  adam
-# Work on presentation formats. These are used in the main window as well
-# as popup windows.
-#
-#
+
 proc display-grs-line {w r i} {
     global tagSet
     
-    if {[tk4]} {
-        set start [$w index insert]
-    }
     set head Untitled
     foreach e $r {
-        if {![tk4]} {
-            for {set j 0} {$j < $i} {incr j} {
-                insertWithTags $w "  " marc-tag
-            }
-        }
         set ttype [lindex $e 0]
         set tval [lindex $e 2]
-	if {$ttype == 2 && $tval == 1} {
-	    if {[lindex $e 3] == "subtree"} {
-		set f [lindex $e 4]
-		foreach e $f {
-		    if {[lindex $e 0] == 1 && [lindex $e 2] == 19} {
-			break
-		    }
-		}
-	    }
-	    if {[lindex $e 3] == "string"} {
+	    if {$ttype == 2 && $tval == 1} {
+	        if {[lindex $e 3] == "subtree"} {
+		    set f [lindex $e 4]
+		        foreach e $f {
+		            if {[lindex $e 0] == 1 && [lindex $e 2] == 19} {
+			            break
+		            }
+		        }
+	        }
+	        if {[lindex $e 3] == "string"} {
                 set head [lindex $e 4]
-	    }
+	        }
             break
-	}
+	    }
     }
     insertWithTags $w $head marc-text
     insertWithTags $w "\n"
     if {[tk4]} {
-        $w tag configure indent$i \
-                -lmargin1 [expr $i * 10] \
-                -lmargin2 [expr $i * 10 + 5]
+        $w tag configure indent$i -lmargin1 [expr $i * 10] \
+            -lmargin2 [expr $i * 10 + 5]
         $w tag add indent$i $start insert
     }
 }
@@ -105,20 +53,12 @@ proc display-grs-line {w r i} {
 #         should be displayed.
 # This procedure attempts to display records in a line-per-line format.
 proc display-line {sno no w hflag} {
-    global monoFlag
     set type [z39.$sno type $no] 
     if {$hflag} {
-        if {! $monoFlag} {
-            $w tag bind r$no <Any-Enter> \
-                [list $w tag configure r$no -background gray80]
-            $w tag bind r$no <Any-Leave> \
-                [list $w tag configure r$no -background {}]
-        } else {
-            $w tag bind r$no <Any-Enter> \
-                [list $w tag configure r$no -background black -foreground white]
-            $w tag bind r$no <Any-Leave> \
-                [list $w tag configure r$no -background {} -foreground {}]
-        }
+        $w tag bind r$no <Any-Enter> \
+            [list $w tag configure r$no -background black -foreground white]
+        $w tag bind r$no <Any-Leave> \
+            [list $w tag configure r$no -background {} -foreground {}]
     } else {
         $w delete 0.0 end
     }
@@ -136,7 +76,7 @@ proc display-line {sno no w hflag} {
             if {[catch {
                 set title [lindex [z39.$sno getMarc $no field 245 * a] 0]
                 set year  [lindex [z39.$sno getMarc $no field 260 * c] 0]
-                insertWithTags $w "$title - " marc-text
+                insertWithTags $w "$title" marc-text
                 insertWithTags $w "$year\n" marc-it
             }]} {
                 insertWithTags $w "Unknown record type: $rtype\n" marc-id