[Koha-cvs] koha C4/Koha.pm catalogue/search.pl opac/opac-s... [rel_3_0]
Joshua Ferraro
jmf at liblime.com
Tue Feb 20 07:35:57 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Joshua Ferraro <kados> 07/02/20 06:35:57
Modified files:
C4 : Koha.pm
catalogue : search.pl
opac : opac-search.pl
Log message:
removing language functions from Koha.pm
removing displayLanguages* from search scripts (note that language
limits were removed from the templates, I'll be adding them back
shortly)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.39&r2=1.40.2.40
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.16&r2=1.1.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.15&r2=1.38.2.16
Patches:
Index: C4/Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.40.2.39
retrieving revision 1.40.2.40
diff -u -b -r1.40.2.39 -r1.40.2.40
--- C4/Koha.pm 13 Feb 2007 10:02:29 -0000 1.40.2.39
+++ C4/Koha.pm 20 Feb 2007 06:35:56 -0000 1.40.2.40
@@ -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.39 2007/02/13 10:02:29 hdl Exp $
+# $Id: Koha.pm,v 1.40.2.40 2007/02/20 06:35:56 kados 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.39 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.40.2.40 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -59,15 +59,13 @@
&get_itemtypeinfos_of
&getframeworks &getframeworkinfo
&getauthtypes &getauthtype
- &getallthemes &GetLanguages
+ &getallthemes
&getFacets
&displaySortby
&displayIndexes
- &displayLanguagesLimit
&displaySubtypesLimit
&displayLimitTypes
&displayServers
- &displayLanguages
&getnbpages
&getitemtypeimagesrcfromurl
&get_infos_of
@@ -530,131 +528,6 @@
return $printer;
}
-=head2 GetLanguages
-
- (@languages) = &GetLanguages($type);
- (@languages) = &GetLanguages($type,$theme);
-
-Returns an array of all available languages.
-
-=cut
-
-sub GetLanguages {
- my $type = shift;
- my $theme = shift;
- my $htdocs;
- my @languages;
- if ( $type eq 'opac' ) {
- $htdocs = C4::Context->config('opachtdocs');
- if ( $theme and -d "$htdocs/$theme" ) {
- opendir D, "$htdocs/$theme";
- foreach my $language ( readdir D ) {
- next if $language =~ /^\./;
- next if $language eq 'all';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- next if $language =~ /CVS$/;
- next if $language =~ /itemtypeimg$/;
- next if $language =~ /\.txt$/i; #Don't read the readme.txt !
- next if $language eq 'images';
- push @languages, $language;
- }
- return sort @languages;
- }
- else {
- my $lang;
- foreach my $theme ( getallthemes('opac') ) {
- opendir D, "$htdocs/$theme";
- foreach my $language ( readdir D ) {
- next if $language =~ /^\./;
- next if $language eq 'all';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- next if $language =~ /CVS$/;
- next if $language =~ /itemtypeimg$/;
- next if $language =~ /\.txt$/i; #Don't read the readme.txt !
- next if $language eq 'images';
- $lang->{$language} = 1;
- }
- }
- @languages = keys %$lang;
- return sort @languages;
- }
- }
- elsif ( $type eq 'intranet' ) {
- $htdocs = C4::Context->config('intrahtdocs');
- if ( $theme and -d "$htdocs/$theme" ) {
- opendir D, "$htdocs/$theme";
- foreach my $language ( readdir D ) {
- next if $language =~ /^\./;
- next if $language eq 'all';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- next if $language =~ /CVS$/;
- next if $language =~ /itemtypeimg$/;
- next if $language =~ /\.txt$/i; #Don't read the readme.txt !
- next if $language eq 'images';
- push @languages, $language;
- }
- return sort @languages;
- }
- else {
- my $lang;
- foreach my $theme ( getallthemes('opac') ) {
- opendir D, "$htdocs/$theme";
- foreach my $language ( readdir D ) {
- next if $language =~ /^\./;
- next if $language eq 'all';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- next if $language =~ /CVS$/;
- next if $language =~ /itemtypeimg$/;
- next if $language =~ /\.txt$/i; #Don't read the readme.txt !
- next if $language eq 'images';
- $lang->{$language} = 1;
- }
- }
- @languages = keys %$lang;
- return sort @languages;
- }
- }
- else {
- my $lang;
- my $htdocs = C4::Context->config('intrahtdocs');
- foreach my $theme ( getallthemes('intranet') ) {
- opendir D, "$htdocs/$theme";
- foreach my $language ( readdir D ) {
- next if $language =~ /^\./;
- next if $language eq 'all';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- next if $language =~ /CVS$/;
- next if $language =~ /itemtypeimg$/;
- next if $language =~ /\.txt$/i; #Don't read the readme.txt !
- next if $language eq 'images';
- $lang->{$language} = 1;
- }
- }
- $htdocs = C4::Context->config('opachtdocs');
- foreach my $theme ( getallthemes('opac') ) {
- opendir D, "$htdocs/$theme";
- foreach my $language ( readdir D ) {
- next if $language =~ /^\./;
- next if $language eq 'all';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- next if $language =~ /CVS$/;
- next if $language =~ /itemtypeimg$/;
- next if $language =~ /\.txt$/i; #Don't read the readme.txt !
- next if $language eq 'images';
- $lang->{$language} = 1;
- }
- }
- @languages = keys %$lang;
- return sort @languages;
- }
-}
-
=item getnbpages
Returns the number of pages to display in a pagination bar, given the number
@@ -1072,205 +945,6 @@
return $outer_subtype_limits_loop;
}
-sub displayLanguagesLimit {
- my $languages_loop = [
- {
- value => "",
- language_label => "No Limit",
- locale_label => "",
- selected => "selected",
- },
- {
- value => "ln:ara",
- language_label =>
- "العربية",
- locale_label => "Arabic",
- ,
- },
- {
- value => "ln:bul",
- language_label =>
- "Български",
- locale_label => "Bulgarian",
- ,
- },
- {
- value => "ln:chi",
- language_label => "中文",
- locale_label => "Chinese",
- ,
- },
- {
- value => "ln:scr",
- language_label => "Hrvatski",
- locale_label => "Croatian",
- ,
- },
- {
- value => "ln:cze",
- language_label => "čeština",
- locale_label => "Czech",
- ,
- },
- {
- value => "ln:dan",
- language_label => "Dænsk",
- locale_label => "Danish",
- ,
- },
- {
- value => "ln:dut",
- language_label => "nedərlɑns",
- locale_label => "Dutch",
- ,
- },
- {
- value => "ln:eng",
- language_label => "English",
- locale_label => "",
- ,
- },
- {
- value => "ln:fre",
- language_label => "Français",
- locale_label => "French",
- ,
- },
- {
- value => "ln:ger",
- language_label => "Deutsch",
- locale_label => "German",
- ,
- },
- {
- value => "ln:gre",
- language_label =>
- "ελληνικά",
- locale_label => "Greek, Modern [1453- ]",
- ,
- },
- {
- value => "ln:heb",
- language_label => "עברית",
- locale_label => "Hebrew",
- ,
- },
- {
- value => "ln:hin",
- language_label => "हिन्दी",
- locale_label => "Hindi",
- ,
- },
- {
- value => "ln:hun",
- language_label => "Magyar",
- locale_label => "Hungarian",
- ,
- },
- {
- value => "ln:ind",
- language_label => "",
- locale_label => "Indonesian",
- ,
- },
- {
- value => "ln:ita",
- language_label => "Italiano",
- locale_label => "Italian",
- ,
- },
- {
- value => "ln:jpn",
- language_label => "日本語",
- locale_label => "Japanese",
- ,
- },
- {
- value => "ln:kor",
- language_label => "한국어",
- locale_label => "Korean",
- ,
- },
- {
- value => "ln:lat",
- language_label => "Latina",
- locale_label => "Latin",
- ,
- },
- {
- value => "ln:nor",
- language_label => "Norsk",
- locale_label => "Norwegian",
- ,
- },
- {
- value => "ln:per",
- language_label => "فارسى",
- locale_label => "Persian",
- ,
- },
- {
- value => "ln:pol",
- language_label => "Polski",
- locale_label => "Polish",
- ,
- },
- {
- value => "ln:por",
- language_label => "Português",
- locale_label => "Portuguese",
- ,
- },
- {
- value => "ln:rum",
- language_label => "Română",
- locale_label => "Romanian",
- ,
- },
- {
- value => "ln:rus",
- language_label =>
- "Русский",
- locale_label => "Russian",
- ,
- },
- {
- value => "ln:spa",
- language_label => "Español",
- locale_label => "Spanish",
- ,
- },
- {
- value => "ln:swe",
- language_label => "Svenska",
- locale_label => "Swedish",
- ,
- },
- {
- value => "ln:tha",
- language_label =>
- "ภาษาไทย",
- locale_label => "Thai",
- ,
- },
- {
- value => "ln:tur",
- language_label => "Türkçe",
- locale_label => "Turkish",
- ,
- },
- {
- value => "ln:ukr",
- language_label =>
-"Українська",
- locale_label => "Ukrainian",
- ,
- },
-
- ];
- return $languages_loop;
-}
-
sub displayLimitTypes {
my $outer_limit_types_loop = [
@@ -1414,40 +1088,6 @@
return; #$secondary_servers_loop;
}
-sub displayLanguages {
- my ($cgi) = @_;
- my @languages_options;
- my $languages_hash =
- { en => 'English', es => 'Español',
- }; #de => 'Deutsch', en => 'English', es => 'Español', fr => 'Français', pl => 'Polski', "zh-TW" => '中文', it => 'Italiano',};
- my $counter = 0;
- foreach my $language ( GetLanguages("opac") ) {
- next if $language eq 'images';
- next if $language eq 'itemtypeimg';
- next if $language eq 'CVS';
- next if $language =~ /png$/;
- next if $language =~ /css$/;
- my $label = $languages_hash->{$language};
- my $selected = '0';
- my $htdocs = C4::Context->config('opacdocs');
- my ( $current_theme, $current_language ) =
- themelanguage( "opachtdocs", "prog", "opac", $cgi );
- my $current = 1 if $current_language eq $language;
-
-# next if $currently_selected_languages->{$language};
- push @languages_options,
- {
- label => $label,
- language => $language,
- counter => $counter,
- current => $current
- }
- if $label;
- $counter++;
- }
- return @languages_options;
-}
-
sub GetDepartements {
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -b -r1.1.2.16 -r1.1.2.17
--- catalogue/search.pl 9 Feb 2007 17:09:26 -0000 1.1.2.16
+++ catalogue/search.pl 20 Feb 2007 06:35:57 -0000 1.1.2.17
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.16 2007/02/09 17:09:26 hdl Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.17 2007/02/20 06:35:57 kados Exp $
#
# Copyright 2006 LibLime
#
@@ -148,6 +148,7 @@
use C4::Interface::CGI::Output;
use C4::Auth;
use C4::Search;
+use C4::Languages; # getAllLanguages
use C4::Koha;
use POSIX qw(ceil floor);
use C4::Branch; # GetBranches
@@ -299,7 +300,7 @@
search_boxes_loop => \@search_boxes_array);
# load the language limits (for search)
- my $languages_limit_loop = displayLanguagesLimit();
+ my $languages_limit_loop = getAllLanguages();
$template->param(search_languages_loop => $languages_limit_loop,);
# load the subtype limits
Index: opac/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.38.2.15
retrieving revision 1.38.2.16
diff -u -b -r1.38.2.15 -r1.38.2.16
--- opac/opac-search.pl 10 Jan 2007 10:52:58 -0000 1.38.2.15
+++ opac/opac-search.pl 20 Feb 2007 06:35:57 -0000 1.38.2.16
@@ -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.38.2.15 2007/01/10 10:52:58 toins Exp $
+# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.38.2.16 2007/02/20 06:35:57 kados Exp $
#
# Copyright 2006 LibLime
#
@@ -151,6 +151,7 @@
use C4::Interface::CGI::Output;
use C4::Auth;
use C4::Search;
+use C4::Languages; # getAllLanguages
use C4::Koha;
use C4::Branch; # GetBranches
use POSIX qw(ceil floor);
@@ -320,7 +321,7 @@
);
# load the language limits (for search)
- my $languages_limit_loop = displayLanguagesLimit();
+ my $languages_limit_loop = getAllLanguages();
$template->param( search_languages_loop => $languages_limit_loop, );
# load the subtype limits
More information about the Koha-cvs
mailing list