[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/C4 Koha.pm [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha/C4 Koha.pm [rel_3_0] |
|
Date: |
Tue, 09 Jan 2007 10:39:55 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 07/01/09 10:39:55
Modified files:
C4 : Koha.pm
Log message:
sync with dev_week. ( fix for validation problems )
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.32&r2=1.40.2.33
Patches:
Index: Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.40.2.32
retrieving revision 1.40.2.33
diff -u -b -r1.40.2.32 -r1.40.2.33
--- Koha.pm 9 Jan 2007 08:35:04 -0000 1.40.2.32
+++ Koha.pm 9 Jan 2007 10:39:55 -0000 1.40.2.33
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Koha.pm,v 1.40.2.32 2007/01/09 08:35:04 tipaul Exp $
+# $Id: Koha.pm,v 1.40.2.33 2007/01/09 10:39:55 toins Exp $
use strict;
require Exporter;
@@ -25,7 +25,7 @@
use C4::Output;
use vars qw($VERSION @ISA @EXPORT);
-$VERSION = do { my @v = '$Revision: 1.40.2.32 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.40.2.33 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -888,39 +888,39 @@
sub displaySortby {
my ($sort_by) = @_;
my $sort_by_loop = [
- { value => "1=9523 >i", label => "Popularity (Most to Least)" },
- { value => "1=9523 <i", label => "Popularity (Least to Most)" },
- { value => "1=1003 <i", label => "Author (A-Z)" },
- { value => "1=1003 >i", label => "Author (Z-A)" },
+ { value => "1=9523 >i", label => "Popularity (Most to Least)" },
+ { value => "1=9523 <i", label => "Popularity (Least to Most)" },
+ { value => "1=1003 <i", label => "Author (A-Z)" },
+ { value => "1=1003 >i", label => "Author (Z-A)" },
{
- value => "1=20 <i",
+ value => "1=20 <i",
label => "Call Number (Non-fiction 0-9 to Fiction A-Z)"
},
{
- value => "1=20 >i",
+ value => "1=20 >i",
label => "Call Number (Fiction Z-A to Non-fiction 9-0)"
},
- { value => "1=31 >i", label => "Dates" },
+ { value => "1=31 >i", label => "Dates" },
{
- value => "1=31 >i",
+ value => "1=31 >i",
label =>
" Publication/Copyright Date: Newest to Oldest"
},
{
- value => "1=31 <i",
+ value => "1=31 <i",
label =>
" Publication/Copyright Date: Oldest to Newest"
},
{
- value => "1=32 >i",
+ value => "1=32 >i",
label => " Acquisition Date: Newest to Oldest"
},
{
- value => "1=32 <i",
+ value => "1=32 <i",
label => " Acquisition Date: Oldest to Newest"
},
- { value => "1=36 <i", label => "Title (A-Z)" },
- { value => "1=36 >i", label => "Title (Z-A)" },
+ { value => "1=36 <i", label => "Title (A-Z)" },
+ { value => "1=36 >i", label => "Title (Z-A)" },
];
for my $hash (@$sort_by_loop) {
@@ -1278,30 +1278,30 @@
inner_limit_types_loop => [
{
label => "Books",
- id => "mc-bks",
+ id => "mc-books",
name => "limit",
- value => "mc:t",
- icon => "AF.gif",
+ value => "(mc-collection:AF or mc-collection:MYS or
mc-collection:SCI or mc-collection:NF or mc-collection:YA or mc-collection:BIO
or mc-collection:LP or mc-collection:LPNF)",
+ icon => "search-books.gif",
title =>
"Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and
dissertations",
},
{
- label => "Visual Materials",
- id => "mc-vis",
+ label => "Movies",
+ id => "mc-movies",
name => "limit",
- value => "mc:v",
- icon => "AV Aids.gif",
+ value => "(mc-collection:DVD or mc-collection:AV or
mc-collection:AVJ or mc-collection:AVJN or mc-collection:AVJNF or
mc-collection:AVNF)",
+ icon => "search-movies.gif",
title =>
"Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos,
Cards, Charts, Drawings",
},
{
- label => "Books on Tape",
- id => "mc-sr",
+ label => "Music",
+ id => "mc-music",
name => "limit",
- value => "mc-rtype:i",
- icon => "AF.gif",
+ value => "(mc-collection:CDM)",
+ icon => "search-music.gif",
title => "Spoken, Books on CD and Cassette",
},
],
@@ -1309,61 +1309,52 @@
{
inner_limit_types_loop => [
{
- label => "Computer Files",
- id => "mc-cf",
+ label => "Audio Books",
+ id => "mc-audio-books",
name => "limit",
- value => "mc:c",
- icon => "CD-ROM software.gif",
- title => "Computer files, Data, Software",
+ value => "(mc-collection:AB or mc-collection:AC or
mc-collection:JAC or mc-collection:YAC)",
+ icon => "search-audio-books.gif",
+ title => "Spoken, Books on CD and Cassette",
},
{
label => "Local History Materials",
- id => "mc-lh",
+ id => "mc-local-history",
name => "limit",
value => "mc-collection:LH",
icon => "Local history.gif",
title => "Local History Materials",
},
- {
- label => "Maps",
- id => "mc-map",
+ {label => "Large Print",
+ id => "mc-large-print",
name => "limit",
- value => "mc:a",
- icon => "PF.gif ",
- title => "Maps, Globes",
- },
+ value => "(mc-collection:LP or mc-collection:LPNF)",
+ icon => "search-large-print.gif ",
+ title => "Large Print",},
],
},
- {
- inner_limit_types_loop => [
- {
- label => "Music",
- id => "mc-mus",
+{ inner_limit_types_loop => [
+ {label => "Kids",
+ id => "mc-kids",
name => "limit",
- value => "mc-rtype:j",
- icon => "CDM.gif",
- title => "Music",
- },
+ value => "(mc-collection:EASY or mc-collection:JNF or mc-collection:JF or
mc-collection:JREF or mc-collection:JB)",
+ icon => "search-kids.gif",
+ title => "Music",},
- {
- label => "Kits",
- id => "mc-kit",
+ {label => "Software/Internet",
+ id => "mc-sofware-web",
name => "limit",
- value => "mc-rtype:o",
- icon => "KIT.gif",
- title => "Kits",
- },
+ value => "(mc-collection:CDR)",
+ icon => "search-software-web.gif",
+ title => "Kits",},
- {
- label => "Reference",
- id => "mc-ref",
+ {label => "Reference",
+ id => "mc-reference",
name => "limit",
value => "mc-collection:REF",
- icon => "REF.gif",
- title => "Reference",
- },
+ icon => "search-reference.gif",
+ title => "Reference",},
],
},