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

diff --git a/client2/formats/medium.tcl b/client2/formats/medium.tcl
index 06452a9..c35fa2c 100644
--- a/client2/formats/medium.tcl
+++ b/client2/formats/medium.tcl
@@ -14,7 +14,7 @@ proc display-grs-medium {w r i} {
         set ttype [lindex $e 0]
         set tval [lindex $e 2]
         if {$ttype == 3} {
-            insertWithTags $w "$tval " marc-pref
+            insertWithTags $w "$tval per" marc-pref
         } elseif {[info exists tagSet($ttype,$tval)]} {
             insertWithTags $w "$tagSet($ttype,$tval) " marc-pref
         } else {
@@ -80,15 +80,15 @@ proc display-medium {sno no w hflag} {
     if {[llength $i]} {
         insertWithTags $w "Title " marc-pref
         insertWithTags $w [string trimright [lindex $i 0] /] marc-text
-        set i [z39.$sno getMarc $no field 245 * b]
+        set i [concat [z39.$sno getMarc $no field 245 * b] [z39.$sno getMarc $no field 251 * a]]
         if {"x$i" != "x"} {
             insertWithTags $w [string trimright [lindex $i 0] /] marc-text
         }
         $w insert end "\n"
     }
-    set i [z39.$sno getMarc $no field 700 * a]
+    set i [concat [z39.$sno getMarc $no field 700 * a] [z39.$sno getMarc $no field 700 * h]]
     if {![llength $i]} {
-        set i [z39.$sno getMarc $no field 100 * a]
+        set i [concat [z39.$sno getMarc $no field 100 * a] [z39.$sno getMarc $no field 100 * h]]
     }
     if {[llength $i]} {
         if {[llength $i] > 1} {
@@ -116,15 +116,14 @@ proc display-medium {sno no w hflag} {
         insertWithTags $w "Keywords " marc-pref
         foreach x $i {
             if {$n > 0} {
-                $w insert end ", "
+#                $w insert end ", "
             }
             insertWithTags $w $x marc-it
             incr n
         }
         $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 * c]]
+    set i [concat [z39.$sno getMarc $no field 260 * b] [z39.$sno getMarc $no field 260 * a]]
     if {[llength $i]} {
         insertWithTags $w "Publisher " marc-pref
         foreach x $i {
@@ -132,7 +131,16 @@ proc display-medium {sno no w hflag} {
         }
         $w insert end "\n"
     }
-    set i [z39.$sno getMarc $no field 300 * a]
+    set i [z39.$sno getMarc $no field 260 * c]
+    if {[llength $i]} {
+        insertWithTags $w "Year " marc-pref
+        foreach x $i {
+            insertWithTags $w $x marc-text
+        }
+        $w insert end "\n"
+    }
+    set i [concat [z39.$sno getMarc $no field 300 * a] [z39.$sno getMarc $no field 300 * b] \
+        [z39.$sno getMarc $no field 300 * c] [z39.$sno getMarc $no field 300 * e]]
     if {[llength $i]} {
         insertWithTags $w "Phys. Desc. " marc-pref
         foreach x $i {
@@ -148,6 +156,14 @@ proc display-medium {sno no w hflag} {
         }
         $w insert end "\n"
     }
+    set i [z39.$sno getMarc $no field 021 * a]
+    if {[llength $i]} {
+        insertWithTags $w "ISBN " marc-pref
+        foreach x $i {
+            insertWithTags $w $x marc-text
+        }
+        $w insert end "\n"
+    }
     set i [z39.$sno getMarc $no field 022 * a]
     if {[llength $i]} {
         insertWithTags $w "ISSN " marc-pref