From: berick <berick@esilibrary.com>
Date: Wed, 13 Apr 2011 17:53:14 +0000 (-0400)
Subject: Pull SVF attrs into displayed bib rec (results page only thus far).  use SVF value... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cb41edb32f40ebc1dc3413cb265b02403353e334;p=evergreen%2Fequinox.git

Pull SVF attrs into displayed bib rec (results page only thus far).  use SVF value to determine format icon and icon label
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
index fe61149e06..1cae862952 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
@@ -140,7 +140,7 @@ sub load_rresults {
     return Apache2::Const::OK if @$rec_ids == 0;
 
     my ($facets, @data) = $self->get_records_and_facets(
-        $rec_ids, $results->{facet_key}, {flesh => '{holdings_xml}'});
+        $rec_ids, $results->{facet_key}, {flesh => '{holdings_xml,mra}'});
 
     # shove recs into context in search results order
     for my $rec_id (@$rec_ids) {
diff --git a/Open-ILS/web/images/format_icons/item_type/a.png b/Open-ILS/web/images/format_icons/item_type/a.png
new file mode 100644
index 0000000000..2800684510
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/a.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/c.png b/Open-ILS/web/images/format_icons/item_type/c.png
new file mode 100644
index 0000000000..132ca40b6f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/c.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/d.png b/Open-ILS/web/images/format_icons/item_type/d.png
new file mode 100644
index 0000000000..132ca40b6f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/d.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/e.png b/Open-ILS/web/images/format_icons/item_type/e.png
new file mode 100644
index 0000000000..f9f804746f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/e.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/f.png b/Open-ILS/web/images/format_icons/item_type/f.png
new file mode 100644
index 0000000000..f9f804746f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/f.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/g.png b/Open-ILS/web/images/format_icons/item_type/g.png
new file mode 100644
index 0000000000..dd0a56f0c9
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/g.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/i.png b/Open-ILS/web/images/format_icons/item_type/i.png
new file mode 100644
index 0000000000..b6ddf3e1d6
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/i.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/j.png b/Open-ILS/web/images/format_icons/item_type/j.png
new file mode 100644
index 0000000000..5ada234d52
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/j.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/k.png b/Open-ILS/web/images/format_icons/item_type/k.png
new file mode 100644
index 0000000000..e523300013
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/k.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/m.png b/Open-ILS/web/images/format_icons/item_type/m.png
new file mode 100644
index 0000000000..a347513012
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/m.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/o.png b/Open-ILS/web/images/format_icons/item_type/o.png
new file mode 100644
index 0000000000..f7b5c7be42
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/o.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/p.png b/Open-ILS/web/images/format_icons/item_type/p.png
new file mode 100644
index 0000000000..f7b5c7be42
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/p.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/r.png b/Open-ILS/web/images/format_icons/item_type/r.png
new file mode 100644
index 0000000000..7b76d03f5c
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/r.png differ
diff --git a/Open-ILS/web/images/format_icons/item_type/t.png b/Open-ILS/web/images/format_icons/item_type/t.png
new file mode 100644
index 0000000000..2800684510
Binary files /dev/null and b/Open-ILS/web/images/format_icons/item_type/t.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/2.png b/Open-ILS/web/images/format_icons/mattype/2.png
new file mode 100644
index 0000000000..b874f44e69
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/2.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/5.png b/Open-ILS/web/images/format_icons/mattype/5.png
new file mode 100644
index 0000000000..dba509d00f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/5.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/a.png b/Open-ILS/web/images/format_icons/mattype/a.png
new file mode 100644
index 0000000000..57ee12c592
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/a.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/b.png b/Open-ILS/web/images/format_icons/mattype/b.png
new file mode 100644
index 0000000000..c2276605c7
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/b.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/c.png b/Open-ILS/web/images/format_icons/mattype/c.png
new file mode 100644
index 0000000000..26f481857d
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/c.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/d.png b/Open-ILS/web/images/format_icons/mattype/d.png
new file mode 100644
index 0000000000..9f4b0f9a6a
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/d.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/e.png b/Open-ILS/web/images/format_icons/mattype/e.png
new file mode 100644
index 0000000000..96d0eede1b
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/e.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/f.png b/Open-ILS/web/images/format_icons/mattype/f.png
new file mode 100644
index 0000000000..dcfd8939bc
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/f.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/h.png b/Open-ILS/web/images/format_icons/mattype/h.png
new file mode 100644
index 0000000000..8afcef9dd8
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/h.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/i.png b/Open-ILS/web/images/format_icons/mattype/i.png
new file mode 100644
index 0000000000..f36fe75967
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/i.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/j.png b/Open-ILS/web/images/format_icons/mattype/j.png
new file mode 100644
index 0000000000..84cc188c7c
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/j.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/k.png b/Open-ILS/web/images/format_icons/mattype/k.png
new file mode 100644
index 0000000000..96a9f35f5c
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/k.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/l.png b/Open-ILS/web/images/format_icons/mattype/l.png
new file mode 100644
index 0000000000..4ba36f1e75
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/l.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/m.png b/Open-ILS/web/images/format_icons/mattype/m.png
new file mode 100644
index 0000000000..95e6652908
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/m.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_downloadableebook.png b/Open-ILS/web/images/format_icons/mattype/media_downloadableebook.png
new file mode 100644
index 0000000000..82f66ba5f3
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_downloadableebook.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_electronicgames.png b/Open-ILS/web/images/format_icons/mattype/media_electronicgames.png
new file mode 100644
index 0000000000..b696a7abe9
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_electronicgames.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_evideo.png b/Open-ILS/web/images/format_icons/mattype/media_evideo.png
new file mode 100644
index 0000000000..09a7ea62b6
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_evideo.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_onlinejournal.png b/Open-ILS/web/images/format_icons/mattype/media_onlinejournal.png
new file mode 100644
index 0000000000..65cac4c421
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_onlinejournal.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_player.png b/Open-ILS/web/images/format_icons/mattype/media_player.png
new file mode 100644
index 0000000000..64197e160e
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_player.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_podcasts.png b/Open-ILS/web/images/format_icons/mattype/media_podcasts.png
new file mode 100644
index 0000000000..d563fbb2cd
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_podcasts.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_streamingaudio.png b/Open-ILS/web/images/format_icons/mattype/media_streamingaudio.png
new file mode 100644
index 0000000000..51c31c3b30
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_streamingaudio.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_streamingvideo.png b/Open-ILS/web/images/format_icons/mattype/media_streamingvideo.png
new file mode 100644
index 0000000000..3fe2cbe906
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_streamingvideo.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/media_vhs.png b/Open-ILS/web/images/format_icons/mattype/media_vhs.png
new file mode 100644
index 0000000000..11c1e42738
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/media_vhs.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/n.png b/Open-ILS/web/images/format_icons/mattype/n.png
new file mode 100644
index 0000000000..62b1af2874
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/n.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/o.png b/Open-ILS/web/images/format_icons/mattype/o.png
new file mode 100644
index 0000000000..c60d039bce
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/o.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/p.png b/Open-ILS/web/images/format_icons/mattype/p.png
new file mode 100644
index 0000000000..009d292505
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/p.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/q.png b/Open-ILS/web/images/format_icons/mattype/q.png
new file mode 100644
index 0000000000..09496307fa
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/q.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/r.png b/Open-ILS/web/images/format_icons/mattype/r.png
new file mode 100644
index 0000000000..65a2de24a4
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/r.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/s.png b/Open-ILS/web/images/format_icons/mattype/s.png
new file mode 100644
index 0000000000..94cebfb530
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/s.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/t.png b/Open-ILS/web/images/format_icons/mattype/t.png
new file mode 100644
index 0000000000..437f91f32f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/t.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/v.png b/Open-ILS/web/images/format_icons/mattype/v.png
new file mode 100644
index 0000000000..53a192e35f
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/v.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/w.png b/Open-ILS/web/images/format_icons/mattype/w.png
new file mode 100644
index 0000000000..1270685a66
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/w.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/x.png b/Open-ILS/web/images/format_icons/mattype/x.png
new file mode 100644
index 0000000000..bcd621c9de
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/x.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/y.png b/Open-ILS/web/images/format_icons/mattype/y.png
new file mode 100644
index 0000000000..a5db0672ac
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/y.png differ
diff --git a/Open-ILS/web/images/format_icons/mattype/z.png b/Open-ILS/web/images/format_icons/mattype/z.png
new file mode 100644
index 0000000000..ccf1fed6b3
Binary files /dev/null and b/Open-ILS/web/images/format_icons/mattype/z.png differ
diff --git a/Open-ILS/web/images/media/2.png b/Open-ILS/web/images/media/2.png
deleted file mode 100644
index b874f44e69..0000000000
Binary files a/Open-ILS/web/images/media/2.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/5.png b/Open-ILS/web/images/media/5.png
deleted file mode 100644
index dba509d00f..0000000000
Binary files a/Open-ILS/web/images/media/5.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/a.png b/Open-ILS/web/images/media/a.png
deleted file mode 100644
index 57ee12c592..0000000000
Binary files a/Open-ILS/web/images/media/a.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/b.png b/Open-ILS/web/images/media/b.png
deleted file mode 100644
index c2276605c7..0000000000
Binary files a/Open-ILS/web/images/media/b.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/c.png b/Open-ILS/web/images/media/c.png
deleted file mode 100644
index 26f481857d..0000000000
Binary files a/Open-ILS/web/images/media/c.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/d.png b/Open-ILS/web/images/media/d.png
deleted file mode 100644
index 9f4b0f9a6a..0000000000
Binary files a/Open-ILS/web/images/media/d.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/e.png b/Open-ILS/web/images/media/e.png
deleted file mode 100644
index 96d0eede1b..0000000000
Binary files a/Open-ILS/web/images/media/e.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/f.png b/Open-ILS/web/images/media/f.png
deleted file mode 100644
index dcfd8939bc..0000000000
Binary files a/Open-ILS/web/images/media/f.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/h.png b/Open-ILS/web/images/media/h.png
deleted file mode 100644
index 8afcef9dd8..0000000000
Binary files a/Open-ILS/web/images/media/h.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/i.png b/Open-ILS/web/images/media/i.png
deleted file mode 100644
index f36fe75967..0000000000
Binary files a/Open-ILS/web/images/media/i.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/j.png b/Open-ILS/web/images/media/j.png
deleted file mode 100644
index 84cc188c7c..0000000000
Binary files a/Open-ILS/web/images/media/j.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/k.png b/Open-ILS/web/images/media/k.png
deleted file mode 100644
index 96a9f35f5c..0000000000
Binary files a/Open-ILS/web/images/media/k.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/l.png b/Open-ILS/web/images/media/l.png
deleted file mode 100644
index 4ba36f1e75..0000000000
Binary files a/Open-ILS/web/images/media/l.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/m.png b/Open-ILS/web/images/media/m.png
deleted file mode 100644
index 95e6652908..0000000000
Binary files a/Open-ILS/web/images/media/m.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_downloadableebook.png b/Open-ILS/web/images/media/media_downloadableebook.png
deleted file mode 100644
index 82f66ba5f3..0000000000
Binary files a/Open-ILS/web/images/media/media_downloadableebook.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_electronicgames.png b/Open-ILS/web/images/media/media_electronicgames.png
deleted file mode 100644
index b696a7abe9..0000000000
Binary files a/Open-ILS/web/images/media/media_electronicgames.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_evideo.png b/Open-ILS/web/images/media/media_evideo.png
deleted file mode 100644
index 09a7ea62b6..0000000000
Binary files a/Open-ILS/web/images/media/media_evideo.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_onlinejournal.png b/Open-ILS/web/images/media/media_onlinejournal.png
deleted file mode 100644
index 65cac4c421..0000000000
Binary files a/Open-ILS/web/images/media/media_onlinejournal.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_player.png b/Open-ILS/web/images/media/media_player.png
deleted file mode 100644
index 64197e160e..0000000000
Binary files a/Open-ILS/web/images/media/media_player.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_podcasts.png b/Open-ILS/web/images/media/media_podcasts.png
deleted file mode 100644
index d563fbb2cd..0000000000
Binary files a/Open-ILS/web/images/media/media_podcasts.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_streamingaudio.png b/Open-ILS/web/images/media/media_streamingaudio.png
deleted file mode 100644
index 51c31c3b30..0000000000
Binary files a/Open-ILS/web/images/media/media_streamingaudio.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_streamingvideo.png b/Open-ILS/web/images/media/media_streamingvideo.png
deleted file mode 100644
index 3fe2cbe906..0000000000
Binary files a/Open-ILS/web/images/media/media_streamingvideo.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/media_vhs.png b/Open-ILS/web/images/media/media_vhs.png
deleted file mode 100644
index 11c1e42738..0000000000
Binary files a/Open-ILS/web/images/media/media_vhs.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/n.png b/Open-ILS/web/images/media/n.png
deleted file mode 100644
index 62b1af2874..0000000000
Binary files a/Open-ILS/web/images/media/n.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/o.png b/Open-ILS/web/images/media/o.png
deleted file mode 100644
index c60d039bce..0000000000
Binary files a/Open-ILS/web/images/media/o.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/p.png b/Open-ILS/web/images/media/p.png
deleted file mode 100644
index 009d292505..0000000000
Binary files a/Open-ILS/web/images/media/p.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/q.png b/Open-ILS/web/images/media/q.png
deleted file mode 100644
index 09496307fa..0000000000
Binary files a/Open-ILS/web/images/media/q.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/r.png b/Open-ILS/web/images/media/r.png
deleted file mode 100644
index 65a2de24a4..0000000000
Binary files a/Open-ILS/web/images/media/r.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/s.png b/Open-ILS/web/images/media/s.png
deleted file mode 100644
index 94cebfb530..0000000000
Binary files a/Open-ILS/web/images/media/s.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/t.png b/Open-ILS/web/images/media/t.png
deleted file mode 100644
index 437f91f32f..0000000000
Binary files a/Open-ILS/web/images/media/t.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/v.png b/Open-ILS/web/images/media/v.png
deleted file mode 100644
index 53a192e35f..0000000000
Binary files a/Open-ILS/web/images/media/v.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/w.png b/Open-ILS/web/images/media/w.png
deleted file mode 100644
index 1270685a66..0000000000
Binary files a/Open-ILS/web/images/media/w.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/x.png b/Open-ILS/web/images/media/x.png
deleted file mode 100644
index bcd621c9de..0000000000
Binary files a/Open-ILS/web/images/media/x.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/y.png b/Open-ILS/web/images/media/y.png
deleted file mode 100644
index a5db0672ac..0000000000
Binary files a/Open-ILS/web/images/media/y.png and /dev/null differ
diff --git a/Open-ILS/web/images/media/z.png b/Open-ILS/web/images/media/z.png
deleted file mode 100644
index ccf1fed6b3..0000000000
Binary files a/Open-ILS/web/images/media/z.png and /dev/null differ
diff --git a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
index d309d82b09..8a9c0f3940 100644
--- a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
@@ -43,10 +43,14 @@
             END;
         END;
 
-        # XXX get me from SVF attrs.  If no "matttype" attr present, fall back to mods-esque item form/type
-        args.mattype = xml.findnodes('//*[@tag="998"]/*[@code="d"]').textContent;
-        args.format = ctx.find_citm(args.mattype).value;
-        args.format_icon = 'media/' _ args.mattype _ '.png';
+        FOR icon_style IN ['mattype', 'item_type']; 
+            node = xml.findnodes('//*[local-name()="attributes"]/*[local-name()="field"][@name="' _ icon_style _ '"]');
+            IF node;
+                args.format_label = node.getAttribute('coded-value')
+                args.format_icon = ctx.media_prefix _ '/images/format_icons/' _ icon_style _ '/' _ node.textContent _ '.png';
+                LAST;
+            END;
+        END;
     END;
 
     BLOCK get_hold_status;
diff --git a/Open-ILS/web/templates/default/opac/parts/result/table.tt2 b/Open-ILS/web/templates/default/opac/parts/result/table.tt2
index 6dc5eb36bf..3ce5ffa4fd 100644
--- a/Open-ILS/web/templates/default/opac/parts/result/table.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/result/table.tt2
@@ -154,39 +154,36 @@
                                                     </span>
                                                 </div>
                                             </td>
-                                            <!-- Copy this td for each copy count appended -->
-                                            <td nowrap='nowrap' name="copy_count_cell"
-                                                class='copy_count_cell hide_me' width="1"> </td>
-                                            <td name='result_table_format_cell'
-                                                class='result_table_format_cell' width="1">
-                                                [% IF attrs.format %]
-                                                <img alt="[% attrs.format %]" src="[% ctx.media_prefix %]/images/[% attrs.format_icon %]" />
+
+                                            <td name='result_table_format_cell' class='result_table_format_cell' width="1">
+
+                                                [% IF attrs.format_icon %]
+                                                <img title="[% attrs.format_label %]" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />
                                                 [% END %]
-                                                <span class='hide_me opac-auto-031'>
-                                                    <span>[% l("Match Score: ") %] </span>
-                                                    <span name='relevancy_span'> </span>
-                                                </span>
+
                                                 <!-- Empty span used for creating unAPI links -->
                                                 <span class="hide_me">
                                                     <abbr style='padding-left: 8px;' name="unapi" class="unapi-id">
                                                     <!-- unAPI URI goes here -->
                                                     </abbr>
                                                 </span>
+
                                                 <!-- Empty span used for creating Google Book Search-->
                                                 <span name="googleBooksLink" class="hide_me">
                                                     <a style='padding-left: 8px;'
                                                         class='classic_link hide_me'
                                                         name="googleBooks-link">[% l("Browse in Google Books Search") %]</a>
                                                 </span>
+
                                             </td>
                                             <td nowrap='nowrap' width="1" align="right">
                                                 <div style="width:250px;text-align:left;">
                                                     <div style="float:right;">
                                                         <div class="results_aux_utils opac-auto-010"><a
-                                                                href="[% ctx.opac_root %]/place_hold[% propagator; propagator.length > 1 ? "&" : ""; %]hold_target=[% rec.id %]&hold_type=T" name="place_hold_link" class="no-dec"><img
+                                                                href="[% ctx.opac_root %]/place_hold[% propagator; propagator.length > 1 ? "&" : ""; %]hold_target=[% rec.id %]&hold_type=T" 
+                                                                    name="place_hold_link" class="no-dec"><img
                                                                 src="[% ctx.media_prefix %]/images/green_check.png"
-                                                                alt="place hold" /><span
-                                                                    style="position:relative;top:-3px;left:3px;">Place Hold</span></a>
+                                                                alt="[% l('Place hold') %]"/><span style="position:relative;top:-3px;left:3px;">[% l('Place Hold') %]</span></a>
                                                         </div>
                                                         <div class="results_aux_utils opac-auto-011">
                                                             [%  operation = ctx.mylist.grep(rec.id).size ? "delete" : "add";
@@ -211,18 +208,10 @@
                                                                     style="position:relative;top:-5px;">Reviews &amp; More</span></a>
                                                         </div> -->
                                                     </div>
-                                                    <div style="float:right;margin-right:17px;">
-                                                    [%  key = attrs.mattype;
-                                                        format_desc = ctx.find_citm(key).value;
-                                                        icon_filename = icon_by_mattype.$key;
-                                                        IF icon_filename; %]
-                                                        <img alt="[% format_desc %]" title="[% format_desc %]"
-                                                            src="[% ctx.media_prefix _ '/images/' _ icon_filename %]" />
-                                                    [% END %]
-                                                    </div>
                                                 </div>
                                             </td>
                                         </tr>
+
                                         <!-- Placeholder for ChiliFresh Review -->
                                         <tr class="hide_me" name="chilifreshReview">
                                             <td></td>
diff --git a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
index b99a3e2de0..4be2b14cb8 100644
--- a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
@@ -38,7 +38,7 @@
                         <input id='search-submit-go' type="image" alt="[% l('Search') %]" src="[% ctx.media_prefix %]/images/go-btn.png"
                             onmouseover="this.src='[% ctx.media_prefix %]/images/go-btn-hover.png';"
                             onmouseout="this.src='[% ctx.media_prefix %]/images/go-btn.png';" 
-                            onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 1000)'/>
+                            onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
                         <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden'/>
                     </div>
                 </div>