[Koha-cvs] koha/C4 Koha.pm [dev_week]

Joshua Ferraro jmf at kados.org
Mon Dec 4 06:19:36 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/12/04 05:19:36

Modified files:
	C4             : Koha.pm 

Log message:
	fix for validation problems

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.7&r2=1.22.2.4.2.8

Patches:
Index: Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.22.2.4.2.7
retrieving revision 1.22.2.4.2.8
diff -u -b -r1.22.2.4.2.7 -r1.22.2.4.2.8
--- Koha.pm	8 Oct 2006 18:09:02 -0000	1.22.2.4.2.7
+++ Koha.pm	4 Dec 2006 05:19:36 -0000	1.22.2.4.2.8
@@ -793,19 +793,19 @@
 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=20 <i", label => "Call Number (Non-fiction 0-9 to Fiction A-Z)"},
-    {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 => "&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest"},
-    {value =>"1=31 <i", label => "&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest"},
-    {value =>"1=32 >i", label => "&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest"},
-    {value =>"1=32 <i", label => "&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest"},
-    {value =>"1=36 <i", label => "Title (A-Z)"},
-    {value =>"1=36 >i", label => "Title (Z-A)"},
+    {value =>"1=9523 &gt;i", label => "Popularity (Most to Least)"},
+    {value =>"1=9523 &lt;i", label => "Popularity (Least to Most)"},
+    {value =>"1=1003 &lt;i", label => "Author (A-Z)"},
+    {value =>"1=1003 &gt;i", label => "Author (Z-A)"},
+    {value =>"1=20 &lt;i", label => "Call Number (Non-fiction 0-9 to Fiction A-Z)"},
+    {value =>"1=20 &gt;i", label => "Call Number (Fiction Z-A to Non-fiction 9-0)"},
+    {value =>"1=31 &gt;i", label => "Dates"},
+    {value =>"1=31 &gt;i", label => "&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest"},
+    {value =>"1=31 &lt;i", label => "&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest"},
+    {value =>"1=32 &gt;i", label => "&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest"},
+    {value =>"1=32 &lt;i", label => "&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest"},
+    {value =>"1=36 &lt;i", label => "Title (A-Z)"},
+    {value =>"1=36 &gt;i", label => "Title (Z-A)"},
     ];
     for my $hash (@$sort_by_loop) {
         #warn "sort by: $sort_by ... hash:".$hash->{value};
@@ -974,70 +974,70 @@
 
 { 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",},
     ],
 },
 { 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",
+    value => "(mc-collection:LH)",
+    icon => "search-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",
+    {label => "Kids",
+    id => "mc-kids",
     name => "limit",
-    value => "mc-rtype:j",
-    icon => "CDM.gif",
+    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",
+    value => "(mc-collection:CDR)",
+    icon => "search-software-web.gif",
     title => "Kits",},
 
     {label => "Reference",
-    id => "mc-ref",
+    id => "mc-reference",
     name => "limit",
     value => "mc-collection:REF",
-    icon => "REF.gif",
+    icon => "search-reference.gif",
     title => "Reference",},
 
     ],





More information about the Koha-cvs mailing list