From mjr at towers.org.uk  Thu Feb  1 22:35:20 2007
From: mjr at towers.org.uk (MJR)
Date: Thu, 01 Feb 2007 21:35:20 +0000
Subject: [Koha-cvs] koha/misc Install.pm [rel_2_2]
Message-ID: <E1HCjaS-0005Aa-6r@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	MJR <slef>	07/02/01 21:35:20

Modified files:
	misc           : Install.pm 

Log message:
	s/Barcorde/Barcode/ # fix for bug 1284

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/Install.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.88.2.16&r2=1.88.2.17

Patches:
Index: Install.pm
===================================================================
RCS file: /sources/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.16
retrieving revision 1.88.2.17
diff -u -b -r1.88.2.16 -r1.88.2.17
--- Install.pm	24 Oct 2006 04:26:15 -0000	1.88.2.16
+++ Install.pm	1 Feb 2007 21:35:20 -0000	1.88.2.17
@@ -847,7 +847,7 @@
 				push @missing,"You will need PDF::API2 for barcode generator";
 			}
 	}
-	unless (eval {require GD::Barcorde})   { 
+	unless (eval {require GD::Barcode})   { 
 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
 				push @missing,"You will need GD::Barcode for the new barcode generator";
 			}




From alaurin at ouestprovence.fr  Fri Feb  2 10:57:47 2007
From: alaurin at ouestprovence.fr (LAURIN arnaud)
Date: Fri, 02 Feb 2007 09:57:47 +0000
Subject: [Koha-cvs] koha C4/Circulation/Circ2.pm C4/Reserves2.pm ci...
	[rel_3_0]
Message-ID: <E1HCvAx-0003dH-DB@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	07/02/02 09:57:47

Modified files:
	C4/Circulation : Circ2.pm 
	C4             : Reserves2.pm 
	circ           : returns.pl 

Log message:
	bugfixing for Minuspriority process ...., and remove warn compilation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.35&r2=1.114.2.36
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.15&r2=1.46.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.13&r2=1.43.2.14

Patches:
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.35
retrieving revision 1.114.2.36
diff -u -b -r1.114.2.35 -r1.114.2.36
--- C4/Circulation/Circ2.pm	25 Jan 2007 18:06:52 -0000	1.114.2.35
+++ C4/Circulation/Circ2.pm	2 Feb 2007 09:57:46 -0000	1.114.2.36
@@ -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: Circ2.pm,v 1.114.2.35 2007/01/25 18:06:52 alaurin Exp $
+# $Id: Circ2.pm,v 1.114.2.36 2007/02/02 09:57:46 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -41,7 +41,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.35 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.36 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -590,11 +590,6 @@
     $fbr = $dbh->quote($fbr);
     $tbr = $dbh->quote($tbr);
     
-    warn "entree dans dotransfer";
-    warn "item dt->".$itm;
-    warn "from fbr->".$fbr;
-    warn "item tbr->".$tbr;
-
     #new entry in branchtransfers....
     $dbh->do(
 "INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
@@ -1572,7 +1567,6 @@
 	C4::Context->userenv->{'branch'} )
         {
         	UpdateHoldingbranch(C4::Context->userenv->{'branch'},$iteminformation->{'itemnumber'});
-		warn "changement holdingbranch ->".C4::Context->userenv->{'branch'};
         }
         
     itemseen( $iteminformation->{'itemnumber'} );

Index: C4/Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.15
retrieving revision 1.46.2.16
diff -u -b -r1.46.2.15 -r1.46.2.16
--- C4/Reserves2.pm	25 Jan 2007 18:06:52 -0000	1.46.2.15
+++ C4/Reserves2.pm	2 Feb 2007 09:57:47 -0000	1.46.2.16
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Reserves2.pm,v 1.46.2.15 2007/01/25 18:06:52 alaurin Exp $
+# $Id: Reserves2.pm,v 1.46.2.16 2007/02/02 09:57:47 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -33,7 +33,7 @@
 my $library_name = C4::Context->preference("LibraryName");
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.15 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.16 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -113,7 +113,6 @@
 
 #'
 sub OtherReserves {
-warn "entree en mode Other reserves";
     my ($itemnumber) = @_;
     my $messages;
     my $nextreservinfo;
@@ -179,16 +178,16 @@
     my $sth_upd = $dbh->prepare($query);
     $sth_upd->execute( $itemnumber, $borrowernumber, $biblionumber );
     $sth_upd->finish;
-warn "entree en mode minuspriority";
     # second step update all others reservs
     $query = qq/
         SELECT priority,borrowernumber,biblionumber,reservedate
         FROM   reserves
         WHERE  priority !='0'
+	AND biblionumber = ?
           AND  cancellationdate IS NULL
     /;
     my $sth_oth = $dbh->prepare($query);
-    $sth_oth->execute;
+    $sth_oth->execute($biblionumber);
     while ( my ( $priority, $borrowernumber, $biblionumber, $reservedate ) =
         $sth_oth->fetchrow_array )
     {
@@ -387,7 +386,6 @@
             # reserved by same person on same day
             my $bdata;
             if ( $count > 1 ) {
-                warn "bibitemno $bibitemno[$i]";
                 $bdata = GetBiblioItemData( $bibitemno[$i] );
                 $i++;
             }
@@ -681,7 +679,6 @@
 sub FillReserve {
     my ($res) = @_;
     my $dbh = C4::Context->dbh;
-warn "entree en mode fill reserve";
     # fill in a reserve record....
     my $qbiblio = $res->{'biblionumber'};
     my $borr    = $res->{'borrowernumber'};
@@ -736,9 +733,7 @@
 sub FixPriority {
     my ( $biblio, $borrowernumber, $rank ) = @_;
     my $dbh = C4::Context->dbh;
-warn "mode fixpriority : rang retour : ".$rank;
      if ( $rank eq "del" ) {
-     warn "mode suppresion ok";
          CancelReserve( $biblio, undef, $borrowernumber );
      }
     if ( $rank eq "W" || $rank eq "0" ) {
@@ -825,7 +820,6 @@
 =cut
 
 sub ReserveWaiting {
-warn "entree dans reserves waiting";
     my ( $item, $borr,$diffBranchSend ) = @_;
     my $dbh = C4::Context->dbh;
 
@@ -851,7 +845,6 @@
 
     # update reserves record....
     if ($diffBranchSend) {
-    warn "diffbranchsend";
     $query = qq/
         UPDATE reserves
         SET    priority = 0,
@@ -862,7 +855,6 @@
     /;
     }
     else {
-    warn"statut waiting pour la reservation";
     $query = qq/
         UPDATE reserves
         SET    priority = 0,
@@ -968,7 +960,6 @@
     }
     $sth->finish;
     return @results;
-    warn "entree en mode group reserves";
 }
 
 =item CreateReserve

Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.43.2.13
retrieving revision 1.43.2.14
diff -u -b -r1.43.2.13 -r1.43.2.14
--- circ/returns.pl	25 Jan 2007 18:06:52 -0000	1.43.2.13
+++ circ/returns.pl	2 Feb 2007 09:57:47 -0000	1.43.2.14
@@ -111,7 +111,6 @@
 
 
 if ( $query->param('resbarcode') ) {
-warn "entree en mode resbarcode";
     my $item           = $query->param('itemnumber');
     my $borrowernumber = $query->param('borrowernumber');
     my $resbarcode     = $query->param('resbarcode');
@@ -119,16 +118,13 @@
     # set to waiting....
     my $iteminfo   = getiteminformation($item);
     my $diffBranchSend;
-    warn "diffbranch retour ->".$diffBranchReturned;
     
 #     addin in ReserveWaiting the possibility to check if the document is expected in this library or not,
 # if not we send a value in reserve waiting for not implementting waiting status
 	if ($diffBranchReturned) {
-	warn "entrer en mod retour diffbranch";
 	$diffBranchSend = $diffBranchReturned;
 	}
 	else {
-	warn "pas de diffbranch";
 	$diffBranchSend = undef;
 	}
 		 
@@ -168,7 +164,6 @@
 
 # actually return book and prepare item table.....
 if ($barcode) {
-warn "entrée en mode barcode";
     # decode cuecat
     $barcode = cuecatbarcodedecode($barcode);
     ( $returned, $messages, $iteminformation, $borrower ) =
@@ -337,7 +332,6 @@
             $template->param( intransit => 1 );
         }
 
-        warn "RES FOR : " . $res->{'branchcode'};
         $template->param(
             found          => 1,
             currentbranch  => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},




From laurenthdl at alinto.com  Fri Feb  2 19:04:21 2007
From: laurenthdl at alinto.com (Henri-Damien LAURENT)
Date: Fri, 02 Feb 2007 18:04:21 +0000
Subject: [Koha-cvs] koha/misc/zebra record_authorities_unimarc.abs ...
	[rel_3_0]
Message-ID: <E1HD2lp-0008Ly-HQ@savannah.gnu.org>

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/02 18:04:21

Modified files:
	misc/zebra     : record_authorities_unimarc.abs 
	                 sort-string-utf_french.chr 

Log message:
	BUG Fixing:
	authorities Sorting and searching for exact content.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/record_authorities_unimarc.abs?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/sort-string-utf_french.chr?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: record_authorities_unimarc.abs
===================================================================
RCS file: /cvsroot/koha/koha/misc/zebra/Attic/record_authorities_unimarc.abs,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- record_authorities_unimarc.abs	19 Dec 2006 08:37:13 -0000	1.1.2.2
+++ record_authorities_unimarc.abs	2 Feb 2007 18:04:21 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-# $Id: record_authorities_unimarc.abs,v 1.1.2.2 2006/12/19 08:37:13 hdl Exp $
+# $Id: record_authorities_unimarc.abs,v 1.1.2.3 2007/02/02 18:04:21 hdl Exp $
 
 # indexing rules. It
 # results in a server which provides a passable Bath level 0 and 1 service
@@ -47,25 +47,24 @@
 
 
 ############ HEADINGS ##################
-melm 200$a Heading,Heading-Entity,Heading:s,personal-heading,personal-heading:s
-melm 210$a Heading,Heading-Entity,Heading:s,corporate-heading
-melm 210$a Heading,Heading-Entity,Heading:s,Conference-heading
+melm 200$a Heading,Heading-Entity,Heading:s,personal-heading
+melm 210$a Heading,Heading-Entity,Heading:s,corporate-heading,Conference-heading
 melm 215$a Heading,Heading-Entity,Heading:s,Name-geographic
 #melm 216 Name-corporate
-melm 220$a Heading,Heading-Entity,Heading:s,personal-heading,personal-heading:s
-melm 230$a Heading,Heading-Entity,Heading:s,Title-Uniform,Title-Uniform:s
-melm 235$a Heading,Heading-Entity,Heading:s,Title-Uniform,Title-Uniform:s
+melm 220$a Heading,Heading-Entity,Heading:s,personal-heading
+melm 230$a Heading,Heading-Entity,Heading:s,Title-Uniform
+melm 235$a Heading,Heading-Entity,Heading:s,Title-Uniform
 melm 250$a Heading,Heading-Entity,Heading:s,Subject-heading, Subject-heading:s
 
-melm 200 Heading-Entity,Heading-Entity:s, personal-Heading-Entity,personal-Heading-Entity:s
+melm 200 Heading-Entity,Heading-Entity:s, personal-Heading-Entity
 melm 210 Heading-Entity,Heading-Entity:s,corporate-Heading-Entity
 melm 210 Heading-Entity,Heading-Entity:s,Conference-Heading-Entity
 melm 215 Heading-Entity,Heading-Entity:s,Name-geographic-Entity
 #melm 216 Name-corporate
-melm 220 Heading-Entity,Heading-Entity:s,personal-Heading-Entity,personal-Heading-Entity:s
-melm 230 Heading-Entity,Heading-Entity:s,Title-Uniform-entity,Title-Uniform-entity:p
-melm 235 Heading-Entity,Heading-Entity:s,Title-Uniform-entity,Title-Uniform:s
-melm 250   Heading-Entity,Heading-Entity:s,Subject-Thesaurus
+melm 220 Heading-Entity,Heading-Entity:s,personal-Heading-Entity
+melm 230 Heading-Entity,Heading-Entity:s,Title-Uniform-entity
+melm 235 Heading-Entity,Heading-Entity:s,Title-Uniform-entity
+melm 250   Heading-Entity,Subject-Thesaurus
 
 #210 Heading - Corporate Body Name
 #215 Heading - Territorial or Geographical Name
@@ -90,14 +89,14 @@
 melm 430$a See, See:s,See-Entity, Title-Uniform-see,Title-Uniform-see:s
 melm 435$a See, See:s,See-Entity, Title-Uniform-see,Title-Uniform-see:s
 melm 450$a See, See:s,See-Entity, Subject-see,Subject-see:s
-melm 400 See-Entity, See-Entity:s,personal-See-Entity,personal-See-Entity:s
-melm 410 See-Entity, See-Entity:s,corporate-See-Entity
-melm 410 See-Entity, See-Entity:s,Conference-See-Entity
-melm 415 See-Entity, See-Entity:s,Name-geographic-See-Entity
+melm 400 See-Entity, personal-See-Entity,personal-See-Entity:s
+melm 410 See-Entity, corporate-See-Entity
+melm 410 See-Entity, Conference-See-Entity
+melm 415 See-Entity, Name-geographic-See-Entity
 #melm 416 Name-corporate
-melm 440 See-Entity, See-Entity:s,personal-See-Entity,personal-See-Entity:s
-melm 430 See-Entity, See-Entity:s,Title-Uniform-See-Entity,Title-Uniform-See-Entity:s
-melm 435 See-Entity, See-Entity:s,Title-Uniform-See-Entity,Title-Uniform-See-Entity:s
+melm 440 See-Entity, personal-See-Entity
+melm 430 See-Entity, Title-Uniform-See-Entity
+melm 435 See-Entity, Title-Uniform-See-Entity
 melm 450 See-Entity,Subject-See-Entity
 
 #410 Heading - Corporate Body Name

Index: sort-string-utf_french.chr
===================================================================
RCS file: /cvsroot/koha/koha/misc/zebra/Attic/sort-string-utf_french.chr,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- sort-string-utf_french.chr	8 Dec 2006 10:16:53 -0000	1.1.2.2
+++ sort-string-utf_french.chr	2 Feb 2007 18:04:21 -0000	1.1.2.3
@@ -1,6 +1,6 @@
 # Generic character map.
 #
-# $Id: sort-string-utf_french.chr,v 1.1.2.2 2006/12/08 10:16:53 alaurin Exp $
+# $Id: sort-string-utf_french.chr,v 1.1.2.3 2007/02/02 18:04:21 hdl Exp $
 
 # Define the basic value-set. *Beware* of changing this without re-indexing
 # your databases.
@@ -9,8 +9,6 @@
 
 # Breaking characters
 
-space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~
-
 # Characters to be considered equivalent for searching purposes.
 
 equivalent æä(ae)




From laurenthdl at alinto.com  Fri Feb  2 19:07:42 2007
From: laurenthdl at alinto.com (Henri-Damien LAURENT)
Date: Fri, 02 Feb 2007 18:07:42 +0000
Subject: [Koha-cvs] koha authorities/authorities-home.pl authoritie...
	[rel_3_0]
Message-ID: <E1HD2p4-0008Rj-Lv@savannah.gnu.org>

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/02 18:07:42

Modified files:
	authorities    : authorities-home.pl authorities.pl 
	C4             : AuthoritiesMarc.pm 
	koha-tmpl/intranet-tmpl/prog/en/authorities: auth_finder.tmpl 
	                                             authorities-home.tmpl 
	                                             authorities.tmpl 
	                                             searchresultlist-auth.tmpl 

Log message:
	Sorting and searching for exact term now works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities-home.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.3&r2=1.14.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.15.2.8&r2=1.15.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.15&r2=1.28.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5

Patches:
Index: authorities/authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -b -r1.14.2.3 -r1.14.2.4
--- authorities/authorities-home.pl	18 Dec 2006 16:35:17 -0000	1.14.2.3
+++ authorities/authorities-home.pl	2 Feb 2007 18:07:42 -0000	1.14.2.4
@@ -56,6 +56,7 @@
 	my @and_or = $query->param('and_or');
 	my @excluding = $query->param('excluding');
 	my @operator = $query->param('operator');
+	my $orderby = $query->param('orderby');
 	my @value = $query->param('value');
 
     my $startfrom = $query->param('startfrom') || 1;
@@ -70,7 +71,8 @@
         \@value,
         ($startfrom - 1)*$resultsperpage,
         $resultsperpage,
-        $authtypecode
+        $authtypecode,
+        $orderby
     );
 
 	($template, $loggedinuser, $cookie)
@@ -112,7 +114,8 @@
                 {term => 'resultsperpage', val => $resultsperpage},
                 {term => 'type'          , val => 'intranet'},
                 {term => 'op'            , val => 'do_search'},
-                {term => 'authtypecode'  , val => $authtypecode}
+                {term => 'authtypecode'  , val => $authtypecode},
+                {term => 'orderby'       , val => $orderby},
             )
         )
         ;

Index: authorities/authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -b -r1.15.2.8 -r1.15.2.9
--- authorities/authorities.pl	24 Jan 2007 15:13:27 -0000	1.15.2.8
+++ authorities/authorities.pl	2 Feb 2007 18:07:42 -0000	1.15.2.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: authorities.pl,v 1.15.2.8 2007/01/24 15:13:27 hdl Exp $
+# $Id: authorities.pl,v 1.15.2.9 2007/02/02 18:07:42 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -413,7 +413,6 @@
 # 		}
 		exit;
  	} else {
-warn "duplicate";
 	# it may be a duplicate, warn the user and do nothing
  		build_tabs ($template, $record, $dbh,$encoding);
  		build_hidden_data;

Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.15
retrieving revision 1.28.2.16
diff -u -b -r1.28.2.15 -r1.28.2.16
--- C4/AuthoritiesMarc.pm	24 Jan 2007 10:17:47 -0000	1.28.2.15
+++ C4/AuthoritiesMarc.pm	2 Feb 2007 18:07:42 -0000	1.28.2.16
@@ -66,7 +66,7 @@
     return  ($tagfield,$tagsubfield);
 }
 sub authoritysearch {
-    my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode) = @_;
+    my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby) = @_;
     my $query;
     my $attr;
     # the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
@@ -91,7 +91,6 @@
     my $q2;
     for(my $i = 0 ; $i <= $#{$value} ; $i++)
     {
-
     if (@$value[$i]){
     ##If mainentry search $a tag
         if (@$tags[$i] eq "mainmainentry") {
@@ -101,22 +100,25 @@
         }else{
           $attr =" \@attr 1=Any ";
         }
-        if (@$operator[$i] eq 'phrase') {
-             $attr.=" \@attr 4=1  \@attr 5=100 \@attr 6=2 ";##Phrase, No truncation,all of subfield field must match
+          if (@$operator[$i] eq 'is') {
+              $attr.=" \@attr 4=1  \@attr 5=100 ";##Phrase, No truncation,all of subfield field must match
         }elsif (@$operator[$i] eq "="){
-             $attr.=" \@attr 4=107 ";#Phrase, No truncation,all of subfield field must     
+              $attr.=" \@attr 4=107 ";           #Number Exact match
+          }elsif (@$operator[$i] eq "start"){
+              $attr.=" \@attr 4=1 \@attr 5=1 ";#Phrase, Right truncated
         } else {
-             $attr .=" \@attr 4=6  \@attr 5=1  ";## Word list, right truncated, anywhere
+              $attr .=" \@attr 5=1  ";## Word list, right truncated, anywhere
         }
         $and .=" \@and " ;
         $attr =$attr."\"".@$value[$i]."\"";
         $q2 .=$attr;
     $dosearch=1;
     }#if value
-    
     }
 ##Add how many queries generated
 $query= $and.$query.$q2;
+$query=' @or  @attr 7=1 @attr 1=Heading 0 '.$query if ($sortby eq "HeadingAsc");
+$query=' @or  @attr 7=2 @attr 1=Heading 0 '.$query if ($sortby eq "HeadingDsc");
 warn $query;
 
 $offset=0 unless $offset;
@@ -944,8 +946,11 @@
 
 =cut
 
-# $Id: AuthoritiesMarc.pm,v 1.28.2.15 2007/01/24 10:17:47 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.16 2007/02/02 18:07:42 hdl Exp $
 # $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.16  2007/02/02 18:07:42  hdl
+# Sorting and searching for exact term now works.
+#
 # Revision 1.28.2.15  2007/01/24 10:17:47  hdl
 # FindDuplicate Now works.
 # Be AWARE that it needs a change ccl.properties.

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl	30 Jan 2007 10:04:37 -0000	1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl	2 Feb 2007 18:07:42 -0000	1.1.2.4
@@ -15,6 +15,7 @@
 			<label class="label100">Authority type</label>
 			<!-- TMPL_VAR NAME="authtypecode" -->
 			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 		</p>
 		<p>
 			<label class="label100">Main entry ($a only)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
@@ -22,34 +23,40 @@
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<select name="operator">
-				<option value="start">start by</option>
 				<option value="contains">contains</option>
+				<option value="start">starts by</option>
+				<option value="is">is exactly</option>
 			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->">
 		</p>
 		<p>
-			<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
+          <label for="value_mainentry">Main entry</label>
 			<input type="hidden" name="marclist" value="mainentry">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<select name="operator">
-				<option value="start">start by</option>
 				<option value="contains">contains</option>
+	    <option value="start">starts by</option>
 			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
 		</p>
 		<p>
-			<label class="label100">Anywhere</label><input type="text" name="value">
+			<label for="value_anywhere">Anywhere</label>
 			<input type="hidden" name="marclist" value="">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<select name="operator">
 				<option value="contains">contains</option>
-				<option value="start">start by</option>
+				<option value="start">starts by</option>
 			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
 		</p>
 		<p>
+          Sort by <select name="orderby">
+         <option value="">No order</option>
+	    <option value="HeadingAsc">Heading Ascendant</option>
+	    <option value="HeadingDsc">Heading Descendant</option>
+	  </select>
 			<input type="submit" value="Start search" class="button authority">
 		</p>
 	</div>

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl	12 Oct 2006 22:04:47 -0000	1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl	2 Feb 2007 18:07:42 -0000	1.1.2.2
@@ -39,6 +39,7 @@
           <select name="operator">
 	    <option value="contains">contains</option>
 	    <option value="start">start by</option>
+            <option value="is">is exactly</option>
 	  </select>
         </td>
         <td>
@@ -56,6 +57,7 @@
           <select name="operator">
 	    <option value="contains">contains</option>
 	    <option value="start">start by</option>
+            <option value="is">is exactly</option>
 	  </select>
         </td>
         <td>
@@ -74,6 +76,7 @@
           <select name="operator">
             <option value="contains">contains</option>
             <option value="start">start by</option>
+            <option value="is">is exactly</option>
           </select>
         </td>
         <td>
@@ -83,6 +86,11 @@
     </table>
     
     <div id="action">
+          Order by :<select name="orderby">
+         <option value="">None</option>
+	    <option value="HeadingAsc">Heading Ascendant</option>
+	    <option value="HeadingDsc">Heading Descendant</option>
+	  </select>
       <input type="submit" value="Start search">
     </div>
   </form>

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl	24 Jan 2007 15:13:27 -0000	1.2.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl	2 Feb 2007 18:07:42 -0000	1.2.2.4
@@ -85,6 +85,13 @@
 			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
 			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->">
 		<!-- /TMPL_IF -->
+    <div id="action">
+<!-- TMPL_IF name="authid" -->
+      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
+<!-- TMPL_ELSE -->
+      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
+<!-- /TMPL_IF -->
+    </div>
 	</form>
 </fieldset>
 

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl	30 Jan 2007 10:04:44 -0000	1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl	2 Feb 2007 18:07:42 -0000	1.1.2.5
@@ -21,8 +21,9 @@
                     <input type="hidden" name="and_or" value="and">
                     <input type="hidden" name="excluding" value="">
                     <select name="operator">
-                        <option value="start">start by</option>
                         <option value="contains">contains</option>
+                        <option value="start">starts by</option>
+                        <option value="is">is exactly</option>
                     </select>
                     <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
                 </p>
@@ -32,8 +33,9 @@
                     <input type="hidden" name="and_or" value="and">
                     <input type="hidden" name="excluding" value="">
                     <select name="operator">
-                        <option value="start">start by</option>
                         <option value="contains">contains</option>
+                        <option value="start">starts by</option>
+                        <option value="is">is exactly</option>
                     </select>
                     <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
                 </p>
@@ -44,7 +46,8 @@
                     <input type="hidden" name="excluding" value="">
                     <select name="operator">
                         <option value="contains">contains</option>
-                        <option value="start">start by</option>
+                        <option value="start">starts by</option>
+                        <option value="is">is exactly</option>
                     </select>
                     <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
                 </p>
@@ -113,21 +116,21 @@
         <div id="resultnumber">
             <p>
                 <!-- TMPL_IF name="displayprev" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
-                        <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        <<
                     </a>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_LOOP NAME="numbers" -->
                     <!-- TMPL_IF name="highlight" -->
-                        <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+                        <!-- TMPL_VAR NAME="number" -->
                     <!-- TMPL_ELSE -->
-                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
-                            <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                            <!-- TMPL_VAR NAME="number" --></a>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 <!-- TMPL_IF name="displaynext" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&op=do_search&type=intranet">
-                        <img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        >></a>
                 <!-- /TMPL_IF -->
             </p>
         </div>	




From wrobertson1981 at yahoo.co.nz  Sat Feb  3 09:37:14 2007
From: wrobertson1981 at yahoo.co.nz (Waylon Robertson)
Date: Sat, 03 Feb 2007 08:37:14 +0000
Subject: [Koha-cvs] koha/circ circulation.pl [rel_2_2]
Message-ID: <E1HDGOY-00059q-7H@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Waylon Robertson <genji>	07/02/03 08:37:14

Modified files:
	circ           : circulation.pl 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.81.2.19&r2=1.81.2.20

Patches:
Index: circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.19
retrieving revision 1.81.2.20
diff -u -b -r1.81.2.19 -r1.81.2.20
--- circulation.pl	29 Jan 2007 09:28:07 -0000	1.81.2.19
+++ circulation.pl	3 Feb 2007 08:37:14 -0000	1.81.2.20
@@ -85,7 +85,7 @@
 
 my @datearr = localtime(time());
 # FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
-my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]))
+my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
 # check and see if we should print
  if ($barcode eq ''  && $print eq 'maybe'){
  	$print = 'yes';




From wrobertson1981 at yahoo.co.nz  Sat Feb  3 09:38:29 2007
From: wrobertson1981 at yahoo.co.nz (Waylon Robertson)
Date: Sat, 03 Feb 2007 08:38:29 +0000
Subject: [Koha-cvs] koha overdue.pl [rel_2_2]
Message-ID: <E1HDGPl-0005R3-V6@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Waylon Robertson <genji>	07/02/03 08:38:29

Modified files:
	.              : overdue.pl 

Log message:
	Today's date was being formatted before being compared, in the query. fixed. now overdues work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/overdue.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.13&r2=1.9.2.14

Patches:
Index: overdue.pl
===================================================================
RCS file: /sources/koha/koha/Attic/overdue.pl,v
retrieving revision 1.9.2.13
retrieving revision 1.9.2.14
diff -u -b -r1.9.2.13 -r1.9.2.14
--- overdue.pl	19 Jan 2007 09:33:48 -0000	1.9.2.13
+++ overdue.pl	3 Feb 2007 08:38:29 -0000	1.9.2.14
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: overdue.pl,v 1.9.2.13 2007/01/19 09:33:48 rangi Exp $
+# $Id: overdue.pl,v 1.9.2.14 2007/02/03 08:38:29 genji Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -117,7 +117,6 @@
 my $author;
 my @datearr = localtime(time());
 my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-$todaysdate=format_date($todaysdate);
 
 my $dbh = C4::Context->dbh;
 $bornamefilter =~s/\*/\%/g;
@@ -137,18 +136,13 @@
 $strsth.=" && biblioitems.itemtype = '".$itemtypefilter."' " if($itemtypefilter) ;
 $strsth.=" && borrowers.flags = '".$borflagsfilter."' " if ($borflagsfilter ne " ") ;
 $strsth.=" && issues.branchcode = '".$branchfilter."' " if($branchfilter) ;
-# my $bornamefilter=$input->param('borname');
-# my $borcatfilter=$input->param('borcat');
-# my $itemtypefilter=$input->param('itemtype');
-# my $borflagsfilter=$input->param('borflags');
-# my $branchfilter=$input->param('branch');
 if ($order eq "borrower"){
 	$strsth.=" order by borrower,date_due " ;
 } else {
 	$strsth.=" order by date_due,borrower ";
 }
 my $sth=$dbh->prepare($strsth);
-warn "overdue.pl : query string ".$strsth;
+#warn "overdue.pl : query string ".$strsth;
 $sth->execute();
 
 my @overduedata;
@@ -176,6 +170,7 @@
 }
 
 $sth->finish;
+$todaysdate=format_date($todaysdate);
 $template->param(todaysdate        => $todaysdate,
 		overdueloop       => \@overduedata,
 		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),




From wrobertson1981 at yahoo.co.nz  Sat Feb  3 09:42:10 2007
From: wrobertson1981 at yahoo.co.nz (Waylon Robertson)
Date: Sat, 03 Feb 2007 08:42:10 +0000
Subject: [Koha-cvs] koha/C4 BookShelves.pm [rel_2_2]
Message-ID: <E1HDGTK-0005e9-Mb@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Waylon Robertson <genji>	07/02/03 08:42:10

Modified files:
	C4             : BookShelves.pm 

Log message:
	PhysicalBookShelves code added, to support an offshoot of virtual bookshelves. The idea, each physical shelf has a unique barcode. any one item can only exist in one shelf. Potential augmentation to item.location.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/BookShelves.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15&r2=1.15.2.1

Patches:
Index: BookShelves.pm
===================================================================
RCS file: /sources/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- BookShelves.pm	16 Dec 2004 11:30:58 -0000	1.15
+++ BookShelves.pm	3 Feb 2007 08:42:10 -0000	1.15.2.1
@@ -3,7 +3,7 @@
 
 package C4::BookShelves;
 
-# $Id: BookShelves.pm,v 1.15 2004/12/16 11:30:58 tipaul Exp $
+# $Id: BookShelves.pm,v 1.15.2.1 2007/02/03 08:42:10 genji Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -57,7 +57,10 @@
 			&AddToShelf			&AddToShelfFromBiblio
 			&RemoveFromShelf	&AddShelf				&ModifShelf 
 			&RemoveShelf		&ShelfPossibleAction
-				);
+			&GetPhysicalShelfList		&GetPhysicalShelfContents		&GetPhysicalShelf
+			&AddToPhysicalShelf
+			&RemoveFromPhysicalShelf	&AddPhysicalShelf				&ModifPhysicalShelf 
+			&RemovePhysicalShelf		&PhysicalShelfPossibleAction	);
 
 my $dbh = C4::Context->dbh;
 
@@ -290,12 +293,209 @@
     }
 }
 
+######################### Physical Shelf System ###################
+=item PhysicalShelfPossibleAction
+
+=over 4
+
+=item C<$loggedinuser,$barcode,$action>
+
+$action can be "view" or "manage".
+
+Returns 1 if the user can do the $action in the $shelfnumber shelf.
+Returns 0 otherwise.
+
+=back
+
+=cut
+sub PhysicalShelfPossibleAction {
+	my ($loggedinuser,$barcode,$action)= @_;
+	my $sth = $dbh->prepare("select owner,category from Physicalbookshelf where barcode=?");
+	$sth->execute($shelfnumber, $barcode);
+	my ($owner,$category) = $sth->fetchrow;
+	return 1 if (($category>=3 or $owner eq $loggedinuser) && $action eq 'manage');
+	return 1 if (($category>= 2 or $owner eq $loggedinuser) && $action eq 'view');
+	return 0;
+}
+
+=item GetPhysicalShelfList
+
+  $physicalshelflist = &GetPhysicalShelfList();
+
+Looks up the virtual bookshelves, and returns a summary. C<$physicalshelflist>
+is a arrayref of hashes.
+
+=back
+
+=cut
+
+sub GetPhysicalShelfList {
+	my ($owner,$mincategory) = @_;
+	# mincategory : 2 if the list is for "look". 3 if the list is for "Select bookshelf for adding a book".
+	# bookshelves of the owner are always selected, whatever the category
+	my $sth=$dbh->prepare("SELECT		physicalbookshelf.barcode, physicalbookshelf.shelfname,owner,surname,firstname,category,
+							count(physicalshelfcontents.itemnumber) as count
+								FROM		physicalbookshelf
+								LEFT JOIN	physicalshelfcontents
+								ON		physicalbookshelf.barcode = physicalshelfcontents.barcode
+								left join borrowers on physicalbookshelf.owner = borrowers.borrowernumber
+								where owner=? or category>=?
+								GROUP BY	physicalbookshelf.barcode order by shelfname");
+    $sth->execute($owner,$mincategory);
+    my @shelflist;
+    while (defined(my $shelf = $sh->fetchrow_hashref())) { push @shelflist, $shelf; }
+	return(\@shelflist);
+}
+
+sub GetPhysicalShelf {
+	my ($barcode) = @_;
+	my $sth=$dbh->prepare("select barcode, shelfname, owner, category from physicalbookshelf where barcode=?");
+	$sth->execute($barcode);
+	return $sth->fetchrow;
+}
+=item GetPhysicalShelfContents
+
+  $itemlist = &GetPhysicalShelfContents($env, $barcode);
+
+Looks up information about the contents of virtual bookshelf number
+C<$shelfnumber>.
+
+Returns a reference-to-array, whose elements are references-to-hash,
+as returned by C<&getiteminformation>.
+
+C<$env> is an enviroment variable that some subroutines use. It should be a reference to a hash. Getiteminformation
+stores a apierror into C<$env-E<gt>{apierror} if no barcode or no itemnumber is passed, instead of returning a error
+message. Otherwise ignored.
+
+=cut
+#'
+sub GetPhysicalShelfContents {
+    my ($env, $barcode) = @_;
+    my @itemlist;
+    my $sth=$dbh->prepare("select itemnumber from physicalshelfcontents where barcode=? order by itemnumber");
+    $sth->execute($barcode);
+    while (my ($itemnumber) = $sth->fetchrow) {
+	my ($item) = getiteminformation($env, $itemnumber, 0);
+	push (@itemlist, $item);
+    }
+    return (\@itemlist);
+}
+
+=item AddToShelf
+
+  &AddToShelf($env, $itemnumber, $barcode);
+
+Adds item number C<$itemnumber> to physical bookshelf number
+C<$shelfnumber>, unless that item is already on any shelf.
+
+C<$env> is ignored.
+
+=cut
+#'
+sub AddToPhysicalShelf {
+	my ($env, $itemnumber, $shelfnumber, $barcode) = @_;
+	return unless $itemnumber;
+	my $sth=$dbh->prepare("select * from physicalshelfcontents where itemnumber=?");
+
+	$sth->execute($shelfnumber, $itemnumber);
+	if ($sth->rows) {
+# already on shelf
+	} else {
+		$sth=$dbh->prepare("insert into physicalshelfcontents (barcode, itemnumber, flags) values (?, ?, 0)");
+		$sth->execute($barcode, $itemnumber);
+	}
+}
+
+=item RemoveFromPhysicalShelf
+
+  &RemoveFromPhysicalShelf($env, $itemnumber, $barcode);
+
+Removes item number C<$itemnumber> from physical bookshelf with barcode
+C<$barcode>. If the item wasn't on that bookshelf to begin with,
+nothing happens.
+
+C<$env> is ignored.
+
+=cut
+#'
+sub RemoveFromPhysicalShelf {
+    my ($env, $itemnumber, $barcode) = @_;
+    my $sth=$dbh->prepare("delete from physicalshelfcontents where barcode=? and itemnumber=?");
+    $sth->execute($barcode,$itemnumber);
+}
+
+=item AddPhysicalShelf
+
+  ($status, $msg) = &AddPhysicalShelf($env, $shelfname, $barcode, $owner, $category);
+
+Creates a new virtual bookshelf with name C<$shelfname>.
+
+Returns a two-element array, where C<$status> is 0 if the operation
+was successful, or non-zero otherwise. C<$msg> is "Done" in case of
+success, or an error message giving the reason for failure.
+
+C<$env> is ignored.
+
+=cut
+
+sub AddPhysicalShelf {
+    my ($env, $shelfname, $barcode, $owner, $category) = @_;
+    my $sth=$dbh->prepare("select * from phychicalbookshelf where shelfname=?");
+	$sth->execute($shelfname);
+    if ($sth->rows) {
+		return(1, "Shelf \"$shelfname\" already exists");
+    } else {
+		$sth=$dbh->prepare("insert into physicalbookshelf (shelfname, barcode, owner, category) values (?,?,?)");
+		$sth->execute($shelfname, $barcode, $owner, $category);
+		return (0, "Done",$barcode);
+    }
+}
+
+sub ModifPhysicalShelf {
+	my ($barcode, $newbarcode, $shelfname, $owner, $category) = @_;
+	my $sth = $dbh->prepare("update physicbookshelf set shelfname=?,owner=?,category=?, barcode=? where barcode=?");
+	$sth->execute($shelfname,$owner,$category, $newbarcode, $barcode);
+}
+
+=item RemovePhysicalShelf
+
+  ($status, $msg) = &RemovePhysicalShelf($env, $barcode);
+
+Deletes physical bookshelf barcode C<$barcode>. The bookshelf must
+be empty.
+
+Returns a two-element array, where C<$status> is 0 if the operation
+was successful, or non-zero otherwise. C<$msg> is "Done" in case of
+success, or an error message giving the reason for failure.
+
+C<$env> is ignored.
+
+=cut
+#'
+sub RemovePhysicalShelf {
+    my ($env, $shelfnumber) = @_;
+    my $sth=$dbh->prepare("select count(*) from physicalshelfcontents where barcode=?");
+	$sth->execute($shelfnumber);
+    my ($count)=$sth->fetchrow;
+    if ($count) {
+	return (1, "Shelf has $count items on it.  Please remove all items before deleting this shelf.");
+    } else {
+	$sth=$dbh->prepare("delete from physicalbookshelf where barcode=?");
+	$sth->execute($shelfnumber);
+	return (0, "Done");
+    }
+}
+
+
 END { }       # module clean-up code here (global destructor)
 
 1;
 
 #
 # $Log: BookShelves.pm,v $
+# Revision 1.15.2.1  2007/02/03 08:42:10  genji
+# PhysicalBookShelves code added, to support an offshoot of virtual bookshelves. The idea, each physical shelf has a unique barcode. any one item can only exist in one shelf. Potential augmentation to item.location.
+#
 # Revision 1.15  2004/12/16 11:30:58  tipaul
 # adding bookshelf features :
 # * create bookshelf on the fly




From laurenthdl at alinto.com  Mon Feb  5 09:47:15 2007
From: laurenthdl at alinto.com (Henri-Damien LAURENT)
Date: Mon, 05 Feb 2007 08:47:15 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/serials se...
	[rel_3_0]
Message-ID: <E1HDzVL-0005zT-Sx@savannah.gnu.org>

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/05 08:47:15

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/serials: serials-edit.tmpl 

Log message:
	Bug Fixing : status was not properly saved.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.8&r2=1.1.2.9

Patches:
Index: serials-edit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/Attic/serials-edit.tmpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -b -r1.1.2.8 -r1.1.2.9
--- serials-edit.tmpl	26 Jan 2007 20:48:36 -0000	1.1.2.8
+++ serials-edit.tmpl	5 Feb 2007 08:47:15 -0000	1.1.2.9
@@ -116,6 +116,7 @@
         <!-- TMPL_LOOP NAME="items" -->
         <div id="item<!-- TMPL_VAR NAME="serialid" --><!-- TMPL_VAR NAME="countitems" -->" class="items">
         <!-- TMPL_LOOP NAME="iteminformation" -->
+        <p>
         <div id="subfield<!-- TMPL_VAR NAME="serialid" --><!-- TMPL_VAR NAME="countitems" --><!-- TMPL_VAR NAME="countsubfield" -->" class="subfield">                <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
                 <!-- TMPL_VAR NAME="marc_value" -->
                 <input type="hidden" name="itemid" value="<!-- TMPL_VAR NAME="itemid" -->" />
@@ -124,6 +125,7 @@
                 <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
             </div>
+         </p>
         <!-- /tmpl_loop -->
         
         <input type="hidden" name="moditem" value="" /> 
@@ -205,14 +207,15 @@
           <tr>
           <td colspan="5">
       <a id="label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->" style="color: grey; font-size: 80%; cursor: se-resize;"  onclick="unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')">
-             Items   </a>
+             Item</a>
         <fieldset style="display:none;" id="items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->">
         <legend><a style="cursor: se-resize;"  onclick="HideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')">
-                Items</a>
+                Item</a>
         </legend>
           <div id="cataloguing_additem_itemlist">
         <div id="item<!-- TMPL_VAR NAME="serialid" --><!-- TMPL_VAR NAME="countitems" -->" class="items">
         <!-- TMPL_LOOP NAME="iteminformation" -->
+        <p>
         <div id="subfield<!-- TMPL_VAR NAME="serialid" --><!-- TMPL_VAR NAME="countitems" --><!-- TMPL_VAR NAME="countsubfield" -->" class="subfield">                <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
                 <!-- TMPL_VAR NAME="marc_value" -->
                 <input type="hidden" name="itemid" value="<!-- TMPL_VAR NAME="itemid" -->" />
@@ -221,6 +224,7 @@
                 <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
             </div>
+        </p>
         <!-- /tmpl_loop -->
         
         <input type="hidden" name="moditem" value="" /> 




From laurenthdl at alinto.com  Mon Feb  5 10:01:57 2007
From: laurenthdl at alinto.com (Henri-Damien LAURENT)
Date: Mon, 05 Feb 2007 09:01:57 +0000
Subject: [Koha-cvs] koha/C4 Serials.pm [rel_3_0]
Message-ID: <E1HDzjZ-0006IV-GY@savannah.gnu.org>

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/05 09:01:57

Modified files:
	C4             : Serials.pm 

Log message:
	Removing warns

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.30&r2=1.5.2.31

Patches:
Index: Serials.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Serials.pm,v
retrieving revision 1.5.2.30
retrieving revision 1.5.2.31
diff -u -b -r1.5.2.30 -r1.5.2.31
--- Serials.pm	29 Jan 2007 10:29:54 -0000	1.5.2.30
+++ Serials.pm	5 Feb 2007 09:01:57 -0000	1.5.2.31
@@ -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: Serials.pm,v 1.5.2.30 2007/01/29 10:29:54 hdl Exp $
+# $Id: Serials.pm,v 1.5.2.31 2007/02/05 09:01:57 hdl Exp $
 
 use strict;
 use C4::Date;
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.5.2.30 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.5.2.31 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -1063,7 +1063,7 @@
         }
     }
     elsif ( $subscription->{monthlength} ){
-        warn "dateCHECKRESERV :".$subscription->{startdate};
+#         warn "dateCHECKRESERV :".$subscription->{startdate};
         my @date=split (/-/,$subscription->{startdate});
         my @enddate = Add_Delta_YM($date[0],$date[1],$date[2],0,$subscription->{monthlength});
         $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]);
@@ -1082,7 +1082,7 @@
         my @enddate = Add_Delta_Days($date[0],$date[1],$date[2],$subscription->{weeklength}*7);
         $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]);
     }
-    warn "date de fin :$enddate";
+#     warn "date de fin :$enddate";
     return $enddate;
 }
 
@@ -1268,7 +1268,7 @@
         $internalnotes,
         $subscriptionid
     ) = @_;
-    warn $irregularity;
+#     warn $irregularity;
     my $dbh   = C4::Context->dbh;
     my $query = "UPDATE subscription
                     SET librarian=?, branchcode=?,aqbooksellerid=?,cost=?,aqbudgetid=?,startdate=?,
@@ -2274,7 +2274,7 @@
         "select max(planneddate) from serial where subscriptionid=?");
     $sth->execute($subscriptionid);
     my ($res) = $sth->fetchrow ;
-    warn "date expiration : ".$expirationdate." date courante ".$res;
+#     warn "date expiration : ".$expirationdate." date courante ".$res;
     my @res=split /-/,$res;
     my @endofsubscriptiondate=split/-/,$expirationdate;
     my $per = $subscription->{'periodicity'};




From antoine at koha-fr.org  Mon Feb  5 10:53:53 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 09:53:53 +0000
Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en/includes baske...
	[rel_3_0]
Message-ID: <E1HE0Xp-0000r2-Cw@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 09:53:53

Modified files:
	koha-tmpl/opac-tmpl/prog/en/includes: basket.js 

Log message:
	bug fix : send biblio from bookbag to a shelf was broken.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.6&r2=1.1.2.7

Patches:
Index: basket.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- basket.js	31 Jan 2007 15:58:20 -0000	1.1.2.6
+++ basket.js	5 Feb 2007 09:53:53 -0000	1.1.2.7
@@ -200,7 +200,7 @@
 
 
 function selRecord(num, status) {
-    var str = document.bookbag_form.records.value
+    var str = document.myform.records.value
     if (status){
         str += num+"/";
     }
@@ -208,7 +208,7 @@
         str = delRecord(num, str);
     }
 
-    document.bookbag_form.records.value = str;
+    document.myform.records.value = str;
 }
 
 function delSelRecords() {




From antoine at koha-fr.org  Mon Feb  5 11:11:58 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 10:11:58 +0000
Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en/includes baske...
	[rel_3_0]
Message-ID: <E1HE0pK-0001NU-UR@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 10:11:58

Modified files:
	koha-tmpl/opac-tmpl/prog/en/includes: basket.js 

Log message:
	fix a wrong form name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.7&r2=1.1.2.8

Patches:
Index: basket.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- basket.js	5 Feb 2007 09:53:53 -0000	1.1.2.7
+++ basket.js	5 Feb 2007 10:11:58 -0000	1.1.2.8
@@ -218,7 +218,7 @@
     var valCookie = readCookie(nameCookie, 1);
 
     if (valCookie) {
-        var str = document.bookbag_form.records.value;
+        var str = document.myform.records.value;
         if (str.length > 0){
             recordsSel = 1;
             var str2 = valCookie;
@@ -302,7 +302,7 @@
 
 
 function quit() {
-    if (document.bookbag_form.records.value) {
+    if (document.myform.records.value) {
         var rep = false;
         rep = confirm(MSG_CONFIRM_DEL_RECORDS);
         if (rep) {




From antoine at koha-fr.org  Mon Feb  5 12:19:16 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 11:19:16 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/bookshelve...
	[rel_3_0]
Message-ID: <E1HE1sS-0005L6-QG@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 11:19:16

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/bookshelves: shelves.tmpl 

Log message:
	adding a missing javascript function: confirmDelete

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.11&r2=1.1.2.12

Patches:
Index: shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- shelves.tmpl	15 Dec 2006 17:38:50 -0000	1.1.2.11
+++ shelves.tmpl	5 Feb 2007 11:19:16 -0000	1.1.2.12
@@ -125,7 +125,6 @@
         <tr><th scope="row"><label for="category">Category:</label> </th><td><select name="category" id="category">
                                     <option value="1">Private</option>
                                     <option value="2">Public</option>
-                                    <option value="3">Free</option>
                                     </select></td></tr></table>
         <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
             <li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
@@ -197,6 +196,14 @@
 
 <br clear="both" />
 
+<script type="text/javascript">
+	function confirmDelete(s){
+		if (window.confirm(s))
+			return true;
+		return false;
+	}
+</script>
+
 </body>
 </html>
 




From laurenthdl at alinto.com  Mon Feb  5 14:16:09 2007
From: laurenthdl at alinto.com (Henri-Damien LAURENT)
Date: Mon, 05 Feb 2007 13:16:09 +0000
Subject: [Koha-cvs] koha C4/AuthoritiesMarc.pm koha-tmpl/intranet-t...
	[rel_3_0]
Message-ID: <E1HE3hZ-0003e5-KH@savannah.gnu.org>

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/05 13:16:09

Modified files:
	C4             : AuthoritiesMarc.pm 
	koha-tmpl/intranet-tmpl/prog/en/authorities: 
	                                             searchresultlist.tmpl 
	koha-tmpl/opac-tmpl/prog/en: opac-authorities-home.tmpl 
	                             opac-authoritiessearchresultlist.tmpl 
Added files:
	koha-tmpl/opac-tmpl/prog/en: opac-authoritiesdetail.tmpl 

Log message:
	Removing Link from AuthoritiesMARC summary (caused a problem owed to the API differences between opac and intranet)
	+ removing $dbh in authoritysearch
	+ adding links in templates on summaries to go to full view.
	(no more links in popup authorities. or should we add it ?)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.16&r2=1.28.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1

Patches:
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.16
retrieving revision 1.28.2.17
diff -u -b -r1.28.2.16 -r1.28.2.17
--- C4/AuthoritiesMarc.pm	2 Feb 2007 18:07:42 -0000	1.28.2.16
+++ C4/AuthoritiesMarc.pm	5 Feb 2007 13:16:08 -0000	1.28.2.17
@@ -66,7 +66,8 @@
     return  ($tagfield,$tagsubfield);
 }
 sub authoritysearch {
-    my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby) = @_;
+    my ($tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby) = @_;
+    my $dbh=C4::Context->dbh;
     my $query;
     my $attr;
     # the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
@@ -186,7 +187,8 @@
     #     }#
     
         my $summary=getsummary($authrecord,$authid,$authtypecode);
-        $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>";
+#         $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>" if ($intranet);
+#         $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>" if ($intranet);
     #     if ($linkid && $linksummary ne " ".$separator){
     #         $summary="<b>".$summary."</b>".$linksummary;
     #     }
@@ -946,8 +948,14 @@
 
 =cut
 
-# $Id: AuthoritiesMarc.pm,v 1.28.2.16 2007/02/02 18:07:42 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.17 2007/02/05 13:16:08 hdl Exp $
 # $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.17  2007/02/05 13:16:08  hdl
+# Removing Link from AuthoritiesMARC summary (caused a problem owed to the API differences between opac and intranet)
+# + removing $dbh in authoritysearch
+# + adding links in templates on summaries to go to full view.
+# (no more links in popup authorities. or should we add it ?)
+#
 # Revision 1.28.2.16  2007/02/02 18:07:42  hdl
 # Sorting and searching for exact term now works.
 #

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl	9 Jan 2007 15:18:10 -0000	1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl	5 Feb 2007 13:16:08 -0000	1.1.2.4
@@ -29,7 +29,7 @@
     </tr>
 <!-- TMPL_LOOP NAME="result" -->
     <tr>
-      <td><!-- TMPL_VAR NAME="summary" --></td>
+      <td><a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->"><!-- TMPL_VAR NAME="summary" --></a></td>
   <!-- TMPL_UNLESS name="isEDITORS" -->
       <td>
         <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>

Index: koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-authorities-home.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl	7 Dec 2006 15:42:15 -0000	1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl	5 Feb 2007 13:16:09 -0000	1.1.2.4
@@ -25,10 +25,11 @@
                 <label class="label100">Main entry ($a only)</label>
                 <select name="operator">
                     <option value="contains">contains</option>
-                    <option value="start">start by</option>
+                    <option value="start">starts by</option>
+                    <option value="is">is exactly</option>
                 </select>
                 <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-                <input type="hidden" name="marclist" value="$a">
+                <input type="hidden" name="marclist" value="mainmainentry">
                 <input type="hidden" name="and_or" value="and">
                 <input type="hidden" name="excluding" value="">
             </p>
@@ -36,7 +37,8 @@
                 <label class="label100">Main entry</label>
                 <select name="operator">
                     <option value="contains">contains</option>
-                    <option value="start">start by</option>
+                    <option value="start">starts by</option>
+                    <option value="is">is exactly</option>
                 </select>
                 <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
                 <input type="hidden" name="marclist" value="mainentry">
@@ -47,7 +49,9 @@
                 <label class="label100">Anywhere</label>
                 <select name="operator">
                     <option value="contains">contains</option>
-                    <option value="start">start by</option>
+                    <option value="start">starts by</option>
+                    <option value="is">is exactly</option>
+
                 </select>
                 <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
                 <input type="hidden" name="marclist" value="">

Index: koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-authoritiessearchresultlist.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl	11 Jan 2007 14:38:18 -0000	1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl	5 Feb 2007 13:16:09 -0000	1.1.2.5
@@ -42,7 +42,7 @@
 			</tr>
 			<!-- TMPL_LOOP NAME="result" -->
 				<tr>
-					<td><!-- TMPL_VAR NAME="summary" --></td>
+					<td><a href="opac-authoritiesdetail.pl?authid=<!-- TMPL_VAR NAME="authid" -->"><!-- TMPL_VAR NAME="summary" --></a></td>
 
 						<td>
 					<!-- TMPL_VAR NAME="authtype" -->

Index: koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
===================================================================
RCS file: koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
diff -N koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl	5 Feb 2007 13:16:09 -0000	1.1.2.1
@@ -0,0 +1,23 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Advanced Search
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+
+<div id="main">
+<div class="tabbed">
+	<h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
+	<a href="opac-search.pl?type=opac&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR name="count" --> biblios</a>
+</div>
+<table border="0"><!-- TMPL_LOOP name="0XX" -->
+        <tr noborder ><td colspan="3" class="marctag"><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td class="marcsubfieldletter" ><!-- TMPL_VAR name="marc_subfield" --></td>
+                    <td class="marcsubfieldname" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td class="subfieldvalue" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+</table>
+</div>	
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From alaurin at ouestprovence.fr  Mon Feb  5 14:47:37 2007
From: alaurin at ouestprovence.fr (LAURIN arnaud)
Date: Mon, 05 Feb 2007 13:47:37 +0000
Subject: [Koha-cvs] koha/C4/Circulation Circ2.pm [rel_3_0]
Message-ID: <E1HE4C1-0006IB-KO@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	07/02/05 13:47:37

Modified files:
	C4/Circulation : Circ2.pm 

Log message:
	bugfixing sql mistake for display information with filtered departement .....

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.36&r2=1.114.2.37

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.36
retrieving revision 1.114.2.37
diff -u -b -r1.114.2.36 -r1.114.2.37
--- Circ2.pm	2 Feb 2007 09:57:46 -0000	1.114.2.36
+++ Circ2.pm	5 Feb 2007 13:47:37 -0000	1.114.2.37
@@ -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: Circ2.pm,v 1.114.2.36 2007/02/02 09:57:46 alaurin Exp $
+# $Id: Circ2.pm,v 1.114.2.37 2007/02/05 13:47:37 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -41,7 +41,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.36 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.37 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -2941,16 +2941,16 @@
                     items.itemnumber,
                     biblio.biblionumber,
                     issues.branchcode,
-                    accounlines.notify_id,
-                    accounlines.notify_level,
+                    accountlines.notify_id,
+                    accountlines.notify_level,
                     items.location,
-                    accounlines.amountoutstanding
-           FROM  issues,borrowers,biblio,biblioitems,itemtypes,items,branches,accounlines
+                    accountlines.amountoutstanding
+           FROM  issues,borrowers,biblio,biblioitems,itemtypes,items,branches,accountlines
            WHERE ((( issues.returndate  is null)
-             AND ( accounlines.amountoutstanding  != '0.000000')
-             AND ( accounlines.accounttype  = 'FU')))
-             AND (( issues.borrowernumber = accounlines.borrowernumber )
-             AND ( issues.itemnumber = accounlines.itemnumber )
+             AND ( accountlines.amountoutstanding  != '0.000000')
+             AND ( accountlines.accounttype  = 'FU')))
+             AND (( issues.borrowernumber = accountlines.borrowernumber )
+             AND ( issues.itemnumber = accountlines.itemnumber )
              AND ( borrowers.borrowernumber = issues.borrowernumber )
              AND ( biblio.biblionumber = biblioitems.biblionumber )
              AND ( biblioitems.biblionumber = items.biblionumber )
@@ -2960,9 +2960,9 @@
              AND (issues.branchcode = ? AND items.location = ?)
              AND NOT EXISTS (
                 SELECT * FROM  notifys  
-                WHERE ( accounlines.notify_id  =  notifys.notify_id )
-                  AND ( accounlines.notify_level  =  notifys.notify_level )
-                  AND ( accounlines.itemnumber  =  notifys.itemnumber ) )
+                WHERE ( accountlines.notify_id  =  notifys.notify_id )
+                  AND ( accountlines.notify_level  =  notifys.notify_level )
+                  AND ( accountlines.itemnumber  =  notifys.itemnumber ) )
            ORDER BY  borrowers.surname 
         " );
         $sth->execute( $branch, $departement );




From antoine at koha-fr.org  Mon Feb  5 15:54:51 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 14:54:51 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/bookshelve...
	[rel_3_0]
Message-ID: <E1HE5F5-0003g6-Ba@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 14:54:51

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/bookshelves: shelves.tmpl 

Log message:
	add missing function checkAll. 
	checkAll checks all checkbox if they are not all checked.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.12&r2=1.1.2.13

Patches:
Index: shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -b -r1.1.2.12 -r1.1.2.13
--- shelves.tmpl	5 Feb 2007 11:19:16 -0000	1.1.2.12
+++ shelves.tmpl	5 Feb 2007 14:54:51 -0000	1.1.2.13
@@ -24,8 +24,8 @@
         <input type="hidden" name="modifyshelfcontents" value="1" />
             <tr>
                 <th>
-                    <a href="/cgi-bin/koha/bookshelves/shelves.pl" onclick="CheckAll(); return false;">
-                        Check All
+                    <a href="javascript:CheckAll();">
+                        <small>(Un)Check All</small>
                     </a>
                 </th>
                 <th>&nbsp;</th>
@@ -202,8 +202,37 @@
 			return true;
 		return false;
 	}
-</script>
+	/**
+	 * this function checks all checkbox 
+	 * or uncheck all if there are already checked.
+	 */
+	function CheckAll(){
+		var checkboxes = document.getElementsByTagName('input');
+		var nbCheckbox = checkboxes.length;
+		var check = areAllChecked();
+		check = !check;
+		for(var i=0;i<nbCheckbox;i++){
+			if(checkboxes[i].getAttribute('type') == "checkbox" ){
+				checkboxes[i].checked = check;
+			}
+		}
+	}
+	/**
+	 * this function return true if all checkbox are checked
+	 */
+	function areAllChecked(){
+		var checkboxes = document.getElementsByTagName('input');
+		var nbCheckbox = checkboxes.length;
+		for(var i=0;i<nbCheckbox;i++){
+			if(checkboxes[i].getAttribute('type') == "checkbox" ){
+				if(checkboxes[i].checked == 0){
+					return false;
+				}
+			}
+		}
+		return true;
+	}
 
-</body>
-</html>
+</script>
 
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->




From alaurin at ouestprovence.fr  Mon Feb  5 16:04:15 2007
From: alaurin at ouestprovence.fr (LAURIN arnaud)
Date: Mon, 05 Feb 2007 15:04:15 +0000
Subject: [Koha-cvs] koha/misc/cronjobs notifyMailsOp.pl [rel_3_0]
Message-ID: <E1HE5OB-00049D-Fc@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	07/02/05 15:04:15

Modified files:
	misc/cronjobs  : notifyMailsOp.pl 

Log message:
	adding an utf8 decode for lisibility of mailtitle 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/cronjobs/notifyMailsOp.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: notifyMailsOp.pl
===================================================================
RCS file: /sources/koha/koha/misc/cronjobs/Attic/notifyMailsOp.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- notifyMailsOp.pl	29 Jan 2007 14:56:09 -0000	1.1.2.1
+++ notifyMailsOp.pl	5 Feb 2007 15:04:15 -0000	1.1.2.2
@@ -181,6 +181,10 @@
 					}
 				}
 # initiate the send mail
+
+#       decoding mailtitle for lisibility of mailtitle (bug with utf-8 values, so decoding it)
+        utf8::decode($mailtitle);
+
 			my $mailtext = $content;
 				unshift @{$Mail::Sendmail::mailcfg{'smtp'}} , $smtpserver;
 #                                         set your own mail server name here




From antoine at koha-fr.org  Mon Feb  5 16:24:28 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 15:24:28 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/members me...
	[rel_3_0]
Message-ID: <E1HE5hk-0005Ha-U6@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 15:24:28

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/members: member.tmpl 
	                                         members-home.tmpl 

Log message:
	the text input is selected by default when the page is loaded.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.6&r2=1.2.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3

Patches:
Index: member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -b -r1.2.2.6 -r1.2.2.7
--- member.tmpl	29 Jan 2007 16:34:21 -0000	1.2.2.6
+++ member.tmpl	5 Feb 2007 15:24:28 -0000	1.2.2.7
@@ -5,7 +5,7 @@
 
 <h1>Borrowers search results</h1>
 
-    <form action="/cgi-bin/koha/members/member.pl" method="post">
+    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
         <label for="member">Name or Barcode</label>
         <input id="member" type="text" size="25" name="member" />
         <select name="orderby" id="orderby">
@@ -77,4 +77,9 @@
     </p>
 <!-- /TMPL_IF -->
 
+    <script type="text/javascript">
+		//set the focus to the input text.    
+    	document.f.member.focus();
+    </script>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: members-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- members-home.tmpl	29 Jan 2007 16:35:38 -0000	1.2.2.2
+++ members-home.tmpl	5 Feb 2007 15:24:28 -0000	1.2.2.3
@@ -5,7 +5,7 @@
 
 <h1>Borrowers search</h1>
 
-    <form action="/cgi-bin/koha/members/member.pl" method="post">
+    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
         <label for="member">Name or Barcode</label>
         <input id="member" type="text" size="25" name="member" />
         <select name="orderby" id="orderby">
@@ -42,4 +42,8 @@
         <a href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
         <a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
     </div>
+    <script type="text/javascript">
+		//set the focus to the input text.    
+    	document.f.member.focus();
+    </script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From antoine at koha-fr.org  Mon Feb  5 16:25:02 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 15:25:02 +0000
Subject: [Koha-cvs] koha/members memberentry.pl [rel_3_0]
Message-ID: <E1HE5iH-0005Jy-Ut@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 15:25:01

Modified files:
	members        : memberentry.pl 

Log message:
	removing warn compilation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.24&r2=1.38.2.25

Patches:
Index: memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.24
retrieving revision 1.38.2.25
diff -u -b -r1.38.2.24 -r1.38.2.25
--- memberentry.pl	25 Jan 2007 11:02:08 -0000	1.38.2.24
+++ memberentry.pl	5 Feb 2007 15:25:01 -0000	1.38.2.25
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.24 2007/01/25 11:02:08 tipaul Exp $
+# $Id: memberentry.pl,v 1.38.2.25 2007/02/05 15:25:01 toins Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -282,7 +282,7 @@
 	
 	
 	my $action="WHERE category_type=?";
-	my ($categories,$labels)=GetborCatFromCatType($category_type,$action);
+	($categories,$labels)=GetborCatFromCatType($category_type,$action);
 	
 	if(scalar(@$categories)){
 	    #if you modify the borrowers you must have the right value for his category code




From antoine at koha-fr.org  Mon Feb  5 16:34:36 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 15:34:36 +0000
Subject: [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/members/me...
	[rel_3_0]
Message-ID: <E1HE5rY-0006t4-Dg@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 15:34:36

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/members: memberentryP.tmpl 
	                                         moremember.tmpl 
	members        : moremember.pl 

Log message:
	enable to write no relation when creating a new prof.
	Adding this info on the summary page.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.14&r2=1.7.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.28&r2=1.12.2.29
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.19&r2=1.28.2.20

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.7.2.14
retrieving revision 1.7.2.15
diff -u -b -r1.7.2.14 -r1.7.2.15
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl	29 Jan 2007 16:35:13 -0000	1.7.2.14
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl	5 Feb 2007 15:34:36 -0000	1.7.2.15
@@ -434,6 +434,7 @@
 			<!-- /TMPL_IF-->
 			Relation</label>
 			<select name="relationship" size="1">
+				<option> </option>
 						<!-- TMPL_LOOP NAME="relshiploop" -->
 							<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
 						<!-- /TMPL_LOOP -->

Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.28
retrieving revision 1.12.2.29
diff -u -b -r1.12.2.28 -r1.12.2.29
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl	31 Jan 2007 15:23:49 -0000	1.12.2.28
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl	5 Feb 2007 15:34:36 -0000	1.12.2.29
@@ -145,6 +145,7 @@
     <p><label>Borrower Number:</label><!-- TMPL_VAR NAME="borrowernumber" --></p>
     <p><label>Category:</label><!-- TMPL_VAR NAME="categorycode" --></p>
     <p><label>Registration Date:</label><!-- TMPL_VAR NAME="dateenrolled" --></p>
+    <p><label>Relation:</label><!-- TMPL_VAR NAME="relationship" --></p>
     
     <p><label>Expiration Date: </label>
     <!-- TMPL_IF NAME="reregistration" -->

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.19
retrieving revision 1.28.2.20
diff -u -b -r1.28.2.19 -r1.28.2.20
--- members/moremember.pl	29 Jan 2007 16:46:28 -0000	1.28.2.19
+++ members/moremember.pl	5 Feb 2007 15:34:36 -0000	1.28.2.20
@@ -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: moremember.pl,v 1.28.2.19 2007/01/29 16:46:28 toins Exp $
+# $Id: moremember.pl,v 1.28.2.20 2007/02/05 15:34:36 toins Exp $
 
 =head1 moremember.pl
 
@@ -357,6 +357,8 @@
 if ( -e $htdocs . "$picture" ) {
     $template->param( picture => $picture );
 }
+
+
 $template->param($data);
 
 $template->param(




From laurenthdl at alinto.com  Mon Feb  5 16:40:07 2007
From: laurenthdl at alinto.com (Henri-Damien LAURENT)
Date: Mon, 05 Feb 2007 15:40:07 +0000
Subject: [Koha-cvs] koha/koha-tmpl intranet-tmpl/prog/en/catalogue/...
	[rel_3_0]
Message-ID: <E1HE5wt-0007gC-Ek@savannah.gnu.org>

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/05 15:40:07

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl 
	koha-tmpl/opac-tmpl/prog/en: opac-advsearch.tmpl 

Log message:
	adding kw to keyword in order to have a good CCL when keyword is 2nd position.
	kw is in ccl.properties.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.13&r2=1.1.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.11&r2=1.1.2.12

Patches:
Index: intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- intranet-tmpl/prog/en/catalogue/advsearch.tmpl	22 Dec 2006 17:34:13 -0000	1.1.2.13
+++ intranet-tmpl/prog/en/catalogue/advsearch.tmpl	5 Feb 2007 15:40:07 -0000	1.1.2.14
@@ -17,30 +17,28 @@
 <fieldset>
         <legend>Select local databases</legend>
             <p>
-                <!-- TMPL_LOOP NAME="outer_servers_loop" -->
-                <!-- TMPL_LOOP NAME="inner_servers_loop" -->
+                <!-- TMPL_LOOP NAME="local_servers_loop" -->
                 <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
-                <!-- /TMPL_LOOP -->
             </p>
 </fieldset>
 <!-- /DATABASES -->
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="outer_sup_servers_loop" -->
+<!-- TMPL_IF NAME="outer_servers_loop" -->
 <!-- REMOTE DATABASES -->
 <fieldset>
     <legend>Select remote databases:</legend>
         <p>
-                <!-- TMPL_LOOP NAME="outer_sup_servers_loop" -->
-                <!-- TMPL_LOOP NAME="inner_sup_servers_loop" -->
+                <!-- TMPL_LOOP NAME="outer_servers_loop" -->
                 <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->"/><!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
-                <!-- /TMPL_LOOP -->
     </p>
     </fieldset>
 <!-- /REMOTE DATABASES -->
 <!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+<h3>Search the Library Catalog</h3>
 <!-- /TMPL_IF -->
 
 <!-- BOOLEAN SEARCH OPTIONS -->
@@ -51,7 +49,7 @@
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF --> 
         <select name="idx">
-    <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+    <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
     <option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
     <option value="cpn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>

Index: opac-tmpl/prog/en/opac-advsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-advsearch.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- opac-tmpl/prog/en/opac-advsearch.tmpl	10 Jan 2007 14:34:38 -0000	1.1.2.11
+++ opac-tmpl/prog/en/opac-advsearch.tmpl	5 Feb 2007 15:40:07 -0000	1.1.2.12
@@ -50,7 +50,7 @@
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF --> 
         <select name="idx">
-            <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+            <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
             <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
             <!-- TMPL_IF NAME="expanded_options" -->
                 <option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>




From antoine at koha-fr.org  Mon Feb  5 16:53:11 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 15:53:11 +0000
Subject: [Koha-cvs] koha/C4 Auth.pm [rel_3_0]
Message-ID: <E1HE69X-0008Nk-ID@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 15:53:11

Modified files:
	C4             : Auth.pm 

Log message:
	adding some default syspref which should be loaded in each template.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.26&r2=1.54.2.27

Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.26
retrieving revision 1.54.2.27
diff -u -b -r1.54.2.26 -r1.54.2.27
--- Auth.pm	31 Jan 2007 15:41:14 -0000	1.54.2.26
+++ Auth.pm	5 Feb 2007 15:53:11 -0000	1.54.2.27
@@ -37,7 +37,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54.2.26 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.54.2.27 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -227,6 +227,7 @@
             AutoLocation       => C4::Context->preference("AutoLocation"),
             hide_marc          => C4::Context->preference("hide_marc"),
             patronimages       => C4::Context->preference("patronimages"),
+            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
         );
     }
     else {
@@ -264,6 +265,7 @@
             reviewson          => C4::Context->preference("reviewson"),
             hide_marc          => C4::Context->preference("hide_marc"),
             patronimages       => C4::Context->preference("patronimages"),
+            "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
         );
     }
     return ( $template, $borrowernumber, $cookie );




From antoine at koha-fr.org  Mon Feb  5 16:54:30 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 15:54:30 +0000
Subject: [Koha-cvs] koha bookshelves/shelves.pl koha-tmpl/intranet-...
	[rel_3_0]
Message-ID: <E1HE6Ao-0008R1-BJ@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 15:54:30

Modified files:
	bookshelves    : shelves.pl 
	koha-tmpl/intranet-tmpl/prog/en/bookshelves: shelves.tmpl 

Log message:
	don't display "remove selected shelves" if the user logged has no shelf.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/bookshelves/shelves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.8&r2=1.9.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.13&r2=1.1.2.14

Patches:
Index: bookshelves/shelves.pl
===================================================================
RCS file: /sources/koha/koha/bookshelves/shelves.pl,v
retrieving revision 1.9.2.8
retrieving revision 1.9.2.9
diff -u -b -r1.9.2.8 -r1.9.2.9
--- bookshelves/shelves.pl	15 Dec 2006 17:36:57 -0000	1.9.2.8
+++ bookshelves/shelves.pl	5 Feb 2007 15:54:30 -0000	1.9.2.9
@@ -198,6 +198,8 @@
 
 my $color = '';
 my @shelvesloop;
+my $numberCanManage = 0;
+
 foreach my $element ( sort keys %$shelflist ) {
     my %line;
     ( $color eq 1 ) ? ( $color = 0 ) : ( $color = 1 );
@@ -207,22 +209,20 @@
         $line{ "category" . $shelflist->{$element}->{'category'} } = 1;
         $line{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq $loggedinuser;
         $line{'shelfbookcount'} = $shelflist->{$element}->{'count'};
-        $line{'canmanage'}      =
-          ShelfPossibleAction( $loggedinuser, $element, 'manage' );
+    $line{'canmanage'} =  ShelfPossibleAction( $loggedinuser, $element, 'manage' );
         $line{'firstname'} = $shelflist->{$element}->{'firstname'}
           unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
         $line{'surname'} = $shelflist->{$element}->{'surname'}
           unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+    
+    $numberCanManage++ if $line{'canmanage'};
+    
         push( @shelvesloop, \%line );
-    }
+}
 
 $template->param(
     shelvesloop             => \@shelvesloop,
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-    "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+    numberCanManage => $numberCanManage,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
@@ -281,6 +281,9 @@
 
 #
 # $Log: shelves.pl,v $
+# Revision 1.9.2.9  2007/02/05 15:54:30  toins
+# don't display "remove selected shelves" if the user logged has no shelf.
+#
 # Revision 1.9.2.8  2006/12/15 17:36:57  toins
 # - some change on the html param.
 # - Writing directly the code of a sub called only once.

Index: koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl	5 Feb 2007 14:54:51 -0000	1.1.2.13
+++ koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl	5 Feb 2007 15:54:30 -0000	1.1.2.14
@@ -131,6 +131,7 @@
                                 <p><input type="submit" value="Add New Shelf"></p>
                     </form>
     
+        <!-- TMPL_IF NAME="numberCanManage" -->
         <!-- TMPL_IF NAME="shelvesloop" -->
         <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl" name="mainform">
                     <input type="hidden" name="shelves" value="1" />
@@ -140,12 +141,23 @@
                         <!-- TMPL_LOOP Name="shelvesloop" -->
                         <!-- TMPL_IF name="canmanage" -->
                         <tr>
-                            <td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
+                            <td>
+                                <input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" />
+                            </td>
+                            <td>
+                                <a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a>
+                            </td>
+                            <td>
+                                <!-- TMPL_VAR Name="shelfbookcount" --> item(s)
+                            </td>
+                        </tr>
                         <!-- /TMPL_IF -->
                         <!-- /TMPL_LOOP -->
                     </table>
         <input type="submit" value="Delete Shelves" /></form>
         <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <br />
         <p><form class="inline" action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" value="Back to Virtual Shelves" /></form></p>
 
     <!-- TMPL_ELSE -->




From antoine at koha-fr.org  Mon Feb  5 16:57:38 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 15:57:38 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/bookshelve...
	[rel_3_0]
Message-ID: <E1HE6Dq-00007y-0q@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 15:57:37

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/bookshelves: shelves.tmpl 

Log message:
	removing the possibility to add a free virtual shelf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.14&r2=1.1.2.15

Patches:
Index: shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- shelves.tmpl	5 Feb 2007 15:54:30 -0000	1.1.2.14
+++ shelves.tmpl	5 Feb 2007 15:57:37 -0000	1.1.2.15
@@ -126,8 +126,10 @@
                                     <option value="1">Private</option>
                                     <option value="2">Public</option>
                                     </select></td></tr></table>
-        <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
-            <li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
+        <ul>
+            <li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li>
+            <li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
+        </ul>
                                 <p><input type="submit" value="Add New Shelf"></p>
                     </form>
         
@@ -180,16 +182,11 @@
                     <!-- TMPL_ELSE -->
                         <option value="2">Public</option>
                     <!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="category3" -->
-                        <option value="3" selected>Free</option>
-                    <!-- TMPL_ELSE -->
-                        <option value="3">Free</option>
-                    <!-- /TMPL_IF -->
                 </select></td></tr>
             </table>
             <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
                 <li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
-                <li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
+            </ul>
             <p><input type="submit" value="Save Changes"></p>
 
         </form>




From antoine at koha-fr.org  Mon Feb  5 17:16:17 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 16:16:17 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/suggestion...
	[rel_3_0]
Message-ID: <E1HE6Vt-0001LV-4Y@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 16:16:17

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/suggestion: acceptorreject.tmpl 

Log message:
	writing a message if there is no waiting suggestion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6

Patches:
Index: acceptorreject.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- acceptorreject.tmpl	24 Jan 2007 13:55:36 -0000	1.1.2.5
+++ acceptorreject.tmpl	5 Feb 2007 16:16:17 -0000	1.1.2.6
@@ -13,6 +13,7 @@
 
 <!-- TMPL_IF name="op_else" -->
     <br />
+    <!-- TMPL_IF NAME="suggestions_loop" -->
     <b>Waiting suggestion,</b> accept or reject these suggestions with a reason.
     <form name="f" method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
     <input type="hidden" name="op" value="aorr_confirm">
@@ -67,6 +68,9 @@
         </table>
         <input type="submit" value="Change Status">
 </form>
+<!-- TMPL_ELSE -->
+    <b>No waiting suggestion to accept or reject.</b>
+<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="done" -->




From antoine at koha-fr.org  Mon Feb  5 17:50:02 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 16:50:02 +0000
Subject: [Koha-cvs] koha C4/Biblio.pm opac/opac-ISBDdetail.pl opac/...
	[rel_3_0]
Message-ID: <E1HE72Y-0004gq-7N@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 16:50:02

Modified files:
	C4             : Biblio.pm 
	opac           : opac-ISBDdetail.pl opac-MARCdetail.pl 

Log message:
	fix a mod_perl bug:
	There was a global var modified into an internal function in {MARC|ISBD}detail.pl.
	Moving this function in Biblio.pm

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.57&r2=1.178.2.58
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16.2.9&r2=1.16.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.9&r2=1.14.2.10

Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.57
retrieving revision 1.178.2.58
diff -u -b -r1.178.2.57 -r1.178.2.58
--- C4/Biblio.pm	25 Jan 2007 09:37:58 -0000	1.178.2.57
+++ C4/Biblio.pm	5 Feb 2007 16:50:01 -0000	1.178.2.58
@@ -33,7 +33,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.178.2.57 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.178.2.58 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -59,6 +59,7 @@
   &GetItemFromBarcode
   &getitemsbybiblioitem
   &get_itemnumbers_of
+  &GetAuthorisedValueDesc
   &GetXmlBiblio
 );
 
@@ -1455,6 +1456,44 @@
     return $marcxml;
 }
 
+=head2 GetAuthorisedValueDesc
+
+my $subfieldvalue =get_authorised_value_desc(
+    $tag, $subf[$i][0],$subf[$i][1], '', $taglib);
+
+=cut
+
+sub GetAuthorisedValueDesc {
+    my ( $tag, $subfield, $value, $framework, $tagslib ) = @_;
+    my $dbh = C4::Context->dbh;
+    
+    #---- branch
+    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+        return C4::Branch::GetBranchName($value);
+    }
+
+    #---- itemtypes
+    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+        return getitemtypeinfo($value);
+    }
+
+    #---- "true" authorized value
+    my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+    if ( $category ne "" ) {
+        my $sth =
+          $dbh->prepare(
+            "select lib from authorised_values where category = ? and authorised_value = ?"
+          );
+        $sth->execute( $category, $value );
+        my $data = $sth->fetchrow_hashref;
+        return $data->{'lib'};
+    }
+    else {
+        return $value;    # if nothing is found return the original value
+    }
+}
+
 =head2 MARCgetitem
 
 Returns MARC::Record of the item passed in parameter.
@@ -3654,8 +3693,13 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.178.2.57 2007/01/25 09:37:58 tipaul Exp $
+# $Id: Biblio.pm,v 1.178.2.58 2007/02/05 16:50:01 toins Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.178.2.58  2007/02/05 16:50:01  toins
+# fix a mod_perl bug:
+# There was a global var modified into an internal function in {MARC|ISBD}detail.pl.
+# Moving this function in Biblio.pm
+#
 # Revision 1.178.2.57  2007/01/25 09:37:58  tipaul
 # removing warn
 #

Index: opac/opac-ISBDdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.16.2.9
retrieving revision 1.16.2.10
diff -u -b -r1.16.2.9 -r1.16.2.10
--- opac/opac-ISBDdetail.pl	31 Jan 2007 16:28:06 -0000	1.16.2.9
+++ opac/opac-ISBDdetail.pl	5 Feb 2007 16:50:01 -0000	1.16.2.10
@@ -17,21 +17,20 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-ISBDdetail.pl,v 1.16.2.9 2007/01/31 16:28:06 tipaul Exp $
+# $Id: opac-ISBDdetail.pl,v 1.16.2.10 2007/02/05 16:50:01 toins Exp $
 
 =head1 NAME
 
-MARCdetail.pl : script to show a biblio in MARC format
+opac-ISBDdetail.pl : script to show a biblio in ISBD format
 
 
 =head1 DESCRIPTION
 
 This script needs a biblionumber as parameter 
 
-It shows the biblio in a (nice) MARC format depending on MARC
-parameters tables.
+It shows the biblio
 
-The template is in <templates_dir>/catalogue/MARCdetail.tmpl.
+The template is in <templates_dir>/catalogue/ISBDdetail.tmpl.
 this template must be divided into 11 "tabs".
 
 The first 10 tabs present the biblio, the 11th one presents
@@ -56,7 +55,7 @@
 use C4::Review;
 use C4::Serials;    # uses getsubscriptionfrom biblionumber
 use C4::Koha;       # use getitemtypeinfo
-use C4::Branch;     # use GetBranchName
+use C4::Members;    # GetMember
 
 my $query = new CGI;
 
@@ -136,8 +135,8 @@
                 for my $i ( 0 .. $#subf ) {
                     my $subfieldcode  = $subf[$i][0];
                     my $subfieldvalue =
-                      get_authorised_value_desc( $tag, $subf[$i][0],
-                        $subf[$i][1], '', $dbh );
+                      GetAuthorisedValueDesc( $tag, $subf[$i][0],
+                        $subf[$i][1], '', $tagslib );
                     my $tagsubf = $tag . $subfieldcode;
                     $calculated =~
 s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
@@ -230,33 +229,3 @@
 }
 
 output_html_with_http_headers $query, $cookie, $template->output;
-
-sub get_authorised_value_desc ($$$$$) {
-    my ( $tag, $subfield, $value, $framework, $dbh ) = @_;
-
-    #---- branch
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-        return GetBranchName($value);
-    }
-
-    #---- itemtypes
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-        return getitemtypeinfo($value);
-    }
-
-    #---- "true" authorized value
-    my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-    if ( $category ne "" ) {
-        my $sth =
-          $dbh->prepare(
-"select lib from authorised_values where category = ? and authorised_value = ?"
-          );
-        $sth->execute( $category, $value );
-        my $data = $sth->fetchrow_hashref;
-        return $data->{'lib'};
-    }
-    else {
-        return $value;    # if nothing is found return the original value
-    }
-}

Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.14.2.9
retrieving revision 1.14.2.10
diff -u -b -r1.14.2.9 -r1.14.2.10
--- opac/opac-MARCdetail.pl	10 Jan 2007 10:52:58 -0000	1.14.2.9
+++ opac/opac-MARCdetail.pl	5 Feb 2007 16:50:01 -0000	1.14.2.10
@@ -161,8 +161,8 @@
                         $subfield_data{authority} = $fields[$x_i]->subfield(9);
                     }
                     $subfield_data{marc_value} =
-                      get_authorised_value_desc( $fields[$x_i]->tag(),
-                        $subf[$i][0], $subf[$i][1], '', $dbh );
+                      GetAuthorisedValueDesc( $fields[$x_i]->tag(),
+                        $subf[$i][0], $subf[$i][1], '', $tagslib );
                 }
                 $subfield_data{marc_subfield} = $subf[$i][0];
                 $subfield_data{marc_tag}      = $fields[$x_i]->tag();
@@ -227,8 +227,8 @@
         }
         else {
             $this_row{ $subf[$i][0] } =
-              get_authorised_value_desc( $field->tag(), $subf[$i][0],
-                $subf[$i][1], '', $dbh );
+              GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
+                $subf[$i][1], '', $tagslib );
         }
     }
     if (%this_row) {
@@ -276,36 +276,5 @@
     item_header_loop => \@header_value_loop,
     biblionumber     => $biblionumber,
 );
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub get_authorised_value_desc ($$$$$) {
-    my ( $tag, $subfield, $value, $framework, $dbh ) = @_;
-
-    #---- branch
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-
-        #       return GetBranchDetail($value)->{branchname};
-    }
-
-    #---- itemtypes
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-
-        #       return ItemType($value);
-    }
-
-    #---- "true" authorized value
-    my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
 
-    if ( $category ne "" ) {
-        my $sth =
-          $dbh->prepare(
-"select lib from authorised_values where category = ? and authorised_value = ?"
-          );
-        $sth->execute( $category, $value );
-        my $data = $sth->fetchrow_hashref;
-        return $data->{'lib'};
-    }
-    else {
-        return $value;    # if nothing is found return the original value
-    }
-}
+output_html_with_http_headers $query, $cookie, $template->output;




From antoine at koha-fr.org  Mon Feb  5 17:50:36 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 16:50:36 +0000
Subject: [Koha-cvs] koha/C4 Serials.pm [rel_3_0]
Message-ID: <E1HE736-0004iR-JV@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 16:50:36

Modified files:
	C4             : Serials.pm 

Log message:
	removing a warn compilation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.31&r2=1.5.2.32

Patches:
Index: Serials.pm
===================================================================
RCS file: /sources/koha/koha/C4/Serials.pm,v
retrieving revision 1.5.2.31
retrieving revision 1.5.2.32
diff -u -b -r1.5.2.31 -r1.5.2.32
--- Serials.pm	5 Feb 2007 09:01:57 -0000	1.5.2.31
+++ Serials.pm	5 Feb 2007 16:50:36 -0000	1.5.2.32
@@ -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: Serials.pm,v 1.5.2.31 2007/02/05 09:01:57 hdl Exp $
+# $Id: Serials.pm,v 1.5.2.32 2007/02/05 16:50:36 toins Exp $
 
 use strict;
 use C4::Date;
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.5.2.31 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.5.2.32 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -1754,7 +1754,6 @@
     $sth->execute($subscriptionid);
     my ($res) = $sth->fetchrow  ;
     my @res=split (/-/,$res);
-    my @endofsubscriptiondate;
     my @endofsubscriptiondate=split(/-/,$expirationdate);
     return 1 if ( (@endofsubscriptiondate && Delta_Days($res[0],$res[1],$res[2],
                   $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2]) <= 0)




From antoine at koha-fr.org  Mon Feb  5 17:52:59 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 16:52:59 +0000
Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en opac-addbookby...
	[rel_3_0]
Message-ID: <E1HE75P-0004oP-Mj@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 16:52:59

Modified files:
	koha-tmpl/opac-tmpl/prog/en: opac-addbookbybiblionumber.tmpl 

Log message:
	display enhancement. do not ask for adding a biblio to a virtual shelf if the current user hasn't one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac-addbookbybiblionumber.tmpl	15 Jan 2007 17:12:18 -0000	1.1.2.3
+++ opac-addbookbybiblionumber.tmpl	5 Feb 2007 16:52:59 -0000	1.1.2.4
@@ -19,16 +19,17 @@
 </h1>
 <!-- /TMPL_IF -->
 
+<!-- TMPL_IF NAME="CGIbookshelves"-->
 <form name="f1" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="POST">
-
     <p><b>Select an Existing Bookshelf</b></p>
     <label>Add to virtual shelf</label> <!-- TMPL_VAR NAME="CGIbookshelves" -->
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
     <input type="hidden" name="modifyshelfcontents" value="1" />
     <input type="submit" value="Add to virtual shelf" class="submit" />
-
 </form>
 <p>...or...</p>
+<!-- /TMPL_IF -->
+
 <form name="f2" method="POST" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl">
     <b>Add to a New Bookshelf:</b>
         <p>
@@ -47,6 +48,7 @@
 </form>
 
 <p align="center">
+    <br /><br />
     <a href="javascript:closePopup();">close this window.</a>
 </p>
 




From antoine at koha-fr.org  Mon Feb  5 17:57:35 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 16:57:35 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes m...
	[rel_3_0]
Message-ID: <E1HE79r-0004za-8v@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 16:57:35

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/includes: menu-catalogue.inc 

Log message:
	removing a wrong link

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.5&r2=1.3.2.6

Patches:
Index: menu-catalogue.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -b -r1.3.2.5 -r1.3.2.6
--- menu-catalogue.inc	8 Dec 2006 14:56:00 -0000	1.3.2.5
+++ menu-catalogue.inc	5 Feb 2007 16:57:35 -0000	1.3.2.6
@@ -3,7 +3,6 @@
     <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
     <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add Full MARC Record</a>
     <a class="submenu serial" href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
-    <a href="/cgi-bin/koha/serials/lateissues.pl">Late issues</a>
     <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
     <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
 </div>




From antoine at koha-fr.org  Mon Feb  5 18:20:09 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 17:20:09 +0000
Subject: [Koha-cvs] koha circ/overdue.pl koha-tmpl/intranet-tmpl/pr...
	[rel_3_0]
Message-ID: <E1HE7Vh-0005tS-Qr@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 17:20:09

Modified files:
	circ           : overdue.pl 
	koha-tmpl/intranet-tmpl/prog/en/circ: overdue.tmpl 

Log message:
	display enhancement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/overdue.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: circ/overdue.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/overdue.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- circ/overdue.pl	25 Jan 2007 17:37:05 -0000	1.1.2.2
+++ circ/overdue.pl	5 Feb 2007 17:20:09 -0000	1.1.2.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: overdue.pl,v 1.1.2.2 2007/01/25 17:37:05 tipaul Exp $
+# $Id: overdue.pl,v 1.1.2.3 2007/02/05 17:20:09 toins Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -115,11 +115,8 @@
             author         => $author
         }
     );
-
 }
 
-$sth->finish;
-
 $template->param(
     todaysdate  => $todaysdate,
     overdueloop => \@overduedata

Index: koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/Attic/overdue.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl	25 Jan 2007 17:40:22 -0000	1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl	5 Feb 2007 17:20:09 -0000	1.1.2.3
@@ -3,6 +3,7 @@
 <!-- TMPL_INCLUDE NAME="menu-circ.inc"-->
 <h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
 
+<div class="searchresults">
 <table>
 <tr>
     <th>Due Date</th>
@@ -25,5 +26,5 @@
     </tr>
 <!-- /TMPL_LOOP -->
 </table>
-
+</div>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->




From antoine at koha-fr.org  Mon Feb  5 19:32:42 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 18:32:42 +0000
Subject: [Koha-cvs] koha/C4 Acquisition.pm [rel_3_0]
Message-ID: <E1HE8du-0002BK-FO@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 18:32:42

Modified files:
	C4             : Acquisition.pm 

Log message:
	new function : GetRecentAqcui.
	This function enable to list the last x recent acquisition like in koha 2.2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.10&r2=1.43.2.11

Patches:
Index: Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.43.2.10
retrieving revision 1.43.2.11
diff -u -b -r1.43.2.10 -r1.43.2.11
--- Acquisition.pm	25 Jan 2007 09:37:38 -0000	1.43.2.10
+++ Acquisition.pm	5 Feb 2007 18:32:42 -0000	1.43.2.11
@@ -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: Acquisition.pm,v 1.43.2.10 2007/01/25 09:37:38 tipaul Exp $
+# $Id: Acquisition.pm,v 1.43.2.11 2007/02/05 18:32:42 toins Exp $
 
 use strict;
 require Exporter;
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.43.2.10 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.43.2.11 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 # used in receiveorder subroutine
 # to provide library specific handling
@@ -60,7 +60,7 @@
   &GetBasket &NewBasket &CloseBasket
   &GetPendingOrders &GetOrder &GetOrders
   &GetOrderNumber &GetLateOrders &NewOrder &DelOrder
-  &SearchOrder &GetHistory
+  &SearchOrder &GetHistory &GetRecentAcqui
   &ModOrder &ModReceiveOrder &ModOrderBiblioNumber
   &GetParcels &GetParcel
 );
@@ -1127,6 +1127,32 @@
     return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
 }
 
+=head2 GetRecentAcqui
+
+   $results = GetRecentAcqui($days);
+
+   C<$results> is a ref to a table which containts hashref
+
+=cut
+
+sub GetRecentAcqui {
+    my $limit  = shift;
+    my $dbh    = C4::Context->dbh;
+    my $query = "
+        SELECT *
+        FROM   biblio
+        ORDER BY timestamp DESC
+        LIMIT  0,".$limit;
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+    my @results;
+    while(my $data = $sth->fetchrow_hashref){
+        push @results,$data;
+    }
+    return \@results;
+}
+
 END { }    # module clean-up code here (global destructor)
 
 1;




From antoine at koha-fr.org  Mon Feb  5 19:33:30 2007
From: antoine at koha-fr.org (Antoine Farnault)
Date: Mon, 05 Feb 2007 18:33:30 +0000
Subject: [Koha-cvs] koha koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl...
	[rel_3_0]
Message-ID: <E1HE8eg-0002GW-DZ@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/02/05 18:33:30

Modified files:
	koha-tmpl/opac-tmpl/prog/en: opac-main.tmpl 
	opac           : opac-main.pl 

Log message:
	re-introducing the possibility to list the recent acquisition on the OPAC.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.14&r2=1.1.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23.2.9&r2=1.23.2.10

Patches:
Index: koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl	30 Jan 2007 14:14:14 -0000	1.1.2.14
+++ koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl	5 Feb 2007 18:33:30 -0000	1.1.2.15
@@ -41,6 +41,13 @@
     <!-- TMPL_IF name="OpacCloud" -->
         <li>Dig into <a href="/cgi-bin/koha/opac-tags_subject.pl">tag cloud</a></li>
     <!-- /TMPL_IF -->
+        <li>
+            <form name="recent-acqui" action="/cgi-bin/koha/opac-main.pl" method="POST">
+                <label for="recentacqui">Get the last</label>
+                <input id="recentacqui" type="text" name="recentacqui" value="30" size="3"/>
+                acquisitions
+                <input type="submit" value=" OK " />
+        </li>
     </ul>
 </div>
 
@@ -62,4 +69,77 @@
 </div>
 <!-- /TMPL_IF -->
 
+<!-- TMPL_IF NAME="recentacquiloop"-->
+    <div class="searchresults">
+        <table>
+        <tr>
+            <th>
+                Title
+            </th>
+            <th>
+                Author
+            </th>
+            <th>
+                copyright
+            </th>
+            <th>
+                publication year
+            </th>
+            <th>
+                Date
+            </th>
+        </tr>
+        <!-- TMPL_LOOP NAME="recentacquiloop" -->
+        <tr>
+            <td>
+                <p>
+                    <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+                    <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- TMPL_ELSE -->
+                    <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+                    <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- TMPL_ELSE -->
+                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- /TMPL_IF -->
+                    <!-- /TMPL_IF -->
+                </p>
+            </td>
+            <td>
+                <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+                    <!-- TMPL_VAR NAME="author" -->
+                </a>
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="copyrightdate" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publicationyear" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="timestamp" -->
+            </td>
+        </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+     </div>
+<!-- /TMPL_IF -->
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac/opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.23.2.9
retrieving revision 1.23.2.10
diff -u -b -r1.23.2.9 -r1.23.2.10
--- opac/opac-main.pl	10 Jan 2007 10:52:58 -0000	1.23.2.9
+++ opac/opac-main.pl	5 Feb 2007 18:33:30 -0000	1.23.2.10
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-main.pl,v 1.23.2.9 2007/01/10 10:52:58 toins Exp $
+# $Id: opac-main.pl,v 1.23.2.10 2007/02/05 18:33:30 toins Exp $
 
 use strict;
 require Exporter;
@@ -25,12 +25,15 @@
 use C4::BookShelves;
 use C4::Koha;   # GetLanguages
 use C4::Branch; # GetBranches
-use C4::Members;
+use C4::Members;        # GetMember
 use C4::NewsChannels;  # get_opac_news
+use C4::Acquisition;    # GetRecentAcqui
 
 my $input = new CGI;
 my $dbh   = C4::Context->dbh;
 
+my $limit = $input->param('recentacqui');
+
 my @branches;
 my @select_branch;
 my %select_branches;
@@ -57,6 +60,14 @@
     }
 );
 
+if($limit) {
+    my $recentacquiloop = GetRecentAcqui($limit);
+    warn Data::Dumper::Dumper($recentacquiloop);
+    $template->param(
+        recentacquiloop => $recentacquiloop,
+    );
+}
+
 my $borrower = GetMember( '', $borrowernumber );
 my @languages;
 my $counter = 0;




From alaurin at ouestprovence.fr  Tue Feb  6 15:51:31 2007
From: alaurin at ouestprovence.fr (LAURIN arnaud)
Date: Tue, 06 Feb 2007 14:51:31 +0000
Subject: [Koha-cvs] koha/C4/Circulation Circ2.pm [rel_3_0]
Message-ID: <E1HERfP-0004l4-VK@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	07/02/06 14:51:31

Modified files:
	C4/Circulation : Circ2.pm 

Log message:
	Adding a new security issuing process, now, we checking if we have a transfert non finished for the item issuing, if we have one, we finish the brantranfert line, and adding a comment in this line to trace it latter (maybe a new function in stats ...)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.37&r2=1.114.2.38

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.37
retrieving revision 1.114.2.38
diff -u -b -r1.114.2.37 -r1.114.2.38
--- Circ2.pm	5 Feb 2007 13:47:37 -0000	1.114.2.37
+++ Circ2.pm	6 Feb 2007 14:51:31 -0000	1.114.2.38
@@ -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: Circ2.pm,v 1.114.2.37 2007/02/05 13:47:37 alaurin Exp $
+# $Id: Circ2.pm,v 1.114.2.38 2007/02/06 14:51:31 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -41,7 +41,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.37 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.38 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1308,6 +1308,27 @@
                 }
             }
         }
+# END OF THE RESTYPE WORK
+
+# Starting process for transfer job (checking transfert and validate it if we have one)
+
+	my ($datesent) = get_transfert_infos($iteminformation->{'itemnumber'});
+	
+	if ($datesent) {
+# 	updating line of branchtranfert to finish it, and changing the to branch value, implement a comment for lisibility of this case (maybe for stats ....)
+	my $sth =
+          	$dbh->prepare(
+			"update branchtransfers set datearrived = now(),
+			tobranch = ?,
+			comments = 'Forced branchtransfert'
+			 where
+			 itemnumber= ? AND datearrived IS NULL"
+          	);
+        	$sth->execute(C4::Context->userenv->{'branch'},$iteminformation->{'itemnumber'});
+        	$sth->finish;
+	}
+	
+# Ending process for transfert check
 
         # Record in the database the fact that the book was issued.
         my $sth =




From alaurin at ouestprovence.fr  Tue Feb  6 16:10:25 2007
From: alaurin at ouestprovence.fr (LAURIN arnaud)
Date: Tue, 06 Feb 2007 15:10:25 +0000
Subject: [Koha-cvs] koha/C4/Circulation Circ2.pm [rel_3_0]
Message-ID: <E1HERxh-0005Xl-58@savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	07/02/06 15:10:25

Modified files:
	C4/Circulation : Circ2.pm 

Log message:
	new criteria filter for getoverduesForBranch process, now we consider we don't show anymore line if the document date_due is not over (new case if the document is issuing to the same borrower, but without prologation ...)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114