[Koha-cvs] koha C4/Search.pm catalogue/search.pl koha-tmpl...
paul poulain
paul at koha-fr.org
Mon May 28 18:28:46 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/05/28 16:28:45
Modified files:
C4 : Search.pm
catalogue : search.pl
koha-tmpl/opac-tmpl/prog/en: opac-results.tmpl
koha-tmpl/opac-tmpl/prog/en/includes: opac.css
misc/zebra : record_biblios_unimarc.abs
opac : opac-search.pl
Log message:
merging opac details only for items with the same branch+location+itemcallnumber && putting publisher before publicationyear && lowering item column size in result page && fixing a missing branch reference in ccl.properties
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/record_biblios_unimarc.abs?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&r1=1.42&r2=1.43
Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- C4/Search.pm 22 May 2007 08:54:21 -0000 1.143
+++ C4/Search.pm 28 May 2007 16:28:43 -0000 1.144
@@ -25,7 +25,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.143 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.144 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -957,25 +957,24 @@
else {
$norequests = 0;
if ( $item->{'homebranch'} ) {
- $items->{ $item->{'homebranch'} }->{count}++;
+ $items->{ $item->{'homebranch'}.'--'.$item->{'itemcallnumber'} }->{count}++;
}
# Last resort
elsif ( $item->{'holdingbranch'} ) {
$items->{ $item->{'homebranch'} }->{count}++;
}
- $items->{ $item->{homebranch} }->{itemcallnumber} =
- $item->{itemcallnumber};
- $items->{ $item->{homebranch} }->{location} =
- $item->{location};
+ $items->{ $item->{'homebranch'}.'--'.$item->{'itemcallnumber'} }->{itemcallnumber} = $item->{itemcallnumber};
+ $items->{ $item->{'homebranch'}.'--'.$item->{'itemcallnumber'} }->{location} = $item->{location};
+ $items->{ $item->{'homebranch'}.'--'.$item->{'itemcallnumber'} }->{branchcode} = $item->{homebranch};
}
} # notforloan, item level and biblioitem level
for my $key ( keys %$items ) {
#warn "key: $key";
my $this_item = {
- branchname => $branches{$key},
- branchcode => $key,
+ branchname => $branches{$items->{$key}->{branchcode}},
+ branchcode => $items->{$key}->{branchcode},
count => $items->{$key}->{count},
itemcallnumber => $items->{$key}->{itemcallnumber},
location => $items->{$key}->{location},
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/search.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- catalogue/search.pl 23 May 2007 16:19:40 -0000 1.7
+++ catalogue/search.pl 28 May 2007 16:28:44 -0000 1.8
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/catalogue/search.pl,v 1.7 2007/05/23 16:19:40 tipaul Exp $
+# $Header: /sources/koha/koha/catalogue/search.pl,v 1.8 2007/05/28 16:28:44 tipaul Exp $
#
# Copyright 2006 LibLime
#
@@ -226,7 +226,7 @@
my $selected=1;
my $cnt;
my $imgdir = getitemtypeimagesrc();
-foreach my $thisitemtype (sort keys %$itemtypes) {
+foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
my %row =( number=>$cnt++,
imageurl=> $itemtypes->{$thisitemtype}->{'imageurl'}?($imgdir."/".$itemtypes->{$thisitemtype}->{'imageurl'}):"",
code => $thisitemtype,
Index: koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 23 May 2007 16:16:55 -0000 1.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 28 May 2007 16:28:44 -0000 1.5
@@ -227,8 +227,8 @@
<!-- TMPL_ELSE -->
<!-- /TMPL_IF -->
- <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
@@ -242,13 +242,15 @@
<span class="available">
<!-- TMPL_LOOP NAME="items_loop" -->
<!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchname" -->
- <!-- TMPL_IF name="itemcallnumber" --> <i>(<!-- TMPL_VAR name="itemcallnumber" -->)</i><!-- /TMPL_IF -->
- <!-- TMPL_IF name="location" --> <i>(<!-- TMPL_VAR name="location" -->)</i><!-- /TMPL_IF -->
+ <i>
+ <!-- TMPL_IF name="location" --> <!-- TMPL_VAR name="location" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="itemcallnumber" --> <!-- TMPL_VAR name="itemcallnumber" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="classification" -->
- <i>(<a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
+ <a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
<!-- TMPL_VAR NAME="classification" -->
- </a>)</i>
+ </a>
<!-- /TMPL_IF -->
+ </i>
<br />
<!-- /TMPL_LOOP -->
</span>
Index: koha-tmpl/opac-tmpl/prog/en/includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/opac-tmpl/prog/en/includes/opac.css 23 May 2007 16:16:56 -0000 1.4
+++ koha-tmpl/opac-tmpl/prog/en/includes/opac.css 28 May 2007 16:28:44 -0000 1.5
@@ -348,11 +348,12 @@
}
.available {
- background-color: white;
+ font-size:0.75em;
}
.unavailable {
background-color: #FFED3D;
+ font-size:0.75em;
}
/* style for search terms in catalogsearch */
Index: misc/zebra/record_biblios_unimarc.abs
===================================================================
RCS file: /sources/koha/koha/misc/zebra/record_biblios_unimarc.abs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- misc/zebra/record_biblios_unimarc.abs 25 May 2007 09:34:31 -0000 1.4
+++ misc/zebra/record_biblios_unimarc.abs 28 May 2007 16:28:44 -0000 1.5
@@ -1,4 +1,4 @@
-# $Id: record_biblios_unimarc.abs,v 1.4 2007/05/25 09:34:31 tipaul Exp $
+# $Id: record_biblios_unimarc.abs,v 1.5 2007/05/28 16:28:44 tipaul Exp $
# indexing rules. It
# results in a server which provides a passable Bath level 0 and 1 service
@@ -364,9 +364,9 @@
#melm 952$a Local-classification
#melm 995$a Record-source
-melm 995$a Host-item
-melm 995$c Record-Source
-melm 995$d Record-Source
+melm 995$a Branch,Host-item
+melm 995$c Branch,Record-Source
+melm 995$d Branch,Record-Source
melm 995$f Stock-number
melm 995$s popularity:n,popularity:s
#melm 952$v Date-of-acquisition,Date-of-acquisition:d,Date-of-acquisition:s
Index: opac/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- opac/opac-search.pl 9 May 2007 10:09:40 -0000 1.42
+++ opac/opac-search.pl 28 May 2007 16:28:45 -0000 1.43
@@ -3,7 +3,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.42 2007/05/09 10:09:40 tipaul Exp $
+# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.43 2007/05/28 16:28:45 tipaul Exp $
#
# Copyright 2006 LibLime
#
@@ -235,7 +235,7 @@
my $selected = 1;
my $cnt;
my $imgdir = getitemtypeimagesrc();
-foreach my $thisitemtype ( sort keys %$itemtypes ) {
+foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
my %row = (
number => $cnt++,
imageurl => $imgdir . "/" . $itemtypes->{$thisitemtype}->{'imageurl'},
More information about the Koha-cvs
mailing list