fixing itemtype image, sample data, improving

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Search.pm b/C4/Search.pm
index eeb8933..09b324d 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -963,6 +963,7 @@ sub searchResults {
             my $old_term = $term;
             if ( length($term) > 3 ) {
                 $term =~ s/(.*=|\)|\(|\+|\.|\?|\[|\])//g;
+                               $term =~ s/\\//g;
 
                 #FIXME: is there a better way to do this?
                 $oldbiblio->{'title'} =~ s/$term/<span class=term>$&<\/span>/gi;

diff --git a/installer/data/en/optional/sample_itemtypes.sql b/installer/data/en/optional/sample_itemtypes.sql
index cd54d4a..36bb6fd 100644 (file)
--- a/installer/data/en/optional/sample_itemtypes.sql
+++ b/installer/data/en/optional/sample_itemtypes.sql
@@ -1,8 +1,8 @@
 INSERT INTO `itemtypes` VALUES ('BKS', 'Books, Booklets, Workbooks',5,0,0,'Non-fiction.gif','');
 INSERT INTO `itemtypes` VALUES ('CF', 'CD-ROMs, DVD-ROMs, General Online Resources',5,0,0,'CDM.gif','');
 INSERT INTO `itemtypes` VALUES ('SR', 'Audio Cassettes, CDs',5,0,0,'AVNF.gif','');
-INSERT INTO `itemtypes` VALUES ('VR', 'DVDs, VHS',5,0,0,'Video disk.gif','');
+INSERT INTO `itemtypes` VALUES ('VR', 'DVDs, VHS',5,0,0,'Video-disc.gif','');
 INSERT INTO `itemtypes` VALUES ('AR', 'Models',5,0,1,'EASY.gif','');
-INSERT INTO `itemtypes` VALUES ('KT', 'Kits',5,0,0,'Kit.gif','');
+INSERT INTO `itemtypes` VALUES ('KT', 'Kits',5,0,0,'KIT.gif','');
 INSERT INTO `itemtypes` VALUES ('IR', 'Binders',5,0,0,'Faculty Course Materials.gif','');
 INSERT INTO `itemtypes` VALUES ('SER', 'Serials',5,0,0,'MZ.gif','');

diff --git a/koha-tmpl/opac-tmpl/prog/itemtypeimg/Video disc.gif b/koha-tmpl/opac-tmpl/prog/itemtypeimg/Video disc.gif
deleted file mode 100644 (file)
index 12b87d6..0000000
Binary files a/koha-tmpl/opac-tmpl/prog/itemtypeimg/Video disc.gif and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/prog/itemtypeimg/Video-disc.gif b/koha-tmpl/opac-tmpl/prog/itemtypeimg/Video-disc.gif
new file mode 100644 (file)
index 0000000..12b87d6
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/itemtypeimg/Video-disc.gif differ