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

Antoine Farnault antoine at koha-fr.org
Mon Oct 2 11:55:26 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/10/02 09:55:26

Modified files:
	C4             : Koha.pm 

Log message:
	removing duplicated function & synching with dev_week.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.5&r2=1.40.2.6

Patches:
Index: Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.40.2.5
retrieving revision 1.40.2.6
diff -u -b -r1.40.2.5 -r1.40.2.6
--- Koha.pm	28 Sep 2006 16:34:15 -0000	1.40.2.5
+++ Koha.pm	2 Oct 2006 09:55:26 -0000	1.40.2.6
@@ -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.5 2006/09/28 16:34:15 toins Exp $
+# $Id: Koha.pm,v 1.40.2.6 2006/10/02 09:55:26 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.5 $' =~ /\d+/g; shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
+$VERSION = do { my @v = '$Revision: 1.40.2.6 $' =~ /\d+/g; shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
 
@@ -60,7 +60,6 @@
             &getframeworks &getframeworkinfo
             &getauthtypes &getauthtype
 	    &getallthemes &GetLanguages
-			&GetBranches 
 			&getFacets
 			&displaySortby
 			&displayIndexes
@@ -821,12 +820,12 @@
         tags => ['650'],
         subfield => 'a',
         },
-    {
-        link_value => 'su-na',
-        label_value => 'People and Organizations',
-        tags => ['600', '610', '611'],
-        subfield => 'a',
-        },
+#        {
+#        link_value => 'su-na',
+#        label_value => 'People and Organizations',
+#        tags => ['600', '610', '611'],
+#        subfield => 'a',
+#        },
     {
         link_value => 'su-geo',
         label_value => 'Places',
@@ -929,30 +928,6 @@
 
     return \%infos_of;
 }
-=head2 get_branchinfos_of
-
-  my $branchinfos_of = get_branchinfos_of(@branchcodes);
-
-Associates a list of branchcodes to the information of the branch, taken in
-branches table.
-
-Returns a href where keys are branchcodes and values are href where keys are
-branch information key.
-
-  print 'branchname is ', $branchinfos_of->{$code}->{branchname};
-
-=cut
-sub get_branchinfos_of {
-    my @branchcodes = @_;
-
-    my $query = '
-SELECT branchcode,
-       branchname
-  FROM branches
-  WHERE branchcode IN ('.join(',', map({"'".$_."'"} @branchcodes)).')
-';
-    return get_infos_of($query, 'branchcode');
-}
 
 =head2 get_notforloan_label_of
 
@@ -1016,7 +991,7 @@
     {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=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)"},
     ];





More information about the Koha-cvs mailing list