From finlayt at users.sourceforge.net  Fri Aug  9 06:03:46 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:03:46 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.34,1.35
Message-ID: <E17d106-00082w-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv30707

Modified Files:
	circulation.pl 
Log Message:

fixed up the todays issues and previous issues tables so that they are both listed in reverse order by issue date.



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** circulation.pl	24 Jul 2002 05:11:07 -0000	1.34
--- circulation.pl	9 Aug 2002 04:03:43 -0000	1.35
***************
*** 44,48 ****
  
  my @datearr = localtime(time());
! my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
  #warn $todaysdate;
  
--- 44,50 ----
  
  my @datearr = localtime(time());
! my $tday = localtime(time());
! warn "today: $tday \n";
! my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
  #warn $todaysdate;
  
***************
*** 367,381 ****
  my $previssues='';
  if ($borrower) {
      my $issueslist = getissues($borrower);
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $it (sort keys %$issueslist) {
! 	my $dd = $issueslist->{$it}->{'date_due'};
  	my $issuedate = $issueslist->{$it}->{'timestamp'};
  	$issuedate = substr($issuedate, 0, 8);
! 
! 	my $bookissue = $issueslist->{$it};
! 	my $bgcolor='';
! 	my $datedue = $bookissue->{'date_due'};
  	#convert to nz style dates
  	#this should be set with some kinda config variable	    
--- 369,389 ----
  my $previssues='';
  if ($borrower) {
+     my @todaysissues;
+     my @previousissues;
      my $issueslist = getissues($borrower);
!     foreach my $it (keys %$issueslist) {
  	my $issuedate = $issueslist->{$it}->{'timestamp'};
  	$issuedate = substr($issuedate, 0, 8);
! 	if ($todaysdate == $issuedate) {
! 	    push @todaysissues, $issueslist->{$it};
! 	} else {
! 	    push @previousissues, $issueslist->{$it};
! 	}
!     }
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
  	#this should be set with some kinda config variable	    
***************
*** 386,410 ****
  	    $dd="<font color=red>$dd</font>\n";
  	}
! 	if ($todaysdate == $issuedate) {
! 	    ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	    $todaysissues .=<< "EOF";
  <tr><td bgcolor=$tcolor align=center>$dd</td>
  <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$bookissue->{'title'}</td>
! <td bgcolor=$tcolor>$bookissue->{'author'}</td>
! <td bgcolor=$tcolor align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>
! EOF
!         } else {
! 	    ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	    $previssues .= << "EOF";
  <tr><td bgcolor=$pcolor align=center>$dd</td>
  <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$bookissue->{'title'}</td>
! <td bgcolor=$pcolor>$bookissue->{'author'}</td>
! <td bgcolor=$pcolor align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>
  EOF
- 	}
      }
  }
--- 394,427 ----
  	    $dd="<font color=red>$dd</font>\n";
  	}
! 	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	$todaysissues .=<< "EOF";
  <tr><td bgcolor=$tcolor align=center>$dd</td>
  <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$book->{'title'}</td>
! <td bgcolor=$tcolor>$book->{'author'}</td>
! <td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
! EOF
!     } 
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @previousissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
! 	#convert to nz style dates
! 	#this should be set with some kinda config variable	    
! 	my @tempdate=split(/-/,$dd);
! 	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
!      	$datedue=~s/-//g;
! 	if ($datedue < $todaysdate) {
! 	    $dd="<font color=red>$dd</font>\n";
! 	}
! 	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	$previssues .= << "EOF";
  <tr><td bgcolor=$pcolor align=center>$dd</td>
  <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$book->{'title'}</td>
! <td bgcolor=$pcolor>$book->{'author'}</td>
! <td bgcolor=$pcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
  EOF
      }
  }




From finlayt at users.sourceforge.net  Fri Aug  9 06:14:59 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:14:59 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.35,1.36
Message-ID: <E17d1Ax-0000KE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1091

Modified Files:
	circulation.pl 
Log Message:

changed the previous issues to be listed in order of due date



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** circulation.pl	9 Aug 2002 04:03:43 -0000	1.35
--- circulation.pl	9 Aug 2002 04:14:56 -0000	1.36
***************
*** 404,408 ****
  EOF
      } 
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @previousissues){
  	my $dd = $book->{'date_due'};
  	my $datedue = $book->{'date_due'};
--- 404,408 ----
  EOF
      } 
!     foreach my $book (sort {$a->{'due_date'} <=> $b->{'due_date'}} @previousissues){
  	my $dd = $book->{'date_due'};
  	my $datedue = $book->{'date_due'};




From finlayt at users.sourceforge.net  Fri Aug  9 06:33:04 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:33:04 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.7,1.8
Message-ID: <E17d1SS-0001Mp-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv5004

Modified Files:
	request.pl 
Log Message:

I have changed the branch options to only include the Issueing branches. Also if no branch is set it Defaults to Levin.



Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.pl	31 Jul 2002 04:27:57 -0000	1.7
--- request.pl	9 Aug 2002 04:33:01 -0000	1.8
***************
*** 35,41 ****
  # get branch information
  my $branch = $input->cookie('branch');
  my $branches = getbranches();
- 
- 
  my $branchoptions = branchoptions($branch);
  
--- 35,40 ----
  # get branch information
  my $branch = $input->cookie('branch');
+ ($branch) || ($branch = 'L');
  my $branches = getbranches();
  my $branchoptions = branchoptions($branch);
  
***************
*** 155,159 ****
      my $out = "";
      foreach my $br (keys %$branches) {
! 	(next) unless $branches->{$br}->{'CU'};
  	my $selected = "";
  	if ($br eq $selbr) {
--- 154,158 ----
      my $out = "";
      foreach my $br (keys %$branches) {
! 	(next) unless $branches->{$br}->{'IS'};
  	my $selected = "";
  	if ($br eq $selbr) {




From tonnesen at users.sourceforge.net  Wed Aug 14 01:04:10 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Tue, 13 Aug 2002 16:04:10 -0700
Subject: [Koha-cvs] CVS: koha addcopyrightstatements.pl,NONE,1.1.2.1
Message-ID: <E17ekhu-0006GV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv23985

Added Files:
      Tag: rel-1-2
	addcopyrightstatements.pl 
Log Message:
Little script to add a copyright statement to all .pl and .pm files


--- NEW FILE ---
#!/usr/bin/perl
#
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

my $copyrightstatement=qq|
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

|;

open (PL, "find -name '*.pl' -o -name '*.pm'|");
while (<PL>) {
    my $filename=$_;
    chomp $filename;
    my $holder='';
    my $newversion='';
    open (IN, "$filename");
    my $begin='';
    my $end='';
    my $alreaddone=0;
    while (<IN>) {
	if ((/^\s*#/ || /^\s*$/ || /^\s*package/) && $end eq '') {
	    $begin.=$_;
	} else {
	    $end.=$_;
	}
	if (/^\s*#\s*Copyright/) {
	    print "$filename already has a copyright statement\n";
	    $alreadydone=1;
	}
    }
    close IN;
    unless ($alreadydone) {
	open (OUT, ">$filename");
	print OUT "$begin$copyrightstatement$end";
	close OUT;
    }
}




From finlayt at users.sourceforge.net  Wed Aug 14 07:35:55 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 13 Aug 2002 22:35:55 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.11,1.12
Message-ID: <E17eqp1-0005Xm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv20936/circ

Modified Files:
	returns.pl 
Log Message:

all items are listed in the returned items list, regardless of whether they were issued or not.
Changed some messageing stuff as well, but will be back to fix that up some more.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** returns.pl	26 Jul 2002 02:27:16 -0000	1.11
--- returns.pl	14 Aug 2002 05:35:53 -0000	1.12
***************
*** 107,117 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
      if ($returned) {
- 	$returneditems{0} = $barcode;
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
- 	$ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
      }
  }
--- 107,122 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
+     $returneditems{0} = $barcode;
+     $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
+     } else {
+ 	$riborrowernumber{0} = 0;
+ 	$riduedate{0} = 0;
+ 	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
+ 	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
***************
*** 207,211 ****
  
  BORROWER:
! $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 212,216 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
***************
*** 216,224 ****
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  EOF
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
! for $name ($number).
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
--- 221,230 ----
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  EOF
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
! for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
***************
*** 249,252 ****
--- 255,259 ----
  # collect the messages and put into message table....
  foreach my $code (keys %$messages) {
+     warn $code;
      if ($code eq 'BadBarcode'){
  	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
***************
*** 259,262 ****
--- 266,272 ----
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
+     if ($code eq 'wthdrawm'){
+ 	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
+     }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
  	if ($messages->{'IsPermanent'} ne $branch) {
***************
*** 345,351 ****
  <b>Flags</b></td></tr>
  $flaginfotext 
- </table>
  EOF
      }
  }
  
--- 355,361 ----
  <b>Flags</b></td></tr>
  $flaginfotext 
  EOF
      }
+     $borrowertable .= "</table>";
  }
  
***************
*** 366,382 ****
  	my $barcode = $returneditems{$_};
  	my $duedate = $riduedate{$_};
! 	my @datearr = localtime(time());
! 	###
! 	# convert to nz date format
! 	my @tempdate = split(/-/,$duedate);
! 	my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
! 	####
! 	my $todaysdate 
! 	    = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
! 	my $overduetext = "$duedatenz";
! 	($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
! 	($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
! 	my $borrowernumber = $riborrowernumber{$_};
! 	my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
  	$returneditemstable .= << "EOF";
--- 376,399 ----
  	my $barcode = $returneditems{$_};
  	my $duedate = $riduedate{$_};
! 	my $overduetext;
! 	if ($duedate) {
! 	    my @tempdate = split ( /-/ , $duedate ) ;
!             my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
!             my @datearr = localtime(time());
!             my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
! 	    $overduetext = "$duedatenz";
! 	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
! 	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
!         } else {
!             $overduetext = "Not on loan.";
! 	}
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
! 	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
! 	    $borrowerinfo = "Not on loan.";
! 	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
  	$returneditemstable .= << "EOF";
***************
*** 388,392 ****
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>
  EOF
      } else {
--- 405,409 ----
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! $borrowerinfo</td></tr>
  EOF
      } else {




From finlayt at users.sourceforge.net  Wed Aug 14 07:37:09 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 13 Aug 2002 22:37:09 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.30,1.31
Message-ID: <E17eqqD-0005eK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv21418/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

added a check in the returnbook subroutine that checks to see if a book has been cancelled: i.e. that the wthdrawn field has been set to 1.


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** Circ2.pm	2 Jul 2002 23:31:33 -0000	1.30
--- Circ2.pm	14 Aug 2002 05:37:07 -0000	1.31
***************
*** 500,503 ****
--- 500,508 ----
  	$messages->{'IsPermanent'} = $hbr;
      }
+ # check that the book has been cancelled
+     if ($iteminformation->{'wthdrawn'}) {
+ 	$messages->{'wthdrawn'} = 1;
+ 	$doreturn = 0;
+     }
  # update issues, thereby returning book (should push this out into another subroutine
      my ($borrower) = getpatroninformation(\%env, $currentborrower, 0);




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/C4/Interface AccountsCDK.pm,1.1.1.1,1.2 BorrowerCDK.pm,1.1.1.1,1.2 FlagsCDK.pm,1.1.1.1,1.2 RenewalsCDK.pm,1.1.1.1,1.2 ReserveentCDK.pm,1.1.1.1,1.2
Message-ID: <E17f2da-0002MY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Interface
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4/Interface

Modified Files:
	AccountsCDK.pm BorrowerCDK.pm FlagsCDK.pm RenewalsCDK.pm 
	ReserveentCDK.pm 
Log Message:
Added copyright statement to all .pl and .pm files


Index: AccountsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/AccountsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AccountsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- AccountsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: BorrowerCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/BorrowerCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** BorrowerCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- BorrowerCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: FlagsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/FlagsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FlagsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- FlagsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Interface::FlagsCDK; #asummes C4/Interface/FlagsCDK
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: RenewalsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/RenewalsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** RenewalsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- RenewalsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Cdk;

Index: ReserveentCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/ReserveentCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ReserveentCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- ReserveentCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/acqui acquire.pl,1.4,1.5 addorder.pl,1.9,1.10 basket.pl,1.4,1.5 finishreceive.pl,1.6,1.7 modorders.pl,1.3,1.4 newbasket.pl,1.4,1.5 newbasket2.pl,1.4,1.5 newbiblio.pl,1.6,1.7 order.pl,1.3,1.4 receive.pl,1.4,1.5 recieveorder.pl,1.3,1.4 supplier.pl,1.3,1.4 updatesupplier.pl,1.3,1.4
Message-ID: <E17f2da-0002Mv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv8581/acqui

Modified Files:
	acquire.pl addorder.pl basket.pl finishreceive.pl modorders.pl 
	newbasket.pl newbasket2.pl newbiblio.pl order.pl receive.pl 
	recieveorder.pl supplier.pl updatesupplier.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acquire.pl	4 Jul 2002 15:53:02 -0000	1.4
--- acquire.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** addorder.pl	4 Jul 2002 15:53:02 -0000	1.9
--- addorder.pl	14 Aug 2002 18:12:52 -0000	1.10
***************
*** 4,7 ****
--- 4,25 ----
  #written 29/2/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.pl	4 Jul 2002 15:53:02 -0000	1.4
--- basket.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** finishreceive.pl	4 Jul 2002 15:53:02 -0000	1.6
--- finishreceive.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 4,7 ****
--- 4,25 ----
  #written 1/3/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Output;
  use C4::Catalogue;

Index: modorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/modorders.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modorders.pl	4 Jul 2002 15:53:02 -0000	1.3
--- modorders.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written 29/2/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: newbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket.pl	4 Jul 2002 15:53:02 -0000	1.4
--- newbasket.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket2.pl	4 Jul 2002 15:53:02 -0000	1.4
--- newbasket2.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 3,6 ****
--- 3,24 ----
  #now script to do searching for acquisitions
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbiblio.pl	4 Jul 2002 15:53:02 -0000	1.6
--- newbiblio.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** order.pl	4 Jul 2002 15:53:02 -0000	1.3
--- order.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 23/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** receive.pl	4 Jul 2002 15:53:02 -0000	1.4
--- receive.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** recieveorder.pl	4 Jul 2002 15:53:02 -0000	1.3
--- recieveorder.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** supplier.pl	4 Jul 2002 15:53:02 -0000	1.3
--- supplier.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatesupplier.pl	4 Jul 2002 15:53:02 -0000	1.3
--- updatesupplier.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 23/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Borrissues.pm,1.1.1.1,1.2 Borrower.pm,1.1.1.1,1.2 Circ2.pm,1.31,1.32 Fines.pm,1.3,1.4 Issues.pm,1.1.1.1,1.2 Main.pm,1.2,1.3 Renewals.pm,1.1.1.1,1.2 Renewals2.pm,1.4,1.5 Returns.pm,1.1.1.1,1.2
Message-ID: <E17f2da-0002MQ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4/Circulation

Modified Files:
	Borrissues.pm Borrower.pm Circ2.pm Fines.pm Issues.pm Main.pm 
	Renewals.pm Renewals2.pm Returns.pm 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Borrissues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrissues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Borrissues.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Borrissues.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Borrower.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrower.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Borrower.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Borrower.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** Circ2.pm	14 Aug 2002 05:37:07 -0000	1.31
--- Circ2.pm	14 Aug 2002 18:12:52 -0000	1.32
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  # use warnings;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Fines.pm	17 Mar 2002 02:58:00 -0000	1.3
--- Fines.pm	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Issues.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Issues.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Main.pm	5 Jan 2001 17:39:25 -0000	1.2
--- Main.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Renewals.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Renewals.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 7/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Renewals2.pm	24 Jun 2002 21:54:44 -0000	1.4
--- Renewals2.pm	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 8,11 ****
--- 8,29 ----
  #need to update stats with renewals
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Returns.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Returns.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/admin aqbookfund.pl,1.3,1.4 aqbudget.pl,1.4,1.5 branches.pl,1.2,1.3 categorie.pl,1.2,1.3 categoryitem.pl,1.2,1.3 currency.pl,1.3,1.4 itemtypes.pl,1.3,1.4 marctagstructure.pl,1.2,1.3 printers.pl,1.4,1.5 stopwords.pl,1.4,1.5 systempreferences.pl,1.4,1.5
Message-ID: <E17f2db-0002NX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8581/admin

Modified Files:
	aqbookfund.pl aqbudget.pl branches.pl categorie.pl 
	categoryitem.pl currency.pl itemtypes.pl marctagstructure.pl 
	printers.pl stopwords.pl systempreferences.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** aqbookfund.pl	2 Jul 2002 21:46:52 -0000	1.3
--- aqbookfund.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** aqbudget.pl	25 Jun 2002 11:05:45 -0000	1.4
--- aqbudget.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branches.pl	2 May 2002 00:08:53 -0000	1.2
--- branches.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  # Reorganising this branches admin page.....
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categorie.pl	24 Jun 2002 18:40:56 -0000	1.2
--- categorie.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 19,22 ****
--- 19,40 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: categoryitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categoryitem.pl	24 Jun 2002 18:40:56 -0000	1.2
--- categoryitem.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** currency.pl	2 Jul 2002 21:46:53 -0000	1.3
--- currency.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemtypes.pl	2 Jul 2002 21:46:53 -0000	1.3
--- itemtypes.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marctagstructure.pl	8 Jul 2002 16:45:57 -0000	1.2
--- marctagstructure.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** printers.pl	2 Jul 2002 21:46:53 -0000	1.4
--- printers.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stopwords.pl	2 Jul 2002 21:46:53 -0000	1.4
--- stopwords.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** systempreferences.pl	4 Jul 2002 12:46:42 -0000	1.4
--- systempreferences.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.1,1.2 addbooks.pl,1.10,1.11 addbookslccn.pl,1.6,1.7 additem.pl,1.5,1.6 bulkmarcimport.pl,1.6,1.7 isbnsearch.pl,1.3,1.4 keywordsearch.pl,1.4,1.5 marcimport.pl,1.12,1.13 savebiblio.pl,1.5,1.6 saveitem.pl,1.5,1.6 viewmarc.pl,1.3,1.4 websitesearch.pl,1.3,1.4
Message-ID: <E17f2db-0002NP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv8581/acqui.simple

Modified Files:
	addbiblio.pl addbooks.pl addbookslccn.pl additem.pl 
	bulkmarcimport.pl isbnsearch.pl keywordsearch.pl marcimport.pl 
	savebiblio.pl saveitem.pl viewmarc.pl websitesearch.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblio.pl	29 Apr 2002 05:29:02 -0000	1.1
--- addbiblio.pl	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** addbooks.pl	24 Jul 2002 16:24:20 -0000	1.10
--- addbooks.pl	14 Aug 2002 18:12:52 -0000	1.11
***************
*** 14,17 ****
--- 14,35 ----
  # Add info on biblioitems and items already entered as you enter new ones
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: addbookslccn.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbookslccn.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** addbookslccn.pl	24 Jul 2002 16:24:20 -0000	1.6
--- addbookslccn.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 14,17 ****
--- 14,35 ----
  # Add info on biblioitems and items already entered as you enter new ones
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** additem.pl	24 Jul 2002 16:24:20 -0000	1.5
--- additem.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: bulkmarcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/bulkmarcimport.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bulkmarcimport.pl	24 Jul 2002 16:24:20 -0000	1.6
--- bulkmarcimport.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 12,15 ****
--- 12,33 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $file=$ARGV[0];
  

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isbnsearch.pl	24 Jul 2002 16:24:20 -0000	1.3
--- isbnsearch.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: keywordsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/keywordsearch.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** keywordsearch.pl	24 Jul 2002 16:24:20 -0000	1.4
--- keywordsearch.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marcimport.pl	24 Jul 2002 16:24:20 -0000	1.12
--- marcimport.pl	14 Aug 2002 18:12:52 -0000	1.13
***************
*** 10,13 ****
--- 10,31 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 988,991 ****
--- 1006,1012 ----
  #---------------
  # $Log$
+ # Revision 1.13  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.12  2002/07/24 16:24:20  tipaul
  # Now, the acqui.simple system...

Index: savebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** savebiblio.pl	24 Jul 2002 16:24:20 -0000	1.5
--- savebiblio.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: saveitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** saveitem.pl	24 Jul 2002 16:24:20 -0000	1.5
--- saveitem.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/viewmarc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** viewmarc.pl	24 Jul 2002 16:24:20 -0000	1.3
--- viewmarc.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $starttime=gettime();
  

Index: websitesearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/websitesearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** websitesearch.pl	24 Jul 2002 16:24:20 -0000	1.3
--- websitesearch.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.11,1.12 circulation.pl,1.36,1.37 returns.pl,1.12,1.13 selectbranchprinter.pl,1.2,1.3
Message-ID: <E17f2db-0002Nj-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv8581/circ

Modified Files:
	branchtransfers.pl circulation.pl returns.pl 
	selectbranchprinter.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** branchtransfers.pl	23 Jul 2002 01:28:42 -0000	1.11
--- branchtransfers.pl	14 Aug 2002 18:12:53 -0000	1.12
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute branch transfers of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** circulation.pl	9 Aug 2002 04:14:56 -0000	1.36
--- circulation.pl	14 Aug 2002 18:12:53 -0000	1.37
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute issuing of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** returns.pl	14 Aug 2002 05:35:53 -0000	1.12
--- returns.pl	14 Aug 2002 18:12:53 -0000	1.13
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute returns of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** selectbranchprinter.pl	18 May 2002 05:37:28 -0000	1.2
--- selectbranchprinter.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI qw/:standard/;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/sec writeoff.pl,1.3,1.4
Message-ID: <E17f2dc-0002OX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/sec
In directory usw-pr-cvs1:/tmp/cvs-serv8581/sec

Modified Files:
	writeoff.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: writeoff.pl
===================================================================
RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** writeoff.pl	2 Apr 2001 22:51:26 -0000	1.3
--- writeoff.pl	14 Aug 2002 18:12:54 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #script to write off accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/html-template Search.pm,1.2,1.3 detail.pl,1.3,1.4 moredetail.pl,1.1,1.2 search.pl,1.16,1.17
Message-ID: <E17f2db-0002Nv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/html-template
In directory usw-pr-cvs1:/tmp/cvs-serv8581/html-template

Modified Files:
	Search.pm detail.pl moredetail.pl search.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/html-template/Search.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Search.pm	10 May 2002 22:34:36 -0000	1.2
--- Search.pm	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/detail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.pl	31 Jul 2002 09:17:34 -0000	1.3
--- detail.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/moredetail.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** moredetail.pl	15 May 2002 04:54:07 -0000	1.1
--- moredetail.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** search.pl	19 May 2002 21:27:12 -0000	1.16
--- search.pl	14 Aug 2002 18:12:53 -0000	1.17
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/maint catmaintain.pl,1.3,1.4 shiftbib.pl,1.1,1.2
Message-ID: <E17f2db-0002O1-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/maint
In directory usw-pr-cvs1:/tmp/cvs-serv8581/maint

Modified Files:
	catmaintain.pl shiftbib.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: catmaintain.pl
===================================================================
RCS file: /cvsroot/koha/koha/maint/catmaintain.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** catmaintain.pl	26 Feb 2002 09:31:15 -0000	1.3
--- catmaintain.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  # by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: shiftbib.pl
===================================================================
RCS file: /cvsroot/koha/koha/maint/shiftbib.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** shiftbib.pl	15 Mar 2001 10:11:33 -0000	1.1
--- shiftbib.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/telnet borrwraper.pl,1.1.1.1,1.2 doreturns.pl,1.1.1.1,1.2 issuewrapper.pl,1.1.1.1,1.2 returnswrapper.pl,1.1.1.1,1.2 startint.pl,1.1.1.1,1.2
Message-ID: <E17f2dc-0002Or-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/telnet
In directory usw-pr-cvs1:/tmp/cvs-serv8581/telnet

Modified Files:
	borrwraper.pl doreturns.pl issuewrapper.pl returnswrapper.pl 
	startint.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: borrwraper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/borrwraper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** borrwraper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- borrwraper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use DBI;
  use C4::Database;

Index: doreturns.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/doreturns.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** doreturns.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- doreturns.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use DBI;
  use C4::Database;

Index: issuewrapper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/issuewrapper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** issuewrapper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- issuewrapper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}");
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $done = "Issues";                                                                
  my $i=0;

Index: returnswrapper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/returnswrapper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** returnswrapper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- returnswrapper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $done = "returns";                                                                
  my $i=0;

Index: startint.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/startint.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** startint.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- startint.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use C4::Security;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/translator translator.pl,1.2,1.3
Message-ID: <E17f2dc-0002Ox-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/translator
In directory usw-pr-cvs1:/tmp/cvs-serv8581/translator

Modified Files:
	translator.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: translator.pl
===================================================================
RCS file: /cvsroot/koha/koha/translator/translator.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** translator.pl	27 Jun 2001 21:53:05 -0000	1.2
--- translator.pl	14 Aug 2002 18:12:54 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/marc File.pm,1.1,1.2 MARCdetail.pl,1.1,1.2 USMARC.pm,1.1,1.2 fill_usmarc.pl,1.2,1.3 viewmarc.pl,1.3,1.4
Message-ID: <E17f2dc-0002Om-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv8581/marc

Modified Files:
	File.pm MARCdetail.pl USMARC.pm fill_usmarc.pl viewmarc.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: File.pm
===================================================================
RCS file: /cvsroot/koha/koha/marc/File.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** File.pm	24 Jul 2002 15:52:53 -0000	1.1
--- File.pm	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package MARC::File;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  =head1 NAME
  

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/MARCdetail.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MARCdetail.pl	25 Jul 2002 09:55:51 -0000	1.1
--- MARCdetail.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: USMARC.pm
===================================================================
RCS file: /cvsroot/koha/koha/marc/USMARC.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** USMARC.pm	24 Jul 2002 15:52:53 -0000	1.1
--- USMARC.pm	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package MARC::File::USMARC;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  =head1 NAME
  

Index: fill_usmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/fill_usmarc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fill_usmarc.pl	24 Jul 2002 15:52:53 -0000	1.2
--- fill_usmarc.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #---- this simple script fills the tables with US MARC
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/viewmarc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** viewmarc.pl	20 Jun 2002 17:33:17 -0000	1.3
--- viewmarc.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $starttime=gettime();
  




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/updater thesaurus_create.pl,1.1,1.2 updatedatabase2.pl,1.3,1.4
Message-ID: <E17f2dc-0002P9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory usw-pr-cvs1:/tmp/cvs-serv8581/updater

Modified Files:
	thesaurus_create.pl updatedatabase2.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: thesaurus_create.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/thesaurus_create.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_create.pl	14 May 2002 11:26:10 -0000	1.1
--- thesaurus_create.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  # This script generates and fill the thesaurus table

Index: updatedatabase2.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase2.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatedatabase2.pl	24 Jun 2002 15:00:13 -0000	1.3
--- updatedatabase2.pl	14 Aug 2002 18:12:54 -0000	1.4
***************
*** 14,17 ****
--- 14,35 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use C4::Catalogue;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/misc fines2.pl,1.5,1.6 fixborrower.pl,1.2,1.3 fixcatalog.pl,1.1.1.1,1.2 fixorders.pl,1.1.1.1,1.2 fixrefs.pl,1.1.1.1,1.2 makebaskets.pl,1.1.1.1,1.2 makeformats.pl,1.1.1.1,1.2 tidyaccounts.pl,1.1.1.1,1.2
Message-ID: <E17f2dc-0002Ob-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory usw-pr-cvs1:/tmp/cvs-serv8581/misc

Modified Files:
	fines2.pl fixborrower.pl fixcatalog.pl fixorders.pl fixrefs.pl 
	makebaskets.pl makeformats.pl tidyaccounts.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: fines2.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fines2.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fines2.pl	10 Apr 2002 00:02:59 -0000	1.5
--- fines2.pl	14 Aug 2002 18:12:54 -0000	1.6
***************
*** 9,12 ****
--- 9,30 ----
  #  This script is meant to be run nightly out of cron.
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use C4::Search;

Index: fixborrower.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixborrower.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fixborrower.pl	9 Apr 2002 22:08:15 -0000	1.2
--- fixborrower.pl	14 Aug 2002 18:12:54 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixcatalog.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixcatalog.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixcatalog.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixcatalog.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixorders.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixorders.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixorders.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixrefs.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixrefs.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixrefs.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixrefs.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: makebaskets.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/makebaskets.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** makebaskets.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- makebaskets.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: makeformats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/makeformats.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** makeformats.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- makeformats.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: tidyaccounts.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/tidyaccounts.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** tidyaccounts.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- tidyaccounts.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:13:24 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:13:24 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts.pm,1.2,1.3 Accounts2.pm,1.11,1.12 Acquisitions.pm,1.22,1.23 Auth.pm,1.9,1.10 Biblio.pm,1.6,1.7 BookShelves.pm,1.3,1.4 Catalogue.pm,1.20,1.21 Circmain.pm,1.2,1.3 Circulation.pm,1.2,1.3 Database.pm,1.5,1.6 Format.pm,1.2,1.3 Groups.pm,1.2,1.3 Input.pm,1.3,1.4 InterfaceCDK.pm,1.2,1.3 Koha.pm,1.5,1.6 Maintainance.pm,1.5,1.6 Output.pm,1.14,1.15 Print.pm,1.7,1.8 Reserves.pm,1.1.1.1,1.2 Reserves2.pm,1.12,1.13 Scan.pm,1.2,1.3 Search.pm,1.32,1.33 Security.pm,1.2,1.3 SimpleMarc.pm,1.2,1.3 Stats.pm,1.6,1.7 Stock.pm,1.2,1.3 Z3950.pm,1.2,1.3 test.pl,1.3,1.4
Message-ID: <E17f2e4-0002Vy-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4

Modified Files:
	Accounts.pm Accounts2.pm Acquisitions.pm Auth.pm Biblio.pm 
	BookShelves.pm Catalogue.pm Circmain.pm Circulation.pm 
	Database.pm Format.pm Groups.pm Input.pm InterfaceCDK.pm 
	Koha.pm Maintainance.pm Output.pm Print.pm Reserves.pm 
	Reserves2.pm Scan.pm Search.pm Security.pm SimpleMarc.pm 
	Stats.pm Stock.pm Z3950.pm test.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Accounts.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Accounts.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts; #assumes C4/Accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Accounts2.pm	2 Jul 2002 20:49:44 -0000	1.11
--- Accounts2.pm	14 Aug 2002 18:12:51 -0000	1.12
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts2; #assumes C4/Accounts2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Acquisitions.pm	22 Jul 2002 20:45:47 -0000	1.22
--- Acquisitions.pm	14 Aug 2002 18:12:51 -0000	1.23
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Acquisitions; #assumes C4/Acquisitions.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Auth.pm	11 Jul 2002 05:46:58 -0000	1.9
--- Auth.pm	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Auth;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Digest::MD5 qw(md5_base64);

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Biblio.pm	25 Jul 2002 13:40:31 -0000	1.6
--- Biblio.pm	14 Aug 2002 18:12:51 -0000	1.7
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  # $Log$
+ # Revision 1.7  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.6  2002/07/25 13:40:31  tipaul
  # pod documenting the API.
***************
*** 52,55 ****
--- 55,76 ----
  # in 1.4 version, the translations will be nicer, as we have NOTHING to do in code. Everything has to be done in Biblio.pm ;-)
  
+ 
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
  
  use strict;

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BookShelves.pm	2 Jul 2002 17:48:06 -0000	1.3
--- BookShelves.pm	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 6,9 ****
--- 6,27 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;
***************
*** 134,137 ****
--- 152,158 ----
  #
  # $Log$
+ # Revision 1.4  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.3  2002/07/02 17:48:06  tonnesen
  # Merged in updates from rel-1-2

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Catalogue.pm	4 Jul 2002 15:53:02 -0000	1.20
--- Catalogue.pm	14 Aug 2002 18:12:51 -0000	1.21
***************
*** 10,13 ****
--- 10,31 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Circmain.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Circmain.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Circulation.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Circulation.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Database.pm	24 Jul 2002 16:11:37 -0000	1.5
--- Database.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Format.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Format.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Format; #assumes C4/Format
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Groups.pm	20 Jun 2002 18:04:47 -0000	1.2
--- Groups.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Input.pm	3 Jul 2002 03:18:50 -0000	1.3
--- Input.pm	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Input; #assumes C4/Input
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** InterfaceCDK.pm	20 Jun 2002 18:56:52 -0000	1.2
--- InterfaceCDK.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use strict;

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Koha.pm	20 Jun 2002 18:56:52 -0000	1.5
--- Koha.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Koha;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Maintainance.pm	20 Jun 2002 18:56:52 -0000	1.5
--- Maintainance.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with marking up output
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Output.pm	24 Jul 2002 16:11:37 -0000	1.14
--- Output.pm	14 Aug 2002 18:12:51 -0000	1.15
***************
*** 5,8 ****
--- 5,26 ----
  #set the value of path to be where your html lives
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Print.pm	24 Jul 2002 03:16:21 -0000	1.7
--- Print.pm	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Print; #assumes C4/Print.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Reserves.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Reserves.pm	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Reserves2.pm	26 Jul 2002 01:08:48 -0000	1.12
--- Reserves2.pm	14 Aug 2002 18:12:51 -0000	1.13
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Reserves2; #assumes C4/Reserves2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Scan.pm	20 Jun 2002 18:04:48 -0000	1.2
--- Scan.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Scan; #assumes C4/Scan.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Search.pm	31 Jul 2002 01:50:06 -0000	1.32
--- Search.pm	14 Aug 2002 18:12:51 -0000	1.33
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Search; #assumes C4/Search
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Security.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Security.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Security; #assumes C4/Security
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SimpleMarc.pm	2 Jul 2002 20:30:15 -0000	1.2
--- SimpleMarc.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 448,451 ****
--- 466,472 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.3  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.2  2002/07/02 20:30:15  tonnesen
  # Merged SimpleMarc.pm over from rel-1-2

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Stats.pm	20 Jun 2002 20:43:26 -0000	1.6
--- Stats.pm	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stats; #assumes C4/Stats
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Stock.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Stock.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stock; #assumes C4/Stock.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Z3950.pm	2 Jul 2002 20:31:33 -0000	1.2
--- Z3950.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 190,193 ****
--- 208,214 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.3  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.2  2002/07/02 20:31:33  tonnesen
  # module added from rel-1-2 branch

Index: test.pl
===================================================================
RCS file: /cvsroot/koha/koha/C4/test.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** test.pl	10 Jun 2002 20:49:54 -0000	1.3
--- test.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 1,3 ****
--- 1,21 ----
  package C4::test;
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:52 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:52 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.11,1.1.2.12
Message-ID: <E17f2uy-00058T-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19575

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -r1.1.2.11 -r1.1.2.12
*** Install.pm	27 Jul 2002 07:00:14 -0000	1.1.2.11
--- Install.pm	14 Aug 2002 18:30:50 -0000	1.1.2.12
***************
*** 1,4 ****
--- 1,22 ----
  package Install; #assumes Install.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Borrissues.pm,1.1.1.1,1.1.1.1.2.1 Borrower.pm,1.1.1.1,1.1.1.1.2.1 Circ2.pm,1.21.2.3,1.21.2.4 Fines.pm,1.3,1.3.2.1 Issues.pm,1.1.1.1,1.1.1.1.2.1 Main.pm,1.2,1.2.2.1 Renewals.pm,1.1.1.1,1.1.1.1.2.1 Renewals2.pm,1.2.2.2,1.2.2.3 Returns.pm,1.1.1.1,1.1.1.1.2.1
Message-ID: <E17f2uz-00059K-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Borrissues.pm Borrower.pm Circ2.pm Fines.pm Issues.pm Main.pm 
	Renewals.pm Renewals2.pm Returns.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Borrissues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrissues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Borrissues.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Borrissues.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Borrower.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrower.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Borrower.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Borrower.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -C2 -r1.21.2.3 -r1.21.2.4
*** Circ2.pm	27 Jul 2002 05:30:12 -0000	1.21.2.3
--- Circ2.pm	14 Aug 2002 18:30:50 -0000	1.21.2.4
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** Fines.pm	17 Mar 2002 02:58:00 -0000	1.3
--- Fines.pm	14 Aug 2002 18:30:50 -0000	1.3.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Issues.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Issues.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** Main.pm	5 Jan 2001 17:39:25 -0000	1.2
--- Main.pm	14 Aug 2002 18:30:50 -0000	1.2.2.1
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Renewals.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Renewals.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 7/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** Renewals2.pm	24 Jun 2002 21:54:09 -0000	1.2.2.2
--- Renewals2.pm	14 Aug 2002 18:30:50 -0000	1.2.2.3
***************
*** 8,11 ****
--- 8,29 ----
  #need to update stats with renewals
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Returns.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Returns.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.3,1.3.2.1 circulation.pl,1.23.2.2,1.23.2.3
Message-ID: <E17f2uz-00059S-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv19575/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** branchtransfers.pl	14 Mar 2002 01:51:16 -0000	1.3
--- branchtransfers.pl	14 Aug 2002 18:30:51 -0000	1.3.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute branch transfers of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -r1.23.2.2 -r1.23.2.3
*** circulation.pl	11 Jul 2002 18:05:29 -0000	1.23.2.2
--- circulation.pl	14 Aug 2002 18:30:51 -0000	1.23.2.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI qw/:standard/;
  use C4::Circulation::Circ2;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4/Interface AccountsCDK.pm,1.1.1.1,1.1.1.1.2.1 BorrowerCDK.pm,1.1.1.1,1.1.1.1.2.1 FlagsCDK.pm,1.1.1.1,1.1.1.1.2.1 RenewalsCDK.pm,1.1.1.1,1.1.1.1.2.1 ReserveentCDK.pm,1.1.1.1,1.1.1.1.2.1
Message-ID: <E17f2uz-00059N-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Interface
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4/Interface

Modified Files:
      Tag: rel-1-2
	AccountsCDK.pm BorrowerCDK.pm FlagsCDK.pm RenewalsCDK.pm 
	ReserveentCDK.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: AccountsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/AccountsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** AccountsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- AccountsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: BorrowerCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/BorrowerCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** BorrowerCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- BorrowerCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: FlagsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/FlagsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** FlagsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- FlagsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Interface::FlagsCDK; #asummes C4/Interface/FlagsCDK
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: RenewalsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/RenewalsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** RenewalsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- RenewalsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Cdk;

Index: ReserveentCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/ReserveentCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** ReserveentCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- ReserveentCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts.pm,1.1.1.1.2.1,1.1.1.1.2.2 Accounts2.pm,1.9.2.4,1.9.2.5 Acquisitions.pm,1.5.2.12,1.5.2.13 Auth.pm,1.9.2.7,1.9.2.8 Biblio.pm,1.1.2.4,1.1.2.5 BookShelves.pm,1.2.2.1,1.2.2.2 Catalogue.pm,1.11.2.1,1.11.2.2 Circmain.pm,1.1.1.1.2.2,1.1.1.1.2.3 Circulation.pm,1.1.1.1.2.1,1.1.1.1.2.2 Database.pm,1.2.2.6,1.2.2.7 Format.pm,1.1.1.1.2.2,1.1.1.1.2.3 Groups.pm,1.1.2.1,1.1.2.2 Input.pm,1.1.1.1.2.4,1.1.1.1.2.5 InterfaceCDK.pm,1.1.1.1.2.2,1.1.1.1.2.3 Koha.pm,1.4.2.4,1.4.2.5 Maintainance.pm,1.4.2.1,1.4.2.2 Output.pm,1.6.2.15,1.6.2.16 Print.pm,1.3.2.3,1.3.2.4 Reserves.pm,1.1.1.1,1.1.1.1.2.1 Reserves2.pm,1.5.2.5,1.5.2.6 Scan.pm,1.1.1.1.2.1,1.1.1.1.2.2 Search.pm,1.18.2.6,1.18.2.7 Security.pm,1.1.1.1.2.1,1.1.1.1.2.2 SimpleMarc.pm,1.1.2.4,1.1.2.5 Stats.pm,1.3.2.2,1.3.2.3 Stock.pm,1.1.1.1.2.1,1.1.1.1.2.2 Z3950.pm,1.1.2.5,1.1.2.6
Message-ID: <E17f2uz-00059m-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4

Modified Files:
      Tag: rel-1-2
	Accounts.pm Accounts2.pm Acquisitions.pm Auth.pm Biblio.pm 
	BookShelves.pm Catalogue.pm Circmain.pm Circulation.pm 
	Database.pm Format.pm Groups.pm Input.pm InterfaceCDK.pm 
	Koha.pm Maintainance.pm Output.pm Print.pm Reserves.pm 
	Reserves2.pm Scan.pm Search.pm Security.pm SimpleMarc.pm 
	Stats.pm Stock.pm Z3950.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Accounts.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Accounts.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts; #assumes C4/Accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** Accounts2.pm	24 Jun 2002 16:15:00 -0000	1.9.2.4
--- Accounts2.pm	14 Aug 2002 18:30:50 -0000	1.9.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts2; #assumes C4/Accounts2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -C2 -r1.5.2.12 -r1.5.2.13
*** Acquisitions.pm	24 Jun 2002 16:15:01 -0000	1.5.2.12
--- Acquisitions.pm	14 Aug 2002 18:30:50 -0000	1.5.2.13
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Acquisitions; #assumes C4/Acquisitions.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -C2 -r1.9.2.7 -r1.9.2.8
*** Auth.pm	27 Jul 2002 04:33:57 -0000	1.9.2.7
--- Auth.pm	14 Aug 2002 18:30:50 -0000	1.9.2.8
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Auth;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Digest::MD5 qw(md5_base64);

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** Biblio.pm	26 Jun 2002 22:13:49 -0000	1.1.2.4
--- Biblio.pm	14 Aug 2002 18:30:50 -0000	1.1.2.5
***************
*** 5,8 ****
--- 5,26 ----
  #-----------------
  # General requirements
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 982,985 ****
--- 1000,1006 ----
  #---------------------------------------
  # $Log$
+ # Revision 1.1.2.5  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.4  2002/06/26 22:13:49  tonnesen
  # Fix to allow non-numeric barcodes.

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** BookShelves.pm	26 Jun 2002 20:46:48 -0000	1.2.2.1
--- BookShelves.pm	14 Aug 2002 18:30:50 -0000	1.2.2.2
***************
*** 6,9 ****
--- 6,27 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;
***************
*** 134,137 ****
--- 152,158 ----
  #
  # $Log$
+ # Revision 1.2.2.2  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.2.2.1  2002/06/26 20:46:48  tonnesen
  # Inserting some changes I made locally a while ago.

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** Catalogue.pm	25 Apr 2002 21:59:55 -0000	1.11.2.1
--- Catalogue.pm	14 Aug 2002 18:30:50 -0000	1.11.2.2
***************
*** 10,13 ****
--- 10,31 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** Circmain.pm	20 Jun 2002 18:33:56 -0000	1.1.1.1.2.2
--- Circmain.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Circulation.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Circulation.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -C2 -r1.2.2.6 -r1.2.2.7
*** Database.pm	27 Jul 2002 04:41:30 -0000	1.2.2.6
--- Database.pm	14 Aug 2002 18:30:50 -0000	1.2.2.7
***************
*** 3,6 ****
--- 3,24 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** Format.pm	20 Jun 2002 18:33:56 -0000	1.1.1.1.2.2
--- Format.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Format; #assumes C4/Format
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Groups.pm	25 Apr 2002 21:59:55 -0000	1.1.2.1
--- Groups.pm	14 Aug 2002 18:30:50 -0000	1.1.2.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** Input.pm	5 Jul 2002 04:45:13 -0000	1.1.1.1.2.4
--- Input.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Input; #assumes C4/Input
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** InterfaceCDK.pm	21 Jun 2002 18:26:28 -0000	1.1.1.1.2.2
--- InterfaceCDK.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use strict;

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** Koha.pm	12 Jul 2002 23:58:35 -0000	1.4.2.4
--- Koha.pm	14 Aug 2002 18:30:50 -0000	1.4.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Koha;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** Maintainance.pm	25 Apr 2002 21:59:55 -0000	1.4.2.1
--- Maintainance.pm	14 Aug 2002 18:30:50 -0000	1.4.2.2
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with marking up output
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.6.2.15
retrieving revision 1.6.2.16
diff -C2 -r1.6.2.15 -r1.6.2.16
*** Output.pm	11 Jul 2002 21:06:19 -0000	1.6.2.15
--- Output.pm	14 Aug 2002 18:30:50 -0000	1.6.2.16
***************
*** 7,10 ****
--- 7,28 ----
  #set the value of path to be where your html lives
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** Print.pm	20 Jun 2002 20:42:35 -0000	1.3.2.3
--- Print.pm	14 Aug 2002 18:30:50 -0000	1.3.2.4
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Print; #assumes C4/Print.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Reserves.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Reserves.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** Reserves2.pm	11 Jul 2002 18:05:29 -0000	1.5.2.5
--- Reserves2.pm	14 Aug 2002 18:30:50 -0000	1.5.2.6
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Reserves2; #assumes C4/Reserves2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Scan.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Scan.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Scan; #assumes C4/Scan.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -C2 -r1.18.2.6 -r1.18.2.7
*** Search.pm	11 Jul 2002 18:05:29 -0000	1.18.2.6
--- Search.pm	14 Aug 2002 18:30:50 -0000	1.18.2.7
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Search; #assumes C4/Search
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Security.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Security.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Security; #assumes C4/Security
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** SimpleMarc.pm	28 Jun 2002 14:36:47 -0000	1.1.2.4
--- SimpleMarc.pm	14 Aug 2002 18:30:50 -0000	1.1.2.5
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 448,451 ****
--- 466,472 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.1.2.5  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.4  2002/06/28 14:36:47  amillar
  # Fix broken logic on illustrator vs. add'l author

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** Stats.pm	18 May 2002 10:21:51 -0000	1.3.2.2
--- Stats.pm	14 Aug 2002 18:30:50 -0000	1.3.2.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stats; #assumes C4/Stats
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Stock.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Stock.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stock; #assumes C4/Stock.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** Z3950.pm	29 Jun 2002 17:33:47 -0000	1.1.2.5
--- Z3950.pm	14 Aug 2002 18:30:50 -0000	1.1.2.6
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 190,193 ****
--- 208,214 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.1.2.6  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.5  2002/06/29 17:33:47  amillar
  # Allow DEFAULT as input to addz3950search.




From tonnesen at users.sourceforge.net  Wed Aug 14 20:13:24 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:13:24 -0700
Subject: [Koha-cvs] CVS: koha addwebsite.pl,1.1,1.2 barcodes.pl,1.1,1.2 bookcount.pl,1.1,1.2 boraccount.pl,1.2,1.3 charges.pl,1.1.1.1,1.2 currency.pl,1.2,1.3 delbiblio.pl,1.4,1.5 deletebiblioitem.pl,1.1,1.2 deletemem.pl,1.2,1.3 deletewebsite.pl,1.1,1.2 delitem.pl,1.2,1.3 detail.pl,1.9,1.10 groups.pl,1.1,1.2 imemberentry.pl,1.1.1.1,1.2 insertdata.pl,1.7,1.8 insertidata.pl,1.1.1.1,1.2 insertjdata.pl,1.1.1.1,1.2 installer-lite.pl,1.1,1.2 installer.pl,1.7,1.8 jmemberentry.pl,1.1.1.1,1.2 loadmodules.pl,1.3,1.4 logout.pl,1.2,1.3 mancredit.pl,1.2,1.3 maninvoice.pl,1.2,1.3 member.pl,1.2,1.3 memberentry.pl,1.7,1.8 modbib.pl,1.5,1.6 modbibitem.pl,1.8,1.9 moditem.pl,1.2,1.3 modrequest.pl,1.1.1.1,1.2 modwebsites.pl,1.1,1.2 moredetail.pl,1.8,1.9 moremember.pl,1.13,1.14 newimember.pl,1.1.1.1,1.2 newjmember.pl,1.1.1.1,1.2 newmember.pl,1.1.1.1,1.2 orderbreakdown.pl,1.2,1.3 overdue.pl,1.1,1.2 pay.pl,1.3,1.4 placerequest.pl,1.1.1.1,1.2 readingrec.pl,1.2,1.3 renewscript.pl,1.2,1.3 reports.pl,1.1.1.1,1.2 request.pl,1.8,1.9 reservereport.pl,1.1.1.1,1.2 search.pl,1.9,1.10 shelves.pl,1.7,1.8 showbudget.pl,1.3,1.4 simpleredirect.pl,1.1.1.1,1.2 stats.pl,1.4,1.5 stats2.pl,1.1.1.1,1.2 subjectsearch.pl,1.2,1.3 testKoha.pl,1.5,1.6 thesaurus_popup.pl,1.1,1.2 tidyaccounts.pl,1.1.1.1,1.2 updatebibitem.pl,1.7,1.8 updatebiblio.pl,1.3,1.4 updatecharges.pl,1.1.1.1,1.2 updateitem.pl,1.3,1.4 updatewebsite.pl,1.1,1.2 userpage.pl,1.2,1.3
Message-ID: <E17f2e4-0002VU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv8581

Modified Files:
	addwebsite.pl barcodes.pl bookcount.pl boraccount.pl 
	charges.pl currency.pl delbiblio.pl deletebiblioitem.pl 
	deletemem.pl deletewebsite.pl delitem.pl detail.pl groups.pl 
	imemberentry.pl insertdata.pl insertidata.pl insertjdata.pl 
	installer-lite.pl installer.pl jmemberentry.pl loadmodules.pl 
	logout.pl mancredit.pl maninvoice.pl member.pl memberentry.pl 
	modbib.pl modbibitem.pl moditem.pl modrequest.pl 
	modwebsites.pl moredetail.pl moremember.pl newimember.pl 
	newjmember.pl newmember.pl orderbreakdown.pl overdue.pl pay.pl 
	placerequest.pl readingrec.pl renewscript.pl reports.pl 
	request.pl reservereport.pl search.pl shelves.pl showbudget.pl 
	simpleredirect.pl stats.pl stats2.pl subjectsearch.pl 
	testKoha.pl thesaurus_popup.pl tidyaccounts.pl 
	updatebibitem.pl updatebiblio.pl updatecharges.pl 
	updateitem.pl updatewebsite.pl userpage.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: addwebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/addwebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addwebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- addwebsite.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: barcodes.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes.pl	29 May 2002 21:06:17 -0000	1.1
--- barcodes.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 6,9 ****
--- 6,27 ----
  # Variable Section #
  ####################
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $pretext='T ';
  my $startnumber=1000;

Index: bookcount.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookcount.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bookcount.pl	2 May 2002 00:08:53 -0000	1.1
--- bookcount.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/boraccount.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** boraccount.pl	2 May 2001 21:11:41 -0000	1.2
--- boraccount.pl	14 Aug 2002 18:12:50 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: charges.pl
===================================================================
RCS file: /cvsroot/koha/koha/charges.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** charges.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- charges.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/currency.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** currency.pl	20 Jun 2002 17:23:09 -0000	1.2
--- currency.pl	14 Aug 2002 18:12:50 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #script to display and update currency rates
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Acquisitions;

Index: delbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/delbiblio.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** delbiblio.pl	20 Jun 2002 17:45:18 -0000	1.4
--- delbiblio.pl	14 Aug 2002 18:12:51 -0000	1.5
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: deletebiblioitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletebiblioitem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** deletebiblioitem.pl	14 May 2002 04:12:52 -0000	1.1
--- deletebiblioitem.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletemem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** deletemem.pl	11 Sep 2001 02:03:26 -0000	1.2
--- deletemem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: deletewebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletewebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** deletewebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- deletewebsite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: delitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/delitem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** delitem.pl	20 Jun 2002 17:23:09 -0000	1.2
--- delitem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** detail.pl	22 May 2002 18:35:25 -0000	1.9
--- detail.pl	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** groups.pl	2 May 2001 23:06:44 -0000	1.1
--- groups.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI qw/:standard/;
  use C4::Output;

Index: imemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/imemberentry.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** imemberentry.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- imemberentry.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: insertdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertdata.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** insertdata.pl	9 Apr 2002 00:04:39 -0000	1.7
--- insertdata.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: insertidata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertidata.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** insertidata.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- insertidata.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: insertjdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertjdata.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** insertjdata.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- insertjdata.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: installer-lite.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer-lite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** installer-lite.pl	11 Jun 2002 11:24:36 -0000	1.1
--- installer-lite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl -w # please develop with -w
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use diagnostics;
  use strict; # please develop with the strict pragma

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** installer.pl	23 Jul 2002 06:06:42 -0000	1.7
--- installer.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 2,5 ****
--- 2,23 ----
  
  #use diagnostics;
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict; # please develop with the strict pragma
  

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** jmemberentry.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- jmemberentry.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: loadmodules.pl
===================================================================
RCS file: /cvsroot/koha/koha/loadmodules.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** loadmodules.pl	20 Jun 2002 17:23:09 -0000	1.3
--- loadmodules.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  #called as an include by the acquisitions index page
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: logout.pl
===================================================================
RCS file: /cvsroot/koha/koha/logout.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** logout.pl	5 Jul 2002 05:03:36 -0000	1.2
--- logout.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: mancredit.pl
===================================================================
RCS file: /cvsroot/koha/koha/mancredit.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mancredit.pl	9 May 2001 23:22:10 -0000	1.2
--- mancredit.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: maninvoice.pl
===================================================================
RCS file: /cvsroot/koha/koha/maninvoice.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** maninvoice.pl	9 May 2001 23:22:10 -0000	1.2
--- maninvoice.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	6 May 2002 04:12:48 -0000	1.2
--- member.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** memberentry.pl	4 Jul 2002 13:53:56 -0000	1.7
--- memberentry.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: modbib.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbib.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** modbib.pl	28 Jun 2002 12:07:16 -0000	1.5
--- modbib.pl	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 5,8 ****
--- 5,26 ----
  # modified 11/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: modbibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbibitem.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** modbibitem.pl	20 Jun 2002 18:04:45 -0000	1.8
--- modbibitem.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 6,9 ****
--- 6,27 ----
  # modified 11/11/99 by chris at katipo.co.nz
  # modified 18/4/00 by chris at katipo.co.nz
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: moditem.pl
===================================================================
RCS file: /cvsroot/koha/koha/moditem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** moditem.pl	20 Jun 2002 17:23:09 -0000	1.2
--- moditem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  # modified 11/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: modrequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/modrequest.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** modrequest.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- modrequest.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  #last update 27/1/2000 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: modwebsites.pl
===================================================================
RCS file: /cvsroot/koha/koha/modwebsites.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modwebsites.pl	12 May 2002 15:37:53 -0000	1.1
--- modwebsites.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** moredetail.pl	31 Jul 2002 03:56:44 -0000	1.8
--- moredetail.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** moremember.pl	27 Jun 2002 21:16:20 -0000	1.13
--- moremember.pl	14 Aug 2002 18:12:51 -0000	1.14
***************
*** 11,14 ****
--- 11,32 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newimember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newimember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newimember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newimember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newjmember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newjmember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newmember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newmember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: orderbreakdown.pl
===================================================================
RCS file: /cvsroot/koha/koha/orderbreakdown.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** orderbreakdown.pl	20 Jun 2002 17:23:09 -0000	1.2
--- orderbreakdown.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 31/01/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: overdue.pl
===================================================================
RCS file: /cvsroot/koha/koha/overdue.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** overdue.pl	18 Mar 2001 22:06:39 -0000	1.1
--- overdue.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pay.pl	27 Mar 2002 00:02:40 -0000	1.3
--- pay.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #part of the koha library system, script to facilitate paying off fines
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: placerequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/placerequest.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** placerequest.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- placerequest.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #writen 2/1/00 by chris at katipo.oc.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: readingrec.pl
===================================================================
RCS file: /cvsroot/koha/koha/readingrec.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** readingrec.pl	20 Jun 2001 03:36:01 -0000	1.2
--- readingrec.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** renewscript.pl	9 May 2001 23:23:52 -0000	1.2
--- renewscript.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to renew items from the web
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Circulation::Renewals2;

Index: reports.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** reports.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- reports.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** request.pl	9 Aug 2002 04:33:01 -0000	1.8
--- request.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 4,7 ****
--- 4,25 ----
  #writen 2/1/00 by chris at katipo.oc.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: reservereport.pl
===================================================================
RCS file: /cvsroot/koha/koha/reservereport.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** reservereport.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- reservereport.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** search.pl	15 May 2002 04:36:51 -0000	1.9
--- search.pl	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 2,5 ****
--- 2,23 ----
  #script to provide intranet (librarian) advanced search facility
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;

Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/shelves.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** shelves.pl	5 Jul 2002 05:03:37 -0000	1.7
--- shelves.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 5,8 ****
--- 5,26 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;
***************
*** 170,173 ****
--- 188,194 ----
  #
  # $Log$
+ # Revision 1.8  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.7  2002/07/05 05:03:37  tonnesen
  # Minor changes to authentication routines.

Index: showbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/showbudget.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** showbudget.pl	20 Jun 2002 17:23:09 -0000	1.3
--- showbudget.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  #called as an include by the acquisitions index page
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: simpleredirect.pl
===================================================================
RCS file: /cvsroot/koha/koha/simpleredirect.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** simpleredirect.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- simpleredirect.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #used by members section
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stats.pl	2 Apr 2001 22:51:26 -0000	1.4
--- stats.pl	14 Aug 2002 18:12:51 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: stats2.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats2.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** stats2.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- stats2.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: subjectsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/subjectsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subjectsearch.pl	9 Jul 2002 03:07:05 -0000	1.2
--- subjectsearch.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: testKoha.pl
===================================================================
RCS file: /cvsroot/koha/koha/testKoha.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** testKoha.pl	20 Jun 2002 18:04:46 -0000	1.5
--- testKoha.pl	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  # $Id$
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Test::Harness;
***************
*** 24,27 ****
--- 42,48 ----
  
  # $Log$
+ # Revision 1.6  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.5  2002/06/20 18:04:46  tonnesen
  # Are we getting sick of merging yet?  Not me!

Index: thesaurus_popup.pl
===================================================================
RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_popup.pl	14 May 2002 11:26:10 -0000	1.1
--- thesaurus_popup.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  # build Subject field using bibliothesaurus table
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: tidyaccounts.pl
===================================================================
RCS file: /cvsroot/koha/koha/tidyaccounts.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** tidyaccounts.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- tidyaccounts.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: updatebibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebibitem.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** updatebibitem.pl	28 Jun 2002 12:53:02 -0000	1.7
--- updatebibitem.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebiblio.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatebiblio.pl	28 Jun 2002 12:19:50 -0000	1.3
--- updatebiblio.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatecharges.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatecharges.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** updatecharges.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- updatecharges.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 6,9 ****
--- 6,27 ----
  # written 1/1/2000 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: updateitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/updateitem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updateitem.pl	20 Jun 2002 17:23:09 -0000	1.3
--- updateitem.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatewebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatewebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** updatewebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- updatewebsite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: userpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/userpage.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** userpage.pl	11 Jul 2002 06:40:06 -0000	1.2
--- userpage.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;




From rangi at users.sourceforge.net  Thu Aug 15 02:46:28 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 17:46:28 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.4,1.21.2.5
Message-ID: <E17f8mS-0000S3-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv1318/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -C2 -r1.21.2.4 -r1.21.2.5
*** Circ2.pm	14 Aug 2002 18:30:50 -0000	1.21.2.4
--- Circ2.pm	15 Aug 2002 00:46:26 -0000	1.21.2.5
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ # use warnings;
  require Exporter;
  use DBI;
***************
*** 33,36 ****
--- 34,38 ----
  #use C4::Scan;
[...1274 lines suppressed...]
! 		if (my $conrec = $consth->fetchrow_hashref) {
! 		    if ($resrec->{'constrainttype'} eq "o") {
! 			$resfound = 1;
! 		    }
! 		}
! 		$consth->finish;
! 	    }
! 	}
! 	if ($resfound) {
!             my $updquery = "update reserves set found = 'W', itemnumber = '$itemno'
!                   where borrowernumber = $brn and reservedate = $rdate and biblionumber = $bibno";
! 	    my $updsth = $dbh->prepare($updquery);
! 	    $updsth->execute;
! 	    $updsth->finish;
! 	}
      }
!     $sth->finish;
!     return ($resfound,$lastrec);
  }
  




From rangi at users.sourceforge.net  Thu Aug 15 02:46:28 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 17:46:28 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,NONE,1.13.2.1 selectbranchprinter.pl,NONE,1.3.2.1 branchtransfers.pl,1.3.2.1,1.3.2.2 circulation.pl,1.23.2.3,1.23.2.4
Message-ID: <E17f8mS-0000SD-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1318/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl 
Added Files:
      Tag: rel-1-2
	returns.pl selectbranchprinter.pl 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



--- NEW FILE ---
#!/usr/bin/perl

#written 11/3/2002 by Finlay
#script to execute returns of books


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
use C4::Print;
use C4::Reserves2;

my %env;
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";

my $query=new CGI;
my $branches = getbranches();
my $printers = getprinters(\%env);

my $branch = $query->param("branch");
my $printer = $query->param("printer");

($branch) || ($branch=$query->cookie('branch')) ;
($printer) || ($printer=$query->cookie('printer')) ;


#
# Some code to handle the error if there is no branch or printer setting.....
#


$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;

# Set up the item stack ....
my $ritext = '';
my %returneditems;
my %riduedate;
my %riborrowernumber;
foreach ($query->param) {
    (next) unless (/ri-(\d*)/);
    my $counter=$1;
    (next) if ($counter>20);
    my $barcode=$query->param("ri-$counter");
    my $duedate=$query->param("dd-$counter");
    my $borrowernumber=$query->param("bn-$counter");
    $counter++;
    # decode cuecat
    $barcode = cuecatbarcodedecode($barcode);
    $returneditems{$counter}=$barcode;
    $riduedate{$counter}=$duedate;
    $riborrowernumber{$counter}=$borrowernumber;
    $ritext.="<input type=hidden name=ri-$counter value=$barcode>\n";
    $ritext.="<input type=hidden name=dd-$counter value=$duedate>\n";
    $ritext.="<input type=hidden name=bn-$counter value=$borrowernumber>\n";
}

# Collect a few messages here...
my $messagetext='';
my $reservetext='';

############
# Deal with the requests....
if ($query->param('resbarcode')) {
    my $item = $query->param('itemnumber');
    my $borrnum = $query->param('borrowernumber');
    my $resbarcode = $query->param('resbarcode');
    my $tobranchcd = ReserveWaiting($item, $borrnum);
    my $branchname = $branches->{$tobranchcd}->{'branchname'};
    my ($borr) = getpatroninformation(\%env, $borrnum, 0);
    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
    my $slip = $query->param('resslip');
    printslip(\%env, $slip);
    if ($tobranchcd ne $branch) {
	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
	$reservetext .= <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
    Item: $iteminfo->{'title'} ($iteminfo->{'author'})<br>
 needs to be transfered to <b>$branchname</b> <br>
to be picked up by $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
    }
}


my $iteminformation;
my $borrower;
my $returned = 0;
my $messages;
my $barcode = $query->param('barcode');
# actually return book and prepare item table.....
if ($barcode) {
    # decode cuecat
    $barcode = cuecatbarcodedecode($barcode);
    ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
    $returneditems{0} = $barcode;
    $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
    if ($returned) {
	$riborrowernumber{0} = $borrower->{'borrowernumber'};
	$riduedate{0} = $iteminformation->{'date_due'};
	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
    } else {
	$riborrowernumber{0} = 0;
	$riduedate{0} = 0;
	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
    }
}

##################################################################################
# HTML code....
# title....
my $title = <<"EOF";
<FONT SIZE=6><em>Circulation: Returns</em></FONT><br>
<b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
<b>Printer:</b> $printers->{$printer}->{'printername'}<br>
<a href=selectbranchprinter.pl>Change Settings</a>
<input type=hidden name=branch value=$branch>
<input type=hidden name=printer value=$printer>
<p>
EOF

my $links = <<"EOF";
<table align="right"><tr><td>
<a href=circulation.pl>
<img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
&nbsp<a href=branchtransfers.pl>
<img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
</td></tr></table>
EOF


my $itemtable;
if ($iteminformation) {
    $itemtable = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Item Information</font></th></tr>
<tr><td>
Title: $iteminformation->{'title'}<br>
<!--Hlt decided they dont want these showing, uncoment the html to make it work

Author: $iteminformation->{'author'}<br>
Barcode: <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
&type=intra onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a><br>
Date Due: $iteminformation->{'date_due'}-->
</td></tr>
</table>
EOF
}

# Barcode entry box, with hidden inputs attached....
my $barcodeentrytext = << "EOF";
<form method=post action=/cgi-bin/koha/circ/returns.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
<font color=black><b>Enter Book Barcode</b></font></td></tr>
<tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
</table>
$ritext
</form>
EOF


if ($messages->{'ResFound'}) {
    my $res = $messages->{'ResFound'};
    my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
    my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
    my ($iteminfo) = getiteminformation(\%env, 0, $barcode);

    if ($res->{'ResFound'} eq "Waiting") {
	$reservetext = <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
    Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
is marked waiting at <b>$branchname</b> for $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
    } 
    if ($res->{'ResFound'} eq "Reserved") {
	my @da = localtime(time());
	my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
	my $slip =  <<"EOF";
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Date: $todaysdate;

ITEM RESERVED: 
$iteminfo->{'title'} ($iteminfo->{'author'})
barcode: $iteminfo->{'barcode'}
itemtype: $iteminfo->{'itemtype'} 

COLLECT AT: $branchname

BORROWER:
$borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
card number: $borr->{'cardnumber'}
Phone: $borr->{'phone'}
$borr->{'streetaddress'}
$borr->{'suburb'}
$borr->{'town'}
$borr->{'emailaddress'}

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

EOF

	$reservetext = <<"EOF";
<font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
for $name ($number) to be collected at <b>$branchname</b>.
<table cellpadding=5 cellspacing=0>
<tr><td valign="top">Change status to waiting and print 
<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
<td valign="top">
<form method=post action='returns.pl'>
$ritext
<input type=hidden name=itemnumber value=$res->{'itemnumber'}>
<input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
<input type=hidden name=resbarcode value=$barcode>
<input type=hidden name=resslip value="$slip">
<input type=submit value="Print">
</form>
</td></tr>
</table>
EOF
    }
}
my $reservefoundtext;
if ($reservetext) {
    $reservefoundtext = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
<tr><td> $reservetext </td></tr></table>
EOF
}

# collect the messages and put into message table....
foreach my $code (keys %$messages) {
    warn $code;
    if ($code eq 'BadBarcode'){
	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
    }
    if ($code eq 'NotIssued'){
	my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
	$messagetext .= "<font color='red' size='+2'> Item not on issue. </font> <br>";
    }
    if ($code eq 'WasLost'){
	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
    }
    if ($code eq 'wthdrawm'){
	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
    }
    if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
	if ($messages->{'IsPermanent'} ne $branch) {
	    $messagetext .= "<font color='red' size='+2'> Please return to $branches->{$messages->{'IsPermanent'}}->{'branchname'} </font> <br>";
	}
    }
}
$messagetext = substr($messagetext, 0, -4);

my $messagetable;
if ($messagetext) {
    $messagetable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
<tr><td> $messagetext </td></tr></table>
EOF
}


# patrontable ....
my $borrowertable;
my $flaginfotable;
if ($borrower) {
    $borrowertable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black><b>Borrower Information</b></font></td></tr>
<tr><td colspan=2>
<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} 
onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a>
$borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
</td></tr>
EOF
    my $flags = $borrower->{'flags'};
    my $flaginfotext='';
    my $color = '';
    foreach my $flag (sort keys %$flags) {
	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
	if ($flags->{$flag}->{'noissues'}) {
	    $flag = "<font color=red>$flag</font>";
	}
	if ($flag eq 'CHARGES') {
	    $flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
<a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
EOF
	} elsif ($flag eq 'WAITING') {
	    my $itemswaiting='';
	    my $items = $flags->{$flag}->{'itemlist'};
	    foreach my $item (@$items) {
		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
		$itemswaiting .= <<"EOF";
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
$iteminformation->{'title'} 
($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>
EOF
            }
            $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
	} elsif ($flag eq 'ODUES') {
	    my $itemsoverdue = '';
	    my $items = $flags->{$flag}->{'itemlist'};
            foreach my $item (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$items) {
		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
                $itemsoverdue .=  <<"EOF";
<font color=red>$item->{'date_due'}</font>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
$iteminformation->{'title'}
<br>
EOF
	    }
	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
        } else {
	    $flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
EOF
	}
    }
    if ($flaginfotext) {
	$borrowertable .= << "EOF";
<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
<b>Flags</b></td></tr>
$flaginfotext 
EOF
    }
    $borrowertable .= "</table>";
}

# the returned items.....
my $returneditemstable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Items</font></th></tr>
<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr>
EOF

my $color='';
#set up so only the lat 8 returned items display (make for faster loading pages)
my $count=0;
foreach (sort {$a <=> $b} keys %returneditems) {
    if ($count < 8) {
	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
	my $barcode = $returneditems{$_};
	my $duedate = $riduedate{$_};
	my $overduetext;
	if ($duedate) {
	    my @tempdate = split ( /-/ , $duedate ) ;
            my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
            my @datearr = localtime(time());
            my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
	    $overduetext = "$duedatenz";
	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
        } else {
            $overduetext = "Not on loan.";
	}
        my $borrowernumber = $riborrowernumber{$_};
        my $borrowerinfo;
        if ($borrowernumber) {
	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
            my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
        } else {
	    $borrowerinfo = "Not on loan.";
	}
	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
	$returneditemstable .= << "EOF";
<tr><td bgcolor=$color>$overduetext</td>
<td bgcolor=$color align=center>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td>
<td bgcolor=$color>$iteminformation->{'title'}</td>
<td bgcolor=$color>$iteminformation->{'author'}</td>
<td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
<td bgcolor=$color>
$borrowerinfo</td></tr>
EOF
    } else {
	last;
    }
    $count++;
}
$returneditemstable .= "</table>\n";


# actually print the page!
print $query->header();
print startpage();
print startmenu('circulation');

print <<"EOF";
$links
$title
<table cellpadding=5 cellspacing=0 width=100%>
EOF

if ($reservefoundtext) {
    print <<"EOF";
<tr>
<td colspan=2>$reservefoundtext</td>
</tr>
<tr>
<td colspan=2>$messagetable</td>
</tr>

EOF
} else {
    print <<"EOF";
<tr>
<td valign=top align=left>$barcodeentrytext</td>
<td valign=top align=left>$messagetable</td>
</tr>
EOF
}
if ($returned) {
    print <<"EOF";
<tr>
<td valign=top align=left>$itemtable</td>
<td valign=top align=left>$borrowertable</td>
<tr>
EOF
}
if (%returneditems) {
    print "<tr><td colspan=2>$returneditemstable</td></tr>";
}

print "</table>";

print endmenu('circulation');
print endpage();

sub cuecatbarcodedecode {
    my ($barcode) = @_;
    chomp($barcode);
    my @fields = split(/\./,$barcode);
    my @results = map(decode($_), @fields[1..$#fields]);
    if ($#results == 2){
  	return $results[2];
    } else {
	return $barcode;
    } 
} 


--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI qw/:standard/;
use C4::Circulation::Circ2;
use C4::Output;
use C4::Print;
use DBI;


# this is a reorganisation of circulationold.pl 
# dividing it up into three scripts......
# this will be the first one that chooses branch and printer settings....

#general design stuff...
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";

# try to get the branch and printer settings from the http....
my %env;
my $query=new CGI;
my $branches=getbranches(\%env);
my $printers=getprinters(\%env);
my $branch=$query->param('branch');
my $printer=$query->param('printer');

($branch) || ($branch=$query->cookie('branch'));
($printer) || ($printer=$query->cookie('printer'));

# is you force a selection....
my $oldbranch = $branch;
my $oldprinter = $printer;

$branch='';
$printer='';


$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;

# set up select options....
my $branchcount=0;
my $printercount=0;
my $branchoptions;
my $printeroptions;
foreach (keys %$branches) {
    (next) unless ($_);
    (next) unless ($branches->{$_}->{'IS'});
    $branchcount++;
    my $selected='';
    ($selected='selected') if ($_ eq $oldbranch);
    $branchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
}
foreach (keys %$printers) {
    (next) unless ($_);
    $printercount++;
    my $selected='';
    ($selected='selected') if ($_ eq $oldprinter);
    $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n";
}

# if there is only one....

if ($printercount==1) {
    ($printer)=keys %$printers;
}
if ($branchcount==1) {
    ($branch)=keys %$branches;
}

# set up printer and branch selection forms....
my ($printerform, $branchform);
if ($printercount>1) {
    $printerform=<<"EOF";
<select name=printer> $printeroptions </select>
EOF
} else {
    my ($printer) = keys %$printers;
} 

if ($branchcount>1) {
    $branchform=<<"EOF";
<select name=branch> $branchoptions </select>
EOF
} else {
    my ($branch) = keys %$branches;
} 



#############################################################################################
# Start writing page....
# set header with cookie....

print $query->header();

print startpage();
print startmenu('circulation');

print << "EOF";
<FONT SIZE=6><em>Circulation: Select Printer and Branch Settings</em></FONT><br>

<center>
<form method=post action=/cgi-bin/koha/circ/circulation.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
<font color=black><b>Please Set Branch and Printer</b></font></td></tr>
<tr><td>
$branchform
</td>
<td>
$printerform
</td></tr>
</table>
<input type="hidden" name="setcookies" value=1>
<input type="submit" value="Submit" type="changesettings">
</form>
</center>

EOF


print endmenu('circulation');
print endpage();


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** branchtransfers.pl	14 Aug 2002 18:30:51 -0000	1.3.2.1
--- branchtransfers.pl	15 Aug 2002 00:46:26 -0000	1.3.2.2
***************
*** 25,31 ****
  use CGI;
  use C4::Circulation::Circ2;
- use C4::Search;
  use C4::Output;
  
  
  my %env;
--- 25,33 ----
  use CGI;
  use C4::Circulation::Circ2;
  use C4::Output;
+ use C4::Reserves2;
  
+ ###############################################
+ # constants
  
  my %env;
***************
*** 37,60 ****
  my $backgroundimage="/images/background-mem.gif";
  
  my $query=new CGI;
- my $branches=getbranches(\%env);
  
- my $tobranchcd=$query->param('tobranchcd');
- my $frbranchcd='';
  
! $env{'tobranchcd'}=$tobranchcd;
  
  
  my $tobranchoptions;
! foreach (keys %$branches) {
!         (next) unless ($_);
!         (next) if (/^TR$/);
!         my $selected='';
!         ($selected='selected') if ($_ eq $tobranchcd);
!         $tobranchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
  }
  
  # collect the stack of books already transfered so they can printed...
- my @messages;
  my %transfereditems;
  my $ritext = '';
--- 39,75 ----
  my $backgroundimage="/images/background-mem.gif";
  
+ my $branches = getbranches();
+ my $printers = getprinters(\%env);
+ 
+ 
+ ###############################################
+ #  Getting state
+ 
  my $query=new CGI;
  
  
! my $branch = $query->param("branch");
! my $printer = $query->param("printer");
  
  
+ ($branch) || ($branch=$query->cookie('branch')) ;
+ ($printer) || ($printer=$query->cookie('printer')) ;
+ 
+ my $request=$query->param('request');
+ 
+ 
+ my $tobranchcd=$query->param('tobranchcd');
+ my $frbranchcd='';
+ 
+ # set up the branchselect options....
  my $tobranchoptions;
! foreach my $br (keys %$branches) {
!     (next) unless $branches->{$br}->{'CU'};
!     my $selected='';
!     ($selected='selected') if ($br eq $tobranchcd);
!     $tobranchoptions.="<option value=$br $selected>$branches->{$br}->{'branchname'}\n";
  }
  
  # collect the stack of books already transfered so they can printed...
  my %transfereditems;
  my $ritext = '';
***************
*** 76,112 ****
      }
  
- #if the barcode has been entered action that and write a message and onto the top of the stack...
- my $iteminformation;
  
! my $todaysdate;
! if (my $barcode=$query->param('barcode')) {
!     my $iteminformation = getiteminformation(\%env,0, $barcode);
!     my $fail=0;
!     if (not $iteminformation) {
! 	$fail=1;
! 	@messages = ("There is no book with barcode: $barcode ", @messages);
!     }
!     $frbranchcd = $iteminformation->{'holdingbranch'};
!     %env->{'frbranchcd'} = $frbranchcd;
!     if ($frbranchcd eq $tobranchcd) {
! 	$fail=1;
! 	@messages = ("You can't transfer the book to the branch it is already at!", @messages);
!     }
! # should add some more tests ... like is the book already out, maybe it cant be moved....
!     if (not $fail) {
! 	my ($transfered, $message) = transferbook(\%env, $iteminformation, $barcode);
! 	if (not $transfered) {@messages = ($message, @messages);}
! 	else {
! 	    $ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! 	    $ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! 	    $ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! 	    $transfereditems{0}=$barcode;
! 	    $frbranchcds{0}=$frbranchcd;
! 	    $tobranchcds{0}=$tobranchcd;
! 	    @messages = ("Book: $barcode has been transfered", @messages);
! 	}
      }
  }
  
  my $entrytext= << "EOF";
  <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
--- 91,151 ----
      }
  
  
! # Collect a few messages here...
! my $messagetext='';
! 
! ############
! # Deal with the requests....
! if ($request eq "KillWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve(0, $item, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! my $ignoreRs = 0;
! if ($request eq "SetWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     $tobranchcd = ReserveWaiting($item, $borrnum);
!     $ignoreRs = 1;
!     $messagetext .= "Item should now be waiting at branch: $branches->{$tobranchcd}->{'branchname'}<br>";
! }
! if ($request eq 'KillReserved'){
!     my $biblio = $query->param('biblionumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve($biblio, 0, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! 
! 
! 
! 
! # Warnings etc that get displayed at top of next page....
! my $messages;
! # if the barcode has been entered action that and write a message 
! # and put onto the top of the stack...
! my $iteminformation;
! my $barcode = $query->param('barcode');
! if ($barcode) {
!     my $transfered;
!     my $iteminformation;
!     ($transfered, $messages, $iteminformation) 
!                    = transferbook($tobranchcd, $barcode, $ignoreRs);
!     if ($transfered) {
! 	my $frbranchcd = $iteminformation->{'holdingbranch'};
! 	$ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! 	$ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! 	$ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! 	$transfereditems{0}=$barcode;
! 	$frbranchcds{0}=$frbranchcd;
! 	$tobranchcds{0}=$tobranchcd;
      }
  }
  
+ 
+ #################################################################################
+ # Html code....
+ # collect together the various elements...
+ 
  my $entrytext= << "EOF";
  <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
***************
*** 129,160 ****
  EOF
  
! my $messagetable;
! if (@messages) {
!     my $messagetext='';
!     foreach (@messages) {
! 	$messagetext.="$_<p>\n";
      }
      $messagetable = << "EOF";
! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Messages</font></th></tr>
  <tr><td> $messagetext </td></tr></table>
  EOF
  }
  
! 
  
  print $query->header;
  print startpage;
! print startmenu('circulation');
! print "<FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>";
! 
! 
! print $messagetable if (@messages);
  
  
! print $entrytext;
  
! if (%transfereditems) {
!     print << "EOF"; 
  <p>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>                                                                
--- 168,336 ----
  EOF
  
! 
! 
! #####################
! 
! my $reservefoundtext;
! if ($messages->{'ResFound'}) {
!     my $res = $messages->{'ResFound'};
!     my $reservetext;
!     my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!     my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
!     my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
!     my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
!     if ($res->{'ResFound'} eq "Waiting") {
! 	$reservetext = <<"EOF";
! <font color='red' size='+2'>Item marked Waiting:</font><br>
!     Item is marked waiting at $branchname for $name ($number).<br>
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillWaiting'>
! <input type=submit value="Cancel">
! </form>
! </td></tr>
! <tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
!     } 
!     if ($res->{'ResFound'} eq "Reserved") {
! 	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved:</font> reserve found for $name ($number).
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Set reserve to waiting and transfer book to <b>$branchname </b>: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='SetWaiting'>
! <input type=submit value="Waiting">
! </form>
! </td></tr>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=biblionumber value=$res->{'biblionumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillReserved'>
! <input type=submit value="Cancel">
! </form>
! </td></tr><tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! $ritext
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
      }
+     $reservefoundtext = <<"EOF";
+ <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
+ <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
+ <tr><td> $reservetext </td></tr></table>
+ EOF
+ }
+ 
+ #####################
+ 
+ foreach my $code (keys %$messages) {
+     if ($code eq 'BadBarcode'){
+ 	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
+     }
+     if ($code eq 'IsPermanent'){
+ 	my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
+ 	$messagetext .= "<font color='red' size='+2'> Please return item to home branch: $braname  </font> <br>";
+     }
+     if ($code eq 'DestinationEqualsHolding'){
+ 	$messagetext .= "<font color='red' size='+2'> Item is already at destination branch. </font> <br>";
+     }
+     if ($code eq 'WasReturned') {
+ 	my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
+ 
+ 	my $binfo = <<"EOF";
+ <a href=/cgi-bin/koha/moremember.pl?bornum=$borrowerinfo->{'borrowernumber'} 
+ onClick="openWindow(this,'Member', 480, 640)">$borrowerinfo->{'cardnumber'}</a>
+ $borrowerinfo->{'surname'}, $borrowerinfo->{'title'} $borrowerinfo->{'firstname'}
+ EOF
+ 	$messagetext .= "Item was on loan to $binfo and has been returned. <br>";
+     }
+     if ($code eq 'WasTransfered'){
+ # Put code here if you want to notify the user that item was transfered...
+     }
+ }
+ $messagetext = substr($messagetext, 0, -4);
+ 
+ my $messagetable;
+ if ($messagetext) {
      $messagetable = << "EOF";
! <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
  <tr><td> $messagetext </td></tr></table>
+ <img src="/images/holder.gif" width=24 height=24>
  EOF
  }
  
! #######################################################################################
! # Make the page .....
  
  print $query->header;
  print startpage;
! #print startmenu('circulation');
! my @inp=startmenu('circulation');
! my $count=@inp;
! for (my $i=0;$i<$count;$i++){
!         $inp[$i]=~ s/document.forms\[0\].elements\[0\]/document\.forms\[0\]\.elements\[1\]/;
!     }
! print @inp;
  
+ #foreach my $key (%$messages) {
+ #    print $key." : ".$messages->{$key}."<br>";
+ #}
+ 
+ print <<"EOF";
+ <table align=right><tr><td>
+ <a href=circulation.pl>
+ <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Next Borrower"></a> &nbsp
+ <a href=returns.pl>
+ <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
+ </td></tr></table>
+ 
+ <FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>
+ <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
+ <b>Printer:</b> $printers->{$printer}->{'printername'}<br>
+ <a href=selectbranchprinter.pl>Change Settings</a>
+ <input type=hidden name=branch value=$branch>
+ <input type=hidden name=printer value=$printer>
+ <p>           
+ EOF
  
! if ($reservefoundtext) {
!     print $reservefoundtext;
! } else {
!     print $messagetable;
!     print $entrytext;
  
!     if (%transfereditems) {
! 	print << "EOF";
  <p>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>                                                                
***************
*** 162,173 ****
  <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  EOF
!     my $color='';
!     foreach (keys %transfereditems) {
! 	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 	my $barcode=$transfereditems{$_};
! 	my $frbcd=$frbranchcds{$_};
! 	my $tobcd=$tobranchcds{$_};
! 	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! 	print << "EOF";
  <tr><td bgcolor=$color align=center>
  <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
--- 338,349 ----
  <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  EOF
!         my $color='';
! 	foreach (sort keys %transfereditems) {
! 	    ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 	    my $barcode=$transfereditems{$_};
! 	    my $frbcd=$frbranchcds{$_};
! 	    my $tobcd=$tobranchcds{$_};
! 	    my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! 	    print << "EOF";
  <tr><td bgcolor=$color align=center>
  <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
***************
*** 180,188 ****
  </tr>\n
  EOF
! }
!     print "</table>\n";
  }
  
  print endmenu('circulation');
  print endpage;
  
--- 356,366 ----
  </tr>\n
  EOF
!         }
! 	print "</table>\n";
!     }
  }
  
  print endmenu('circulation');
  print endpage;
+ 
  

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -r1.23.2.3 -r1.23.2.4
*** circulation.pl	14 Aug 2002 18:30:51 -0000	1.23.2.3
--- circulation.pl	15 Aug 2002 00:46:26 -0000	1.23.2.4
***************
*** 1,4 ****
--- 1,7 ----
  #!/usr/bin/perl
  
+ #written 8/5/2002 by Finlay
+ #script to execute issuing of books
+ 
  
  # Copyright 2000-2002 Katipo Communications
***************
*** 19,24 ****
[...1514 lines suppressed...]
+     foreach (sort keys %$borrowerissues) {
+ 	$issues[$i]=$borrowerissues->{$_};
+ 	my $dd=$issues[$i]->{'date_due'};
+ 	#convert to nz style dates
+ 	#this should be set with some kinda config variable
+ 	my @tempdate=split(/-/,$dd);
+ 	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ 	$i++;
+     }
+     foreach (sort keys %$borroweriss2) {
+ 	$issues[$i]=$borroweriss2->{$_};
+ 	my $dd=$issues[$i]->{'date_due'};
+ 	#convert to nz style dates
+ 	#this should be set with some kinda config variable
+ 	my @tempdate=split(/-/,$dd);
+ 	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ 	$i++;
+     }
+     remoteprint($env,\@issues,$borrower);
  }




From rangi at users.sourceforge.net  Thu Aug 15 04:02:43 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 19:02:43 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.33,1.34
Message-ID: <E17f9yF-0001qE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv6628/C4

Modified Files:
	Search.pm 
Log Message:
Fix for last borrower for the moredetail.pl page
sCVS: 


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Search.pm	14 Aug 2002 18:12:51 -0000	1.33
--- Search.pm	15 Aug 2002 02:02:40 -0000	1.34
***************
*** 123,127 ****
      }
    }
!   if ($env->{itemcount}) {
      foreach my $data (@results){
        my ($counts) = itemcount2($env, $data->{'biblionumber'}, 'intra');
--- 123,127 ----
      }
    }
!   if ($env->{itemcount} eq '1') {
      foreach my $data (@results){
        my ($counts) = itemcount2($env, $data->{'biblionumber'}, 'intra');
***************
*** 337,340 ****
--- 337,341 ----
          $sth->finish;                                             
  	$data2->{'dewey'}=$dewey;
+ 	
  	$res2[$i]=$data2;
  #	$res2[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey";
***************
*** 561,565 ****
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	 }
! 	 
  
  	 $query.=" group by biblio.biblionumber";
--- 562,568 ----
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	 }
! 	 if ($search->{'date-before'} ne ''){
! 	    $query.= " and (copyrightdate like '%$search->{'date-before'}%')";
! 	   }
  
  	 $query.=" group by biblio.biblionumber";
***************
*** 608,611 ****
--- 611,617 ----
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	   }
+ 	   if ($search->{'date-before'} ne ''){
+ 	    $query.= " and (copyrightdate like '%$search->{'date-before'}%')";
+ 	   }
  	  } elsif ($search->{'class'} ne ''){
  	     $query="select * from biblioitems,biblio where biblio.biblionumber=biblioitems.biblionumber";
***************
*** 636,639 ****
--- 642,648 ----
  	  } elsif ($search->{'abstract'} ne ''){
  	    $query.= "Select * from biblio where abstract like '%$search->{'abstract'}%'";
+ 	  
+ 	  } elsif ($search->{'date-before'} ne ''){
+ 	    $query.= "Select * from biblio where copyrightdate like '%$search->{'date-before'}%'";
  	  }
            $query .=" group by biblio.biblionumber";	 
***************
*** 716,720 ****
  my $limit= $num+$offset;
  while (my $data=$sth->fetchrow_hashref){
!   my $query="select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'}";
    	    if ($search->{'class'} ne ''){
  	      my @temp=split(/\|/,$search->{'class'});
--- 725,729 ----
  my $limit= $num+$offset;
  while (my $data=$sth->fetchrow_hashref){
!   my $query="select dewey,subclass,publishercode from biblioitems where biblionumber=$data->{'biblionumber'}";
    	    if ($search->{'class'} ne ''){
  	      my @temp=split(/\|/,$search->{'class'});
***************
*** 735,739 ****
  	    $query.= " and (publishercode like '%$search->{'publisher'}%')";
  	    }
! #print STDERR "$query\n";
    my $sti=$dbh->prepare($query);
    $sti->execute;
--- 744,748 ----
  	    $query.= " and (publishercode like '%$search->{'publisher'}%')";
  	    }
! 
    my $sti=$dbh->prepare($query);
    $sti->execute;
***************
*** 741,751 ****
    my $subclass;
    my $true=0;
!   if (($dewey, $subclass) = $sti->fetchrow || $type eq 'subject'){
      $true=1;
    }
    $dewey=~s/\.*0*$//;
    ($dewey == 0) && ($dewey='');
    ($dewey) && ($dewey.=" $subclass");
    $data->{'dewey'}=$dewey;
    $sti->finish;
    if ($true == 1){
--- 750,767 ----
    my $subclass;
    my $true=0;
!   my $publishercode;
!   my $bibitemdata;
!   if ($bibitemdata = $sti->fetchrow_hashref() || $type eq 'subject'){
      $true=1;
+     $dewey=$bibitemdata->{'dewey'};
+     $subclass=$bibitemdata->{'subclass'};
+     $publishercode=$bibitemdata->{'publishercode'};
    }
+   print STDERR "$dewey $subclass $publishercode\n";
    $dewey=~s/\.*0*$//;
    ($dewey == 0) && ($dewey='');
    ($dewey) && ($dewey.=" $subclass");
    $data->{'dewey'}=$dewey;
+   $data->{'publishercode'}=$publishercode;
    $sti->finish;
    if ($true == 1){
***************
*** 968,972 ****
      $sth->execute;
      while (my $dat = $sth->fetchrow_hashref){
!         $data->{'subject'} .= " | $dat->{'subject'}";
      } # while
  
--- 984,988 ----
      $sth->execute;
      while (my $dat = $sth->fetchrow_hashref){
!         $data->{'subject'} .= " , $dat->{'subject'}";
      } # while
  
***************
*** 1086,1090 ****
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! order by date_due desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
--- 1102,1107 ----
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! and returndate is not NULL
! order by returndate desc,timestamp desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
***************
*** 1385,1389 ****
      $sth2->execute;         
      if (my $data2=$sth2->fetchrow_hashref){         
!        $counts{'notavailable'}++;         
      } else {         
         $counts{$data->{'branchname'}}++;
--- 1402,1406 ----
      $sth2->execute;         
      if (my $data2=$sth2->fetchrow_hashref){         
!        $counts{'not available'}++;         
      } else {         
         $counts{$data->{'branchname'}}++;




From rangi at users.sourceforge.net  Thu Aug 15 04:05:01 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 19:05:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.7,1.18.2.8
Message-ID: <E17fA0T-00029t-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7951/C4

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
Fix for itemissues, fetching the right dates for last borrowers for use on
the moredetail.pl page


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -C2 -r1.18.2.7 -r1.18.2.8
*** Search.pm	14 Aug 2002 18:30:50 -0000	1.18.2.7
--- Search.pm	15 Aug 2002 02:04:59 -0000	1.18.2.8
***************
*** 1120,1124 ****
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! order by date_due desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
--- 1120,1125 ----
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! and returndate is not NULL
! order by returndate desc, timestamp desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;




From finlayt at users.sourceforge.net  Thu Aug 15 05:13:46 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:13:46 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.37,1.38
Message-ID: <E17fB50-0003gH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv13754/circ

Modified Files:
	circulation.pl 
Log Message:

changed the color to red and size to +2 for the Issuing Question....


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.pl	14 Aug 2002 18:12:53 -0000	1.37
--- circulation.pl	15 Aug 2002 03:13:44 -0000	1.38
***************
*** 246,250 ****
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
! <font color=black><b>Issuing Question</b></font></th></tr>
  <tr><td><table border=0 cellpadding=10><tr><td> 
  Attempting to issue $iteminformation->{'title'} 
--- 246,250 ----
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
! <font size=+2 color=red><b>Issuing Question</b></font></th></tr>
  <tr><td><table border=0 cellpadding=10><tr><td> 
  Attempting to issue $iteminformation->{'title'} 




From finlayt at users.sourceforge.net  Thu Aug 15 05:27:30 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:27:30 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.32,1.33
Message-ID: <E17fBII-0005ES-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19837/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

Added some red color here into the message that appears when a waiting book is attempted to be issued.


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Circ2.pm	14 Aug 2002 18:12:52 -0000	1.32
--- Circ2.pm	15 Aug 2002 03:27:28 -0000	1.33
***************
*** 328,335 ****
  	my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date);
  	if ($amount > 5 && $patroninformation->{'categorycode'} ne 'L' &&
!                          $patroninformation->{'categorycode'} ne 'W' &&
!                          $patroninformation->{'categorycode'} ne 'I' && 
!                          $patroninformation->{'categorycode'} ne 'B' &&
!                          $patroninformation->{'categorycode'} ne 'P') {
  	    $rejected = sprintf "Patron owes \$%.02f.", $amount;
  	    last SWITCH;
--- 328,335 ----
  	my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date);
  	if ($amount > 5 && $patroninformation->{'categorycode'} ne 'L' &&
!                            $patroninformation->{'categorycode'} ne 'W' &&
!                            $patroninformation->{'categorycode'} ne 'I' && 
!                            $patroninformation->{'categorycode'} ne 'B' &&
!                            $patroninformation->{'categorycode'} ne 'P') {
  	    $rejected = sprintf "Patron owes \$%.02f.", $amount;
  	    last SWITCH;
***************
*** 408,412 ****
  		if ($responses->{2} eq '') {
  		    $questionnumber=2;
! 		    $question="Waiting for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) at $branchname \nAllow issue?";
  		    $defaultanswer='N';
  		    last SWITCH;
--- 408,412 ----
  		if ($responses->{2} eq '') {
  		    $questionnumber=2;
! 		    $question="<font color=red>Waiting</font> for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) at $branchname \nAllow issue?";
  		    $defaultanswer='N';
  		    last SWITCH;




From finlayt at users.sourceforge.net  Thu Aug 15 05:31:04 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:31:04 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.13,1.14
Message-ID: <E17fBLk-0005ds-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv21129/C4

Modified Files:
	Reserves2.pm 
Log Message:

Fixed a really terrible bug! Took out the fixpriorities call in FillReserve. This is not necesary because the priorities are fixed up when the item is set to waiting in ReserveWaiting.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Reserves2.pm	14 Aug 2002 18:12:51 -0000	1.13
--- Reserves2.pm	15 Aug 2002 03:31:02 -0000	1.14
***************
*** 66,70 ****
    }
    $query.=" order by priority";
-   warn $query;
    my $sth=$dbh->prepare($query);
    $sth->execute;
--- 66,69 ----
***************
*** 124,133 ****
  	    }
  	}
- 	warn "highest = $highest";
  	$highest->{'itemnumber'} = $item;
- 	foreach my $key (keys %$highest) {
- 	    warn "$key : $highest->{$key}\n";
- 	}
- 
  	return ("Reserved", $highest);
      } else {
--- 123,127 ----
***************
*** 203,208 ****
      $sth->finish;
      $dbh->disconnect;
- # now fix the priority on the others....
-     fixpriority($res->{'priority'}, $biblio);
  }
  
--- 197,200 ----
***************
*** 337,341 ****
      my $nextacctno = &getnextacctno($env,$borrnum,$dbh);   
      my $updquery = "insert into accountlines       
!     (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)                                              
  						          values
      ($borrnum,$nextacctno,now(),$fee,'Reserve Charge - $title','Res',$fee)";          
--- 329,333 ----
      my $nextacctno = &getnextacctno($env,$borrnum,$dbh);   
      my $updquery = "insert into accountlines       
!     (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
  						          values
      ($borrnum,$nextacctno,now(),$fee,'Reserve Charge - $title','Res',$fee)";          




From finlayt at users.sourceforge.net  Fri Aug 16 00:26:36 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 15 Aug 2002 15:26:36 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.13,1.14
Message-ID: <E17fT4e-0004vP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv18824/circ

Modified Files:
	returns.pl 
Log Message:

Changed the wording of the reserves print slip slightly.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** returns.pl	14 Aug 2002 18:12:53 -0000	1.13
--- returns.pl	15 Aug 2002 22:26:34 -0000	1.14
***************
*** 230,234 ****
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 230,234 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'firstname'} $borr->{'surname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}




From tonnesen at users.sourceforge.net  Fri Aug 16 22:42:34 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:42:34 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.5,1.21.2.6
Message-ID: <E17fnvW-0005ol-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv22304

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Added missing $accessflagshash chunk to getpatroninformation


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -C2 -r1.21.2.5 -r1.21.2.6
*** Circ2.pm	15 Aug 2002 00:46:26 -0000	1.21.2.5
--- Circ2.pm	16 Aug 2002 20:42:32 -0000	1.21.2.6
***************
*** 138,141 ****
--- 138,150 ----
      my $borrower = $sth->fetchrow_hashref;
      my $flags = patronflags($env, $borrower, $dbh);
+     my $accessflagshash;
+ 
+     $sth=$dbh->prepare("select bit,flag from userflags");
+     $sth->execute;
+     while (my ($bit, $flag) = $sth->fetchrow) {
+ 	if ($flags & 2**$bit) {
+ 	    $accessflagshash->{$flag}=1;
+ 	}
+     }
      $sth->finish;
      $dbh->disconnect;




From tonnesen at users.sourceforge.net  Fri Aug 16 22:44:44 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:44:44 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.23.2.4,1.23.2.5 returns.pl,1.13.2.1,1.13.2.2
Message-ID: <E17fnxc-000616-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv23048

Modified Files:
      Tag: rel-1-2
	circulation.pl returns.pl 
Log Message:
Fixed '_' character between issues, returns, and transfers buttons.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -C2 -r1.23.2.4 -r1.23.2.5
*** circulation.pl	15 Aug 2002 00:46:26 -0000	1.23.2.4
--- circulation.pl	16 Aug 2002 20:44:42 -0000	1.23.2.5
***************
*** 201,207 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 201,205 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
***************
*** 218,224 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 216,220 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** returns.pl	15 Aug 2002 00:46:26 -0000	1.13.2.1
--- returns.pl	16 Aug 2002 20:44:42 -0000	1.13.2.2
***************
*** 157,162 ****
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF
--- 157,161 ----
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF




From tonnesen at users.sourceforge.net  Fri Aug 16 22:46:42 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:46:42 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.14,1.15 circulation.pl,1.38,1.39
Message-ID: <E17fnzW-00069u-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv23614

Modified Files:
	returns.pl circulation.pl 
Log Message:
Removed '_' between issues, returns, and transfers graphics


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** returns.pl	15 Aug 2002 22:26:34 -0000	1.14
--- returns.pl	16 Aug 2002 20:46:40 -0000	1.15
***************
*** 157,162 ****
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF
--- 157,161 ----
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** circulation.pl	15 Aug 2002 03:13:44 -0000	1.38
--- circulation.pl	16 Aug 2002 20:46:40 -0000	1.39
***************
*** 192,198 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 192,196 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
***************
*** 209,215 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 207,211 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>




From tonnesen at users.sourceforge.net  Fri Aug 16 22:53:25 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:53:25 -0700
Subject: [Koha-cvs] CVS: koha buildrelease,1.1.2.19,1.1.2.20
Message-ID: <E17fo61-0006kK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv25854

Modified Files:
      Tag: rel-1-2
	buildrelease 
Log Message:
Set all .pl scripts in intranet-cgi executable


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -C2 -r1.1.2.19 -r1.1.2.20
*** buildrelease	26 Jul 2002 13:46:50 -0000	1.1.2.19
--- buildrelease	16 Aug 2002 20:53:23 -0000	1.1.2.20
***************
*** 266,269 ****
--- 266,271 ----
  system("rm -rf $rootdir/intranet-cgi/t");
  
+ # Set all .pl scripts executable
+ system("find $rootdir/intranet-cgi -name '*.pl' -exec chmod a+x \\{\\} \\;"); 
  # Copy all CVS files to intranet-html and opac-html
  system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");




From tonnesen at users.sourceforge.net  Fri Aug 16 23:01:22 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 14:01:22 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.12,1.1.2.13
Message-ID: <E17foDi-0007UG-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28633

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Added 'IS' and 'CU' flags for default MAIN branch.


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -r1.1.2.12 -r1.1.2.13
*** Install.pm	14 Aug 2002 18:30:50 -0000	1.1.2.12
--- Install.pm	16 Aug 2002 21:01:20 -0000	1.1.2.13
***************
*** 1123,1126 ****
--- 1123,1128 ----
  	    system("gzip -9 sampledata-1.2");
  	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
+ 	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
+ 	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
  	    showmessage(getmessage('SampleDataInstalled'), 'PressEnter');




From tonnesen at users.sourceforge.net  Fri Aug 16 23:02:11 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 14:02:11 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.13,1.1.2.14
Message-ID: <E17foEV-0007Ze-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28934

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
branchrelations fix needed to be done in two places...


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -r1.1.2.13 -r1.1.2.14
*** Install.pm	16 Aug 2002 21:01:20 -0000	1.1.2.13
--- Install.pm	16 Aug 2002 21:02:09 -0000	1.1.2.14
***************
*** 1147,1150 ****
--- 1147,1152 ----
  
  		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
+ 		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
+ 		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='Library Printer';




From rangi at users.sourceforge.net  Sat Aug 17 00:50:07 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Fri, 16 Aug 2002 15:50:07 -0700
Subject: [Koha-cvs] CVS: koha/C4 Print.pm,1.3.2.4,1.3.2.5
Message-ID: <E17fpux-0007AZ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv27379/C4

Modified Files:
      Tag: rel-1-2
	Print.pm 
Log Message:
Merging across print.pm fixes bug 80
missing printslip routine


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** Print.pm	14 Aug 2002 18:30:50 -0000	1.3.2.4
--- Print.pm	16 Aug 2002 22:50:05 -0000	1.3.2.5
***************
*** 29,33 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve);
  
  sub remoteprint {
--- 29,34 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve &printslip);
! 
  
  sub remoteprint {
***************
*** 73,102 ****
  
  sub printreserve {
!   my($env,$resrec,$rbordata,$itemdata)=@_;
    my $file=time;
!   my $queue = $env->{'queue'};
!   #if ($queue eq "") {
      open (PRINTER,">/tmp/kohares");
!   #} else {
!   #  open (PRINTER, "| lpr -P $queue") or die "Couldn't write to queue:$!\n";
!   #}  
!   print PRINTER "Collect at $resrec->{'branchcode'}\r\n\r\n";
!   print PRINTER "$rbordata->{'surname'}; $rbordata->{'firstname'}\r\n";
!   print PRINTER "$rbordata->{'cardnumber'}\r\n";
!   print PRINTER "Phone: $rbordata->{'phone'}\r\n";
!   print PRINTER "$rbordata->{'streetaddress'}\r\n";
!   print PRINTER "$rbordata->{'suburb'}\r\n";
!   print PRINTER "$rbordata->{'town'}\r\n";   
!   print PRINTER "$rbordata->{'emailaddress'}\r\n\r\n";
!   print PRINTER "$itemdata->{'barcode'}\r\n";
!   print PRINTER "$itemdata->{'title'}\r\n";
!   print PRINTER "$itemdata->{'author'}";
!   print PRINTER "\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
!   if ($env->{'printtype'} eq "docket"){ 
!     #print chr(27).char(105);
!   }  
    close PRINTER;
-   #system("lpr /tmp/$file"); 
  }
  END { }       # module clean-up code here (global destructor)
    
--- 74,128 ----
  
  sub printreserve {
!   my($env, $branchname, $bordata, $itemdata)=@_;
    my $file=time;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
!     open (PRINTER,">>/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   my @da = localtime(time());
!   my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
! 
! #(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
!   my $slip = <<"EOF";
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Date: $todaysdate;
! 
! ITEM RESERVED: 
! $itemdata->{'title'} ($itemdata->{'author'})
! barcode: $itemdata->{'barcode'}
! 
! COLLECT AT: $branchname
! 
! BORROWER:
! $bordata->{'surname'}, $bordata->{'firstname'}
! card number: $bordata->{'cardnumber'}
! Phone: $bordata->{'phone'}
! $bordata->{'streetaddress'}
! $bordata->{'suburb'}
! $bordata->{'town'}
! $bordata->{'emailaddress'}
! 
! 
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! EOF
!     print PRINTER $slip;
!   close PRINTER;
!   return $slip;
! }
! 
! sub printslip {
!   my($env, $slip)=@_;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
      open (PRINTER,">/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   print PRINTER $slip;
    close PRINTER;
  }
+ 
  END { }       # module clean-up code here (global destructor)
    




From finlayt at users.sourceforge.net  Mon Aug 19 07:37:17 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 22:37:17 -0700
Subject: [Koha-cvs] CVS: koha detail.pl,1.10,1.11
Message-ID: <E17gfE5-0005KW-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20254

Modified Files:
	detail.pl 
Log Message:

added a Boolean: $norequests whhich is set on the template detail.tmpl so that the "requests" button only apears if it is actually possible to make a request. This is set by checking against the "notforloan" field on the itemtypes table.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** detail.pl	14 Aug 2002 18:12:51 -0000	1.10
--- detail.pl	19 Aug 2002 05:37:15 -0000	1.11
***************
*** 46,57 ****
     $value=~s/\s*$//g;
     $configfile{$variable}=$value;
-  }
  }
  
  my $biblionumber=$query->param('bib');
  my $type='intra';
  
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
  my $dat=bibdata($biblionumber);
  my ($authorcount, $addauthor)= &addauthor($biblionumber);
--- 46,67 ----
     $value=~s/\s*$//g;
     $configfile{$variable}=$value;
  }
+ }	
  
  my $biblionumber=$query->param('bib');
  my $type='intra';
  
+ 
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
+ my $norequests = 1;
+ foreach my $itm (@items) {
+      $norequests = 0 unless $itm->{'notforloan'};
+ }
+ 
+ warn "Biblionumber: $biblionumber";
+ warn "Norequests: $norequests"; 
+ 
+ 
  my $dat=bibdata($biblionumber);
  my ($authorcount, $addauthor)= &addauthor($biblionumber);
***************
*** 101,104 ****
--- 111,115 ----
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
+ $template->param(norequests => $norequests);
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray);




From finlayt at users.sourceforge.net  Mon Aug 19 07:39:03 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 22:39:03 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue detail.tmpl,1.4.4.3,1.4.4.4
Message-ID: <E17gfFn-0005Pq-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv20654

Modified Files:
      Tag: rel-1-2
	detail.tmpl 
Log Message:

Added an if loop to check the "norequests" variable so as to decide whether to put the Requests button. See detail.pl



Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/detail.tmpl,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -C2 -r1.4.4.3 -r1.4.4.4
*** detail.tmpl	31 Jul 2002 04:59:13 -0000	1.4.4.3
--- detail.tmpl	19 Aug 2002 05:39:01 -0000	1.4.4.4
***************
*** 1,4 ****
  <TMPL_INCLUDE NAME="cat-top.inc">
- <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <TMPL_IF NAME="loggedinuser">
--- 1,3 ----
***************
*** 9,15 ****
  
  
! 
  <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
  src="/images/requests.gif" align="right" border="0"></a>
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
  <TMPL_VAR NAME="class"></em></font><p>
--- 8,18 ----
  
  
! <TMPL_IF NAME="norequests">
! <TMPL_ELSE>
  <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
  src="/images/requests.gif" align="right" border="0"></a>
+ </TMPL_IF>
+ <TMPL_LOOP NAME="BIBLIO_RESULTS">
+ 
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
  <TMPL_VAR NAME="class"></em></font><p>
***************
*** 20,23 ****
--- 23,29 ----
  <td bgcolor="#cccc99" background="/images/background-mem.gif">
  <b>BIBLIO RECORD</b>
+ 
+ 
+ 
  
  <TMPL_VAR NAME="biblionumber">




From rangi at users.sourceforge.net  Mon Aug 19 08:20:50 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 18 Aug 2002 23:20:50 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.8,1.18.2.9
Message-ID: <E17gfuE-0007bY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv29203/C4

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
Fix for item search


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
diff -C2 -r1.18.2.8 -r1.18.2.9
*** Search.pm	15 Aug 2002 02:04:59 -0000	1.18.2.8
--- Search.pm	19 Aug 2002 06:20:48 -0000	1.18.2.9
***************
*** 106,112 ****
  #  }
    my ($count, at results);
! #  print STDERR "Doing a search \n";
    if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''){
!         print STDERR "Doing a precise search\n";
      ($count, at results)=CatSearch($env,'precise',$search,$num,$offset);
  
--- 106,112 ----
  #  }
    my ($count, at results);
! #  print STDERR "Doing a search $search->{'itemnumber'} $search->{'isbn'}\n";
    if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''){
! #        print STDERR "Doing a precise search $search->{'itemnumber'}\n";
      ($count, at results)=CatSearch($env,'precise',$search,$num,$offset);
  
***************
*** 663,669 ****
    if ($type eq 'precise'){
        
!       if ($search->{'item'} ne ''){
          $query="select * from items,biblio ";
!         my $search2=uc $search->{'item'};
          $query=$query." where 
          items.biblionumber=biblio.biblionumber 
--- 663,669 ----
    if ($type eq 'precise'){
        
!       if ($search->{'itemnumber'} ne ''){
          $query="select * from items,biblio ";
!         my $search2=uc $search->{'itemnumber'};
          $query=$query." where 
          items.biblionumber=biblio.biblionumber 
***************
*** 697,701 ****
        }
    }
! #print $query;
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){   
--- 697,701 ----
        }
    }
! #print STDERR $query;
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){   




From rangi at users.sourceforge.net  Mon Aug 19 08:21:45 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 18 Aug 2002 23:21:45 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/catalogue index.html,1.6.4.1,1.6.4.2
Message-ID: <E17gfv7-0007fM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv29454/intranet-html/catalogue

Modified Files:
      Tag: rel-1-2
	index.html 
Log Message:
Fix for item search


Index: index.html
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/catalogue/index.html,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -r1.6.4.1 -r1.6.4.2
*** index.html	11 Jul 2002 18:00:18 -0000	1.6.4.1
--- index.html	19 Aug 2002 06:21:43 -0000	1.6.4.2
***************
*** 17,21 ****
  
  <TR VALIGN=TOP>
! <TD>Item Number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="item"></td><td> <b> &nbsp; &nbsp; OR</b></TD></TR>
  <!-- <TR VALIGN=TOP>
  <TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
--- 17,21 ----
  
  <TR VALIGN=TOP>
! <TD>Item Number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td><td> <b> &nbsp; &nbsp; OR</b></TD></TR>
  <!-- <TR VALIGN=TOP>
  <TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>




From finlayt at users.sourceforge.net  Mon Aug 19 08:29:38 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:29:38 -0700
Subject: [Koha-cvs] CVS: koha detail.pl,1.11,1.12
Message-ID: <E17gg2k-00086A-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv30794

Modified Files:
	detail.pl 
Log Message:

fixed up the CheckReserves.pm routine so that it does not put Referece items into "waiting" status if there is a reserve. Also fixed a bug in detail.pl.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** detail.pl	19 Aug 2002 05:37:15 -0000	1.11
--- detail.pl	19 Aug 2002 06:29:36 -0000	1.12
***************
*** 60,63 ****
--- 60,64 ----
  }
  
+ 
  warn "Biblionumber: $biblionumber";
  warn "Norequests: $norequests"; 
***************
*** 70,73 ****
--- 71,75 ----
  
  $dat->{'count'}=@items;
+ $dat->{'norequests'} = $norequests;
  
  $dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 111,115 ****
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
- $template->param(norequests => $norequests);
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray);
--- 113,116 ----




From finlayt at users.sourceforge.net  Mon Aug 19 08:29:38 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:29:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.14,1.15
Message-ID: <E17gg2k-00086F-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv30794/C4

Modified Files:
	Reserves2.pm 
Log Message:

fixed up the CheckReserves.pm routine so that it does not put Referece items into "waiting" status if there is a reserve. Also fixed a bug in detail.pl.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Reserves2.pm	15 Aug 2002 03:31:02 -0000	1.14
--- Reserves2.pm	19 Aug 2002 06:29:36 -0000	1.15
***************
*** 103,111 ****
      my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("select biblionumber, biblioitemnumber from items where itemnumber=$qitem");
      $sth->execute;
!     my ($biblio, $bibitem) = $sth->fetchrow_array;
      $sth->finish;
      $dbh->disconnect;
  # get the reserves...
      my ($count, @reserves) = Findgroupreserve($bibitem, $biblio);
--- 103,118 ----
      my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
!                              FROM items, biblioitems, itemtypes 
!                             WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
!                               AND biblioitems.itemtype = itemtypes.itemtype
!                               AND itemnumber=$qitem");
      $sth->execute;
!     my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;
      $sth->finish;
      $dbh->disconnect;
+ # if item is not for loan it cannot be reserved either.....
+ warn "Not for loan: $notforloan";
+     return (0, 0) if ($notforloan);
  # get the reserves...
      my ($count, @reserves) = Findgroupreserve($bibitem, $biblio);




From finlayt at users.sourceforge.net  Mon Aug 19 08:30:28 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:30:28 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue detail.tmpl,1.4.4.4,1.4.4.5
Message-ID: <E17gg3Y-0008BX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv31392

Modified Files:
      Tag: rel-1-2
	detail.tmpl 
Log Message:

little bug fix



Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/detail.tmpl,v
retrieving revision 1.4.4.4
retrieving revision 1.4.4.5
diff -C2 -r1.4.4.4 -r1.4.4.5
*** detail.tmpl	19 Aug 2002 05:39:01 -0000	1.4.4.4
--- detail.tmpl	19 Aug 2002 06:30:26 -0000	1.4.4.5
***************
*** 1,3 ****
--- 1,4 ----
  <TMPL_INCLUDE NAME="cat-top.inc">
+ <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <TMPL_IF NAME="loggedinuser">
***************
*** 13,17 ****
  src="/images/requests.gif" align="right" border="0"></a>
  </TMPL_IF>
- <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
--- 14,17 ----




From dragon28 at users.sourceforge.net  Mon Aug 19 09:44:03 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Mon, 19 Aug 2002 00:44:03 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue searchresults.tmpl,1.4.4.2,1.4.4.3
Message-ID: <E17ghCl-00041K-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv15416/koha-html/intranet-html/includes/templates/default/catalogue

Modified Files:
      Tag: rel-1-2
	searchresults.tmpl 
Log Message:
fix for prev and next icons

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/searchresults.tmpl,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -C2 -r1.4.4.2 -r1.4.4.3
*** searchresults.tmpl	25 Jul 2002 04:06:24 -0000	1.4.4.2
--- searchresults.tmpl	19 Aug 2002 07:44:01 -0000	1.4.4.3
***************
*** 29,33 ****
      <!-- Row of numbers corresponding to search result pages -->
      <TMPL_IF NAME=displayprev>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
--- 29,33 ----
      <!-- Row of numbers corresponding to search result pages -->
      <TMPL_IF NAME=displayprev>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
***************
*** 37,45 ****
  	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
  	<TMPL_ELSE>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
  	</TMPL_IF>
      </TMPL_LOOP>
      <TMPL_IF NAME=displaynext>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
--- 37,45 ----
  	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
  	<TMPL_ELSE>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
  	</TMPL_IF>
      </TMPL_LOOP>
      <TMPL_IF NAME=displaynext>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>




From dragon28 at users.sourceforge.net  Tue Aug 20 11:18:16 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:18:16 -0700
Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.1.2.4,1.1.2.5
Message-ID: <E17h59U-0005Tl-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21038/koha/admin

Modified Files:
      Tag: rel-1-2
	branches.pl 
Log Message:
fixed image alt tag

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** branches.pl	25 Jun 2002 09:22:43 -0000	1.1.2.4
--- branches.pl	20 Aug 2002 09:18:13 -0000	1.1.2.5
***************
*** 274,278 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 274,278 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add branch\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:26:12 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:26:12 -0700
Subject: [Koha-cvs] CVS: koha/admin currency.pl,1.1.2.2,1.1.2.3
Message-ID: <E17h5HA-00060Z-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23072/koha/admin

Modified Files:
      Tag: rel-1-2
	currency.pl 
Log Message:
fixed image alt tag

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** currency.pl	24 Jun 2002 18:38:36 -0000	1.1.2.2
--- currency.pl	20 Aug 2002 09:26:10 -0000	1.1.2.3
***************
*** 248,252 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 248,252 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add currency\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:28:28 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:28:28 -0700
Subject: [Koha-cvs] CVS: koha/admin printers.pl,1.1.2.3,1.1.2.4
Message-ID: <E17h5JM-000697-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23603/koha/admin

Modified Files:
      Tag: rel-1-2
	printers.pl 
Log Message:
fixed image alt tag

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** printers.pl	25 Jun 2002 11:00:49 -0000	1.1.2.3
--- printers.pl	20 Aug 2002 09:28:26 -0000	1.1.2.4
***************
*** 239,243 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 239,243 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add printer\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:30:27 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:30:27 -0700
Subject: [Koha-cvs] CVS: koha/admin stopwords.pl,1.1.2.3,1.1.2.4
Message-ID: <E17h5LH-0006HL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24112/koha/admin

Modified Files:
      Tag: rel-1-2
	stopwords.pl 
Log Message:
fixed image alt tag

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** stopwords.pl	25 Jun 2002 10:52:37 -0000	1.1.2.3
--- stopwords.pl	20 Aug 2002 09:30:25 -0000	1.1.2.4
***************
*** 228,232 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 228,232 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add stopword\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:33:00 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:33:00 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.1.2.2,1.1.2.3
Message-ID: <E17h5Nk-0006SS-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24792/koha/admin

Modified Files:
      Tag: rel-1-2
	systempreferences.pl 
Log Message:
fixed image alt tag

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** systempreferences.pl	24 Jun 2002 18:38:36 -0000	1.1.2.2
--- systempreferences.pl	20 Aug 2002 09:32:58 -0000	1.1.2.3
***************
*** 239,243 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 239,243 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add parameter\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From finlayt at users.sourceforge.net  Wed Aug 21 00:40:14 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 15:40:14 -0700
Subject: [Koha-cvs] CVS: koha/C4 Print.pm,1.8,1.9
Message-ID: <E17hHfa-0005uL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv22265/C4

Modified Files:
	Print.pm 
Log Message:

removed the printreserve routine. It has been replaced by printslip.


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Print.pm	14 Aug 2002 18:12:51 -0000	1.8
--- Print.pm	20 Aug 2002 22:40:12 -0000	1.9
***************
*** 72,114 ****
  }
  
- sub printreserve {
-   my($env, $branchname, $bordata, $itemdata)=@_;
-   my $file=time;
-   my $printer = $env->{'printer'};
-   if ($printer eq "" || $printer eq 'nulllp') {
-     open (PRINTER,">>/tmp/kohares");
-   } else {
-     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
-   }
-   my @da = localtime(time());
-   my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
- 
- #(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
-   my $slip = <<"EOF";
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Date: $todaysdate;
- 
- ITEM RESERVED: 
- $itemdata->{'title'} ($itemdata->{'author'})
- barcode: $itemdata->{'barcode'}
- 
- COLLECT AT: $branchname
- 
- BORROWER:
- $bordata->{'surname'}, $bordata->{'firstname'}
- card number: $bordata->{'cardnumber'}
- Phone: $bordata->{'phone'}
- $bordata->{'streetaddress'}
- $bordata->{'suburb'}
- $bordata->{'town'}
- $bordata->{'emailaddress'}
- 
- 
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- EOF
-     print PRINTER $slip;
-   close PRINTER;
-   return $slip;
- }
  
  sub printslip {
--- 72,75 ----




From finlayt at users.sourceforge.net  Wed Aug 21 03:31:20 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 18:31:20 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.15,1.16
Message-ID: <E17hKLA-00012J-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv3804/C4

Modified Files:
	Reserves2.pm 
Log Message:

Fixed a bug in the reordering priorities in FillReserve and andother different bug in CheckReserves.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Reserves2.pm	19 Aug 2002 06:29:36 -0000	1.15
--- Reserves2.pm	21 Aug 2002 01:31:16 -0000	1.16
***************
*** 99,103 ****
  sub CheckReserves {
      my ($item) = @_;
!     warn "In CheckReserves";
      my $dbh=C4Connect;
      my $qitem=$dbh->quote($item);
--- 99,103 ----
  sub CheckReserves {
      my ($item) = @_;
!     warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
      my $qitem=$dbh->quote($item);
***************
*** 113,117 ****
      $dbh->disconnect;
  # if item is not for loan it cannot be reserved either.....
- warn "Not for loan: $notforloan";
      return (0, 0) if ($notforloan);
  # get the reserves...
--- 113,116 ----
***************
*** 130,133 ****
--- 129,134 ----
  	    }
  	}
+     }
+     if ($highest) {
  	$highest->{'itemnumber'} = $item;
  	return ("Reserved", $highest);
***************
*** 159,163 ****
  	my $q_biblio = $dbh->quote($biblio);
  	$borr = $dbh->quote($borr);
! # fix up the priorities on the other records....
  	my $query = "SELECT priority FROM reserves 
                                      WHERE biblionumber   = $q_biblio 
--- 160,164 ----
  	my $q_biblio = $dbh->quote($biblio);
  	$borr = $dbh->quote($borr);
! # get the prioritiy on this record....
  	my $query = "SELECT priority FROM reserves 
                                      WHERE biblionumber   = $q_biblio 
***************
*** 190,197 ****
      my ($res) = @_;
      my $dbh=C4Connect;
! # removing a waiting reserve record....
      my $biblio = $res->{'biblionumber'}; my $qbiblio = $dbh->quote($biblio);
      my $borr = $res->{'borrowernumber'}; $borr = $dbh->quote($borr);
      my $resdate = $res->{'reservedate'}; $resdate = $dbh->quote($resdate);
  # update the database...
      my $query = "UPDATE reserves SET found            = 'F', 
--- 191,207 ----
      my ($res) = @_;
      my $dbh=C4Connect;
! # fillinf a reserve record....
      my $biblio = $res->{'biblionumber'}; my $qbiblio = $dbh->quote($biblio);
      my $borr = $res->{'borrowernumber'}; $borr = $dbh->quote($borr);
      my $resdate = $res->{'reservedate'}; $resdate = $dbh->quote($resdate);
+ # get the prioritiy on this record....
+     my $query = "SELECT priority FROM reserves 
+                                 WHERE biblionumber   = $qbiblio 
+                                   AND borrowernumber = $borr
+                                   AND reservedate    = $resdate)";
+     my $sth=$dbh->prepare($query);
+     $sth->execute;
+     my ($priority) = $sth->fetchrow_array;
+     $sth->finish;
  # update the database...
      my $query = "UPDATE reserves SET found            = 'F', 
***************
*** 203,206 ****
--- 213,220 ----
      $sth->execute;
      $sth->finish;
+ # now fix the priority on the others (if the priority wasnt already sorted!)....
+     unless ($priority == 0) {
+ 	fixpriority($priority, $biblio);
+     }
      $dbh->disconnect;
  }




From finlayt at users.sourceforge.net  Wed Aug 21 03:40:49 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 18:40:49 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.39,1.40
Message-ID: <E17hKUL-0001VB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv5667/circ

Modified Files:
	circulation.pl 
Log Message:

Fixed a little bug so that flags get recalculated after an item is issued.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** circulation.pl	16 Aug 2002 20:46:40 -0000	1.39
--- circulation.pl	21 Aug 2002 01:40:47 -0000	1.40
***************
*** 102,106 ****
  
  
! # get the currently issued books......
  my $borrower;
  my $flags;
--- 102,106 ----
  
  
! # get the borrower information.....
  my $borrower;
  my $flags;
***************
*** 121,125 ****
  
  
! # if the barcode is set
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
--- 121,125 ----
  
  
! 
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
***************
*** 128,132 ****
  my $day=$query->param('day');
  
! 
  if ($barcode) {
      $barcode = cuecatbarcodedecode($barcode);
--- 128,132 ----
  my $day=$query->param('day');
  
! # if the barcode is set
  if ($barcode) {
      $barcode = cuecatbarcodedecode($barcode);
***************
*** 140,143 ****
--- 140,148 ----
                       = issuebook(\%env, $borrower, $barcode, \%responses, $date);
      }
+ }
+ 
+ # reload the borrower info for the sake of reseting the flags.....
+ if ($borrowernumber) {
+     ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
  }
  




From finlayt at users.sourceforge.net  Wed Aug 21 04:42:56 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:42:56 -0700
Subject: [Koha-cvs] CVS: koha fixBranches.pl,NONE,1.1
Message-ID: <E17hLSS-0005AH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19714

Added Files:
	fixBranches.pl 
Log Message:

A little script for performing changes to the branch fields on items. This script runs over the database.


--- NEW FILE ---
#!/usr/bin/perl

# script to fix all the branch settings in the items table of the koha database.

use strict;
use DBI;
use C4::Database;

# This script makes the following substitutions.
# on homebranch field:
my $home_default = 'C';
my %home = ( 'F'  => 'FP' ,
	     'FM' => 'FP' ,
	     'M'  => 'C'  ,
	     'P'  => 'C'  ,
	     'S'  => 'SP' ,
	     'T'  => 'C'  ,
	     'TR' => 'C'  ,
	     'I'  => 'C'  ,
	     'D'  => 'C'  ,
	     'L'  => 'LP' ,
	     'FP' => 'FP' ,
	     'SP' => 'SP' ,
	     'LP' => 'LP' ,
	     'C'  => 'C' );

# on holdingbranch field:
my $hold_default = 'L';
my %hold = ( 'F'  => 'F' ,
	     'FM' => 'FM' ,
	     'M'  => 'M'  ,
	     'P'  => 'P'  ,
	     'S'  => 'S' ,
	     'T'  => 'T'  ,
	     'TR' => 'TR'  ,
	     'I'  => 'I'  ,
	     'D'  => 'D'  ,
	     'L'  => 'L' ,
	     'FP' => 'F' ,
	     'C'  => 'L' ,
	     'SP' => 'S' ,
	     'LP' => 'L' );


# do the substitutions.....
my $dbh = &C4Connect;           

my $sth = $dbh->prepare("SELECT barcode, holdingbranch, homebranch FROM items");
$sth->execute();

my $today = localtime(time());
print "Output from fixBranches.pl   $today \n\n";

while (my $item = $sth->fetchrow_hashref) {
    my $oldhold = $item->{'holdingbranch'};
    my $newhold = $hold{$oldhold} ? $hold{$oldhold} : $hold_default ;
    if ($oldhold ne $newhold) {
	my $uth = $dbh->prepare("UPDATE items SET holdingbranch = ? WHERE barcode = ?");
	$uth->execute($newhold, $item->{'barcode'});
	print "$item->{'barcode'} : Holding branch setting changed from $oldhold -> $newhold \n";
	$uth->finish;
    }
    my $oldhome = $item->{'homebranch'};
    my $newhome = $home{$oldhome} ? $home{$oldhome} : $home_default ;
    if ($oldhome ne $newhome) {
	my $uth = $dbh->prepare("UPDATE items SET homebranch = ? WHERE barcode = ?");
	$uth->execute($newhome, $item->{'barcode'});
	print "$item->{'barcode'} : Home branch setting changed from $oldhome -> $newhome \n";
	$uth->finish;
    }
}

print "\nFinished output from fixbranches.pl\n";

$dbh->disconnect;




From finlayt at users.sourceforge.net  Wed Aug 21 04:45:32 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:45:32 -0700
Subject: [Koha-cvs] CVS: koha placerequest.pl,1.2,1.3 request.pl,1.9,1.10
Message-ID: <E17hLUy-0005IV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20314

Modified Files:
	placerequest.pl request.pl 
Log Message:

minor changes to comments etc....


Index: placerequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/placerequest.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** placerequest.pl	14 Aug 2002 18:12:51 -0000	1.2
--- placerequest.pl	21 Aug 2002 02:45:30 -0000	1.3
***************
*** 43,57 ****
  my $bornum=borrdata($borrower,'');
  if ($type eq 'str8' && $bornum ne ''){
! my $count=@bibitems;
! @bibitems=sort @bibitems;
! my $i2=1;
! my @realbi;
! $realbi[0]=$bibitems[0];
  for (my $i=1;$i<$count;$i++){
!   my $i3=$i2-1;
!   if ($realbi[$i3] ne $bibitems[$i]){
!     $realbi[$i2]=$bibitems[$i];
!     $i2++;
!   }
  }
  #print $input->dump;
--- 43,57 ----
  my $bornum=borrdata($borrower,'');
  if ($type eq 'str8' && $bornum ne ''){
!     my $count=@bibitems;
!     @bibitems=sort @bibitems;
!     my $i2=1;
!     my @realbi;
!     $realbi[0]=$bibitems[0];
  for (my $i=1;$i<$count;$i++){
!     my $i3=$i2-1;
!     if ($realbi[$i3] ne $bibitems[$i]){
! 	$realbi[$i2]=$bibitems[$i];
! 	$i2++;
!     }
  }
  #print $input->dump;

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** request.pl	14 Aug 2002 18:12:51 -0000	1.9
--- request.pl	21 Aug 2002 02:45:30 -0000	1.10
***************
*** 71,75 ****
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     if ($data[$i]->{'renewalsallowed'}){
  	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
  	if ($data[$i]->{'dewey'} == 0){
--- 71,75 ----
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     unless ($data[$i]->{'notforloan'}){
  	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
  	if ($data[$i]->{'dewey'} == 0){




From finlayt at users.sourceforge.net  Wed Aug 21 04:45:32 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:45:32 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.33,1.34
Message-ID: <E17hLUy-0005Ic-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv20314/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

minor changes to comments etc....


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Circ2.pm	15 Aug 2002 03:27:28 -0000	1.33
--- Circ2.pm	21 Aug 2002 02:45:30 -0000	1.34
***************
*** 205,208 ****
--- 205,209 ----
  	my $itemtype=$sth->fetchrow_hashref;
  	$iteminformation->{'loanlength'}=$itemtype->{'loanlength'};
+ 	$iteminformation->{'notforloan'}=$itemtype->{'notforloan'};
  	$sth->finish;
      }
***************
*** 340,344 ****
  	}
  	if ($iteminformation->{'notforloan'} == 1) {
! 	    $rejected="Item not for loan.";
  	    last SWITCH;
  	}
--- 341,345 ----
  	}
  	if ($iteminformation->{'notforloan'} == 1) {
! 	    $rejected="Reference item: not for loan.";
  	    last SWITCH;
  	}
***************
*** 349,356 ****
  	if ($iteminformation->{'restricted'} == 1) {
  	    $rejected="Restricted item.";
- 	    last SWITCH;
- 	}
- 	if ($iteminformation->{'itemtype'} eq 'REF') {
- 	    $rejected="Reference item:  Not for loan.";
  	    last SWITCH;
  	}
--- 350,353 ----




From finlayt at users.sourceforge.net  Wed Aug 21 05:54:41 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 20:54:41 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.15,1.16
Message-ID: <E17hMZt-00013P-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv3858/circ

Modified Files:
	returns.pl 
Log Message:

Fixed up some of the messaging stuff.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** returns.pl	16 Aug 2002 20:46:40 -0000	1.15
--- returns.pl	21 Aug 2002 03:54:39 -0000	1.16
***************
*** 91,94 ****
--- 91,95 ----
      my $borrnum = $query->param('borrowernumber');
      my $resbarcode = $query->param('resbarcode');
+ # set to waiting....
      my $tobranchcd = ReserveWaiting($item, $borrnum);
      my $branchname = $branches->{$tobranchcd}->{'branchname'};
***************
*** 125,140 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
-     $returneditems{0} = $barcode;
      $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
!     } else {
! 	$riborrowernumber{0} = 0;
  	$riduedate{0} = 0;
  	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
! 	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
--- 126,147 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
      $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
+ 	$returneditems{0} = $barcode;
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
!     } elsif (! $messages->{'BadBarcode'}) {
! 	$returneditems{0} = $barcode;
  	$riduedate{0} = 0;
  	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
! 	if ($messages->{'wthdrawn'}) {
! 	    $ritext.= "<input type=hidden name=bn-0 value='Item Cancelled'>\n";
! 	    $riborrowernumber{0} = 'Item Cancelled';
! 	} else {
! 	    $ritext.= "<input type=hidden name=bn-0 value='&nbsp;'>\n";
! 	    $riborrowernumber{0} = '&nbsp;';
! 	}
      }
  }
***************
*** 283,288 ****
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
!     if ($code eq 'wthdrawm'){
! 	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
      }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
--- 290,296 ----
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
!     if ($code eq 'wthdrawn'){
! 	$messagetext = "<font color='red' size='+2'> Item Cancelled. </font> <br>";
! 	last;
      }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
***************
*** 394,397 ****
--- 402,406 ----
  	my $duedate = $riduedate{$_};
  	my $overduetext;
+         my $borrowerinfo;
  	if ($duedate) {
  	    my @tempdate = split ( /-/ , $duedate ) ;
***************
*** 402,415 ****
  	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
  	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
          } else {
!             $overduetext = "Not on loan.";
! 	}
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
! 	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
! 	    $borrowerinfo = "Not on loan.";
  	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
--- 411,419 ----
  	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
  	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
+ 	    my ($borrower) = getpatroninformation(\%env, $riborrowernumber{$_}, 0);
+             $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
          } else {
!             $overduetext = "Not on Issue.";
! 	    $borrowerinfo = $riborrowernumber{$_};
  	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
***************
*** 437,443 ****
--- 441,456 ----
  print startmenu('circulation');
  
+ 
+ #debug
+ #    foreach my $key (keys %$messages) {
+ #	print "$key : $messages->{$key}<br>";
+ #    }
+ 
+ 
  print <<"EOF";
  $links
  $title
+ 
+ 
  <table cellpadding=5 cellspacing=0 width=100%>
  EOF




From finlayt at users.sourceforge.net  Wed Aug 21 06:29:06 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:29:06 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.16,1.17
Message-ID: <E17hN7C-0002li-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv10493/circ

Modified Files:
	returns.pl 
Log Message:

turned of the branchtransfer when an item is set to "waiting".



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** returns.pl	21 Aug 2002 03:54:39 -0000	1.16
--- returns.pl	21 Aug 2002 04:29:03 -0000	1.17
***************
*** 100,104 ****
      printslip(\%env, $slip);
      if ($tobranchcd ne $branch) {
! 	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
  	$reservetext .= <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>
--- 100,104 ----
      printslip(\%env, $slip);
      if ($tobranchcd ne $branch) {
! #	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
  	$reservetext .= <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>




From finlayt at users.sourceforge.net  Wed Aug 21 06:31:27 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:31:27 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.10,1.11
Message-ID: <E17hN9T-0002st-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv10938

Modified Files:
	request.pl 
Log Message:

Changed the display of lost, long overdue, reference, and cancelled items.



Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** request.pl	21 Aug 2002 02:45:30 -0000	1.10
--- request.pl	21 Aug 2002 04:31:25 -0000	1.11
***************
*** 71,88 ****
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     unless ($data[$i]->{'notforloan'}){
! 	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
! 	if ($data[$i]->{'dewey'} == 0){
! 	    $data[$i]->{'dewey'}="";
! 	}
! 	$data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
! 	$data[$i]->{'dewey'}=~ s/\.0000$//;
! 	$data[$i]->{'dewey'}=~ s/00$//;
! 	my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
! 	$bibitemrows .= <<"EOF";
  <tr VALIGN=TOP>
! <TD><input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}>
! <input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>
! </td>
  <TD>$data[$i]->{'description'}</td>
  <TD>$class</td>
--- 71,97 ----
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
! 	$data[$i]->{'dewey'}="";
!     }
!     $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
!     $data[$i]->{'dewey'}=~ s/\.0000$//;
!     $data[$i]->{'dewey'}=~ s/00$//;
!     my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
!     my $select;
!     if ($data[$i]->{'notforloan'}) {
! 	$select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
! 	$select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
! 	$select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
! 	$select = "Item Cancelled";
!     } else {
! 	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
!     }
!     $bibitemrows .= <<"EOF";
  <tr VALIGN=TOP>
! <TD>$select</td>
  <TD>$data[$i]->{'description'}</td>
  <TD>$class</td>
***************
*** 94,99 ****
  </tr>
  EOF
-     }
  }
  
  
--- 103,108 ----
  </tr>
  EOF
  }
+ 
  
  




From finlayt at users.sourceforge.net  Wed Aug 21 06:35:15 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:35:15 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.17,1.18
Message-ID: <E17hND9-000339-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv11617/circ

Modified Files:
	returns.pl 
Log Message:

fixed bug caused by last commit



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** returns.pl	21 Aug 2002 04:29:03 -0000	1.17
--- returns.pl	21 Aug 2002 04:35:13 -0000	1.18
***************
*** 92,95 ****
--- 92,96 ----
      my $resbarcode = $query->param('resbarcode');
  # set to waiting....
+     my $iteminfo = getiteminformation(\%env, $item);
      my $tobranchcd = ReserveWaiting($item, $borrnum);
      my $branchname = $branches->{$tobranchcd}->{'branchname'};




From finlayt at users.sourceforge.net  Thu Aug 22 04:32:01 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 19:32:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.34,1.35
Message-ID: <E17hhlR-00025z-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7872/C4

Modified Files:
	Search.pm 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items can be reserved.


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** Search.pm	15 Aug 2002 02:02:40 -0000	1.34
--- Search.pm	22 Aug 2002 02:31:58 -0000	1.35
***************
*** 1438,1457 ****
      my ($bibnum) = @_;
      my $dbh   = C4Connect;
!     my $query = "Select * from biblioitems, itemtypes, items
! where biblioitems.biblionumber = '$bibnum'
! and biblioitems.itemtype = itemtypes.itemtype
! and biblioitems.biblioitemnumber = items.biblioitemnumber
! group by items.biblioitemnumber";
      my $sth   = $dbh->prepare($query);
      my $count = 0;
      my @results;
! 
!     $sth->execute;
! 
      while (my $data = $sth->fetchrow_hashref) {
          $results[$count] = $data;
          $count++;
!     } # while
!     
      $sth->finish;
      $dbh->disconnect;
--- 1438,1455 ----
      my ($bibnum) = @_;
      my $dbh   = C4Connect;
!     my $query = "SELECT biblioitems.*, itemtypes.*, MIN(items.itemlost) as itemlost
!                           FROM biblioitems, itemtypes, items
!                          WHERE biblioitems.biblionumber     = ?
!                            AND biblioitems.itemtype         = itemtypes.itemtype
!                            AND biblioitems.biblioitemnumber = items.biblioitemnumber
!                       GROUP BY items.biblioitemnumber";
      my $sth   = $dbh->prepare($query);
      my $count = 0;
      my @results;
!     $sth->execute($bibnum);
      while (my $data = $sth->fetchrow_hashref) {
          $results[$count] = $data;
          $count++;
!     } # while    
      $sth->finish;
      $dbh->disconnect;
***************
*** 1459,1484 ****
  } # sub bibitems
  
- 
  sub barcodes{
!   #called from request.pl
!   my ($biblioitemnumber)=@_;
!   my $dbh=C4Connect;
!   my $query="Select barcode from items where
!    biblioitemnumber='$biblioitemnumber'
!    and ((itemlost <> 1 and itemlost <> 2) or itemlost is NULL) and
!    (wthdrawn <> 1 or wthdrawn is NULL)";
! 
!   my $sth=$dbh->prepare($query);
!   $sth->execute;
!   my @barcodes;
!   my $i=0;
!   while (my $data=$sth->fetchrow_hashref){
!     $barcodes[$i]=$data->{'barcode'};
!     $i++;
!   }
!   $sth->finish;
!   $dbh->disconnect;
!   return(@barcodes);
!   
  }
  
--- 1457,1478 ----
  } # sub bibitems
  
  sub barcodes{
!     #called from request.pl
!     my ($biblioitemnumber)=@_;
!     my $dbh=C4Connect;
!     my $query="SELECT barcode, itemlost FROM items
!                            WHERE biblioitemnumber = ?
!                              AND (wthdrawn <> 1 OR wthdrawn IS NULL)";
!     my $sth=$dbh->prepare($query);
!     $sth->execute($biblioitemnumber);
!     my @barcodes;
!     my $i=0;
!     while (my $data=$sth->fetchrow_hashref){
! 	$barcodes[$i]=$data;
! 	$i++;
!     }
!     $sth->finish;
!     $dbh->disconnect;
!     return(@barcodes);
  }
  




From finlayt at users.sourceforge.net  Thu Aug 22 04:32:01 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 19:32:01 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.11,1.12
Message-ID: <E17hhlR-000260-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv7872

Modified Files:
	request.pl 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items can be reserved.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** request.pl	21 Aug 2002 04:31:25 -0000	1.11
--- request.pl	22 Aug 2002 02:31:58 -0000	1.12
***************
*** 70,78 ****
  my ($count2, at data) = bibitems($bib);
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
! 	$data[$i]->{'dewey'}="";
      }
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 70,88 ----
  my ($count2, at data) = bibitems($bib);
  my $bibitemrows = "";
+ 
+ 
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     my $barcodestext = "";
!     foreach my $num (@barcodes) {
! 	my $message = $num->{'itemlost'} == 1 ? "(lost)" :
! 	    $num->{'itemlost'} == 2 ? "(long overdue)" : "";
! 	$barcodestext .= "$num->{'barcode'} $message <br>";
      }
+     $barcodestext = substr($barcodestext, 0, -4);
+ 
+     $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
+ 
+     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
***************
*** 80,91 ****
      my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if ($data[$i]->{'notforloan'}) {
! 	$select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
! 	$select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
! 	$select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
! 	$select = "Item Cancelled";
      } else {
  	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
--- 90,97 ----
      my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1)
! 	|| ($data[$i]->{'itemlost'} == 2))  {
! 	$select = "Cannot be reserved.";
      } else {
  	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
***************
*** 97,104 ****
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
- <td>$data[$i]->{'isbn'}</td>
- <td>$dat->{'copyrightdate'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>@barcodes</td>
  </tr>
  EOF
--- 103,108 ----
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>$barcodestext</td>
  </tr>
  EOF
***************
*** 139,146 ****
  	$rank = "<select name=rank-request>$prioropt<option value=del>Del</select>";
  	$pickup = "<select name=pickup>$bropt</select>";
-         $change = "<select name=itemtype>
-                    <option value=next>Next Available
-                    <option value=change>Change Selection
-                    <option value=nc >No Change</select>";
      }
      $existingreserves .= <<"EOF";
--- 143,146 ----
***************
*** 156,160 ****
  <TD>$pickup</td>
  <TD>$type</td>
- <TD>$change</td>
  </tr>
  EOF
--- 156,159 ----
***************
*** 254,259 ****
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Classification</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Volume</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>ISBN</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copyright</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pubdate</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copies</b></TD>
--- 253,256 ----
***************
*** 284,288 ****
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pickup</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Request</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Change To</b></TD>
  </TR>
  $existingreserves
--- 281,284 ----




From finlayt at users.sourceforge.net  Thu Aug 22 05:06:35 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 20:06:35 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.5,1.6
Message-ID: <E17hiIt-0004fg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17818/admin

Modified Files:
	systempreferences.pl 
Log Message:

Fixed bug by cleaning out crud.


Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** systempreferences.pl	14 Aug 2002 18:12:53 -0000	1.5
--- systempreferences.pl	22 Aug 2002 03:06:33 -0000	1.6
***************
*** 220,226 ****
  	print mkheadr(2,'System preferences admin');
  	print mkformnotable("$script_name", at inputs);
! 	print <<printend
! printend
! 	;
  	if  ($searchfield ne '') {
  		print "You Searched for <b>$searchfield<b><p>";
--- 220,224 ----
  	print mkheadr(2,'System preferences admin');
  	print mkformnotable("$script_name", at inputs);
! 
  	if  ($searchfield ne '') {
  		print "You Searched for <b>$searchfield<b><p>";




From finlayt at users.sourceforge.net  Thu Aug 22 06:20:35 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 21:20:35 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.18,1.19
Message-ID: <E17hjSV-0000To-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1672/circ

Modified Files:
	returns.pl 
Log Message:

added another link on the "Reserve Found" flag.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** returns.pl	21 Aug 2002 04:35:13 -0000	1.18
--- returns.pl	22 Aug 2002 04:20:33 -0000	1.19
***************
*** 250,254 ****
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
--- 250,254 ----
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <a href=/cgi-bin/koha/detail.pl?bib=$iteminfo->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a> <br>
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>




From finlayt at users.sourceforge.net  Thu Aug 22 06:45:09 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 21:45:09 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.12,1.13
Message-ID: <E17hjqH-0001co-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv6110

Modified Files:
	request.pl 
Log Message:

another little tinker. long overdues are now requestable.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** request.pl	22 Aug 2002 02:31:58 -0000	1.12
--- request.pl	22 Aug 2002 04:45:07 -0000	1.13
***************
*** 84,88 ****
      $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
  
-     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 84,87 ----
***************
*** 91,96 ****
      my $select;
      if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1)
! 	|| ($data[$i]->{'itemlost'} == 2))  {
  	$select = "Cannot be reserved.";
      } else {
--- 90,94 ----
      my $select;
      if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1))  {
  	$select = "Cannot be reserved.";
      } else {




From finlayt at users.sourceforge.net  Fri Aug 23 03:56:06 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 22 Aug 2002 18:56:06 -0700
Subject: [Koha-cvs] CVS: koha/acqui finishreceive.pl,1.1.1.1.2.1,1.1.1.1.2.2
Message-ID: <E17i3gE-0005Mv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv20498/acqui

Modified Files:
      Tag: rel-1-2
	finishreceive.pl 
Log Message:

merged in the version 1.5 from the main branch



Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** finishreceive.pl	14 Jun 2002 21:20:27 -0000	1.1.1.1.2.1
--- finishreceive.pl	23 Aug 2002 01:56:04 -0000	1.1.1.1.2.2
***************
*** 15,19 ****
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblio=$input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
--- 15,19 ----
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblionumber = $input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
***************
*** 22,26 ****
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
- my $id=$input->param('id');
  my $bibitemno=$input->param('biblioitemnum');
  my $data=bibitemdata($bibitemno);
--- 22,25 ----
***************
*** 39,48 ****
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $series=$input->param('Series');
! my $bookseller=$input->param('bookseller');
! $id=$bookseller;
! my $title=$input->param('title');
! my $author=$input->param('author');
! my $copyright=$input->param('copyright');
  
  if ($quantrec != 0){
--- 38,50 ----
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $bookseller = $input->param('bookseller');
! my $id         = $bookseller;
! my $biblio = {
!     biblionumber  => $biblionumber,
!     title         => $input->param('title')?$input->param('title'):"",
!     author        => $input->param('author')?$input->param('author'):"",
!     copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
!     series        => $input->param('Series')?$input->param('Series'):""
! }; # my $biblio
  
  if ($quantrec != 0){
***************
*** 61,72 ****
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class);
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio,$title,$author,$copyright,$series);
!   modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
!   #print $notes;
    my $barcode=$input->param('barcode');
    my @barcodes;
--- 63,92 ----
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno = &newbiblioitem({
!       biblionumber   => $biblionumber,
!       itemtype       => $itemtype?$itemtype:"",
!       isbn           => $isbn?$isbn:"",
!       volumeddesc    => $volinf?$volinf:"",
!       classification => $class?$class:"" });
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio);
!   &modbibitem({
!       biblioitemnumber => $bibitemno,
!       itemtype         => $itemtype?$itemtype:"",
!       isbn             => $isbn?$isbn:"",
!       publisher        => $publisher?$publisher:"",
!       publicationyear  => $pubdate?$pubdate:"",
!       class            => $class?$class:"",
!       dewey            => $dewey?$dewey:"",
!       subclass         => $subclass?$subclass:"",
!       illus            => $illus?$illus:"",
!       pages            => $pages?$pages:"",
!       volumeddesc      => $volinf?$volinf:"",
!       notes            => $notes?$notes:"",
!       size             => $size?$size:"" });
! 
    my $barcode=$input->param('barcode');
    my @barcodes;
***************
*** 81,85 ****
    #  print $barcode;
    }
!   my ($error)=makeitems($quantrec,$bibitemno,$biblio,$replacement,$cost,$bookseller,$branch,$loan, at barcodes);
    if ($error eq ''){
      if ($itemtype ne 'PER'){
--- 101,113 ----
    #  print $barcode;
    }
!   my ($error) = newitems({ biblioitemnumber => $bibitemno,
! 	                   biblionumber     => $biblionumber,
! 	                   replacementprice => $replacement,
! 	                   price            => $cost,
! 	                   booksellerid     => $bookseller,
! 	                   homebranch       => $branch,
! 	                   loan             => $loan },
! 			 @barcodes);
! 
    if ($error eq ''){
      if ($itemtype ne 'PER'){
***************
*** 94,98 ****
  } else {
    print $input->header;
!   delorder($biblio,$ordnum);
         print $input->redirect("/acquisitions/");
  }
--- 122,126 ----
  } else {
    print $input->header;
!   delorder($biblionumber,$ordnum);
         print $input->redirect("/acquisitions/");
  }




From tonnesen at users.sourceforge.net  Mon Aug 26 19:08:58 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Mon, 26 Aug 2002 10:08:58 -0700
Subject: [Koha-cvs] CVS: koha admin-home.pl,1.1.2.1,1.1.2.2 catalogue-home.pl,1.1.2.1,1.1.2.2 groups.pl,1.1,1.1.2.1 members-home.pl,1.1.2.2,1.1.2.3 reports-home.pl,1.1.2.1,1.1.2.2
Message-ID: <E17jNMI-0008TU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv32358

Modified Files:
      Tag: rel-1-2
	admin-home.pl catalogue-home.pl groups.pl members-home.pl 
	reports-home.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/admin-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- admin-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,21 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/admin/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/admin/index.html";
  while (<H>) {
      print $_;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/catalogue-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** catalogue-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- catalogue-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,25 ****
  
  my $classlist='';
! open C, "/usr/local/koha/intranet/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "/usr/local/koha/intranet/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;
--- 21,29 ----
  
  my $classlist='';
! open C, "$intranetdir/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "$intranetdir/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** groups.pl	2 May 2001 23:06:44 -0000	1.1
--- groups.pl	26 Aug 2002 17:08:56 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,18 ----
  use C4::Print;
  use DBI;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
+ 
  
  my $input=new CGI;
***************
*** 214,218 ****
      $output= "<head><title>Overdue list for $groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img src=/usr/local/koha/librarian/htdocs/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';
--- 219,223 ----
      $output= "<head><title>Overdue list for $groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img src=/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/members-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** members-home.pl	27 Jul 2002 04:33:57 -0000	1.1.2.2
--- members-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.3
***************
*** 5,9 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
  
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  my $query = new CGI;
  my $flagsrequired;
***************
*** 18,22 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/members/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/members/index.html";
  while (<H>) {
      print $_;

Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/reports-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** reports-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- reports-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 16,20 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/reports/index.html";
  while (<H>) {
      print $_;
--- 20,24 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/reports/index.html";
  while (<H>) {
      print $_;




From tonnesen at users.sourceforge.net  Mon Aug 26 19:08:58 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Mon, 26 Aug 2002 10:08:58 -0700
Subject: [Koha-cvs] CVS: koha/admin templates.pl,1.1.2.1,1.1.2.2
Message-ID: <E17jNMI-0008TT-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32358/admin

Modified Files:
      Tag: rel-1-2
	templates.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: templates.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/Attic/templates.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** templates.pl	11 Jul 2002 18:05:29 -0000	1.1.2.1
--- templates.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 15,18 ****
--- 15,22 ----
  
  
+ my $configfile=configfile();
+ my $includes=$configfile->{'includes'};
+ 
+ 
  my $dbh=C4Connect();
  
***************
*** 34,38 ****
  
  my $templateoptions='';
! opendir D, "/usr/local/koha/intranet/htdocs/includes/templates";
  my @dirlist=readdir D;
  foreach (@dirlist) {
--- 38,42 ----
  
  my $templateoptions='';
! opendir D, "$includes/templates";
  my @dirlist=readdir D;
  foreach (@dirlist) {




From finlayt at users.sourceforge.net  Tue Aug 27 00:34:31 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Mon, 26 Aug 2002 15:34:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.16,1.17
Message-ID: <E17jSRL-0004qn-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv18350/C4

Modified Files:
	Reserves2.pm 
Log Message:

rewrote CheckReserves so that it can be called with a barcode as well as on itemnumber.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Reserves2.pm	21 Aug 2002 01:31:16 -0000	1.16
--- Reserves2.pm	26 Aug 2002 22:34:29 -0000	1.17
***************
*** 98,111 ****
  
  sub CheckReserves {
!     my ($item) = @_;
!     warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
!     my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
                               FROM items, biblioitems, itemtypes 
                              WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
                                AND biblioitems.itemtype = itemtypes.itemtype
                                AND itemnumber=$qitem");
      $sth->execute;
      my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;
--- 98,122 ----
  
  sub CheckReserves {
!     my ($item, $barcode) = @_;
! #    warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
!     my $sth;
!     if ($item) {
! 	my $qitem=$dbh->quote($item);
  # get the biblionumber...
! 	$sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
                               FROM items, biblioitems, itemtypes 
                              WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
                                AND biblioitems.itemtype = itemtypes.itemtype
                                AND itemnumber=$qitem");
+     } else {
+ 	my $qbc=$dbh->quote($barcode);
+ # get the biblionumber...
+ 	$sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
+                              FROM items, biblioitems, itemtypes 
+                             WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
+                               AND biblioitems.itemtype = itemtypes.itemtype
+                               AND barcode=$qbc");
+     }
      $sth->execute;
      my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;




From dragon28 at users.sourceforge.net  Tue Aug 27 07:10:29 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Mon, 26 Aug 2002 22:10:29 -0700
Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.1.2.5,1.1.2.6
Message-ID: <E17jYcX-0003Dm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12369/koha/admin

Modified Files:
      Tag: rel-1-2
	branches.pl 
Log Message:
small tidy up of branch table output

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** branches.pl	20 Aug 2002 09:18:13 -0000	1.1.2.5
--- branches.pl	27 Aug 2002 05:10:27 -0000	1.1.2.6
***************
*** 257,261 ****
  	  	}
  		print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
! 		$results->[$i]{'branchaddress1'}.$results->[$i]{'branchaddress2'}.$results->[$i]{'branchaddress3'},
  		$results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchemail'},,$results->[$i]{'issuing'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),
--- 257,261 ----
  	  	}
  		print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
! 		$results->[$i]{'branchaddress1'}." ".$results->[$i]{'branchaddress2'}." ".$results->[$i]{'branchaddress3'},
  		$results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchemail'},,$results->[$i]{'issuing'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),




From finlayt at users.sourceforge.net  Thu Aug 29 02:00:47 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 28 Aug 2002 17:00:47 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.19,1.20
Message-ID: <E17kCjv-0006Gz-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv24047/circ

Modified Files:
	returns.pl 
Log Message:

Fixed bug in flags display



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** returns.pl	22 Aug 2002 04:20:33 -0000	1.19
--- returns.pl	29 Aug 2002 00:00:45 -0000	1.20
***************
*** 329,341 ****
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $flag = "<font color=red>$flag</font>";
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
--- 329,344 ----
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
+     my $displayflag = '';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $displayflag = "<font color=red>$flag</font>";
! 	} else {
! 	    $displayflag = $flag;
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
***************
*** 354,358 ****
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
--- 357,361 ----
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$displayflag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
***************
*** 368,375 ****
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF
--- 371,378 ----
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$displayflag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF




From tonnesen at users.sourceforge.net  Fri Aug 30 18:30:12 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 30 Aug 2002 09:30:12 -0700
Subject: [Koha-cvs] CVS: koha koha.upgrade,1.1.2.17,1.1.2.18
Message-ID: <E17koey-0000a9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv2060

Modified Files:
      Tag: rel-1-2
	koha.upgrade 
Log Message:
Was checking for 'RC' in installed version


Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -r1.1.2.17 -r1.1.2.18
*** koha.upgrade	27 Jul 2002 05:38:53 -0000	1.1.2.17
--- koha.upgrade	30 Aug 2002 16:30:10 -0000	1.1.2.18
***************
*** 19,25 ****
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! my $newversion=`cat koha.version`;
! chomp $newversion;
! if ($::kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
--- 19,25 ----
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
***************
*** 31,35 ****
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 31,35 ----
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $::newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 359,363 ****
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
--- 359,363 ----
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$::newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
***************
*** 376,380 ****
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$newversion\n";
  }
  unless (defined($kc->{'includes'})) {
--- 376,380 ----
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$::newversion\n";
  }
  unless (defined($kc->{'includes'})) {




From tonnesen at users.sourceforge.net  Fri Aug 30 19:26:16 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 30 Aug 2002 10:26:16 -0700
Subject: [Koha-cvs] CVS: koha/marc marcschema.sql,1.15,1.16
Message-ID: <E17kpXE-0005cA-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv21498

Modified Files:
	marcschema.sql 
Log Message:
Added bibliothesaurus table


Index: marcschema.sql
===================================================================
RCS file: /cvsroot/koha/koha/marc/marcschema.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** marcschema.sql	24 Jul 2002 15:52:53 -0000	1.15
--- marcschema.sql	30 Aug 2002 17:26:14 -0000	1.16
***************
*** 2,5 ****
--- 2,8 ----
  #  
  #  $Log$
+ #  Revision 1.16  2002/08/30 17:26:14  tonnesen
+ #  Added bibliothesaurus table
+ #
  #  Revision 1.15  2002/07/24 15:52:53  tipaul
  #  1st scripts for MARC-DB.
***************
*** 124,126 ****
--- 127,141 ----
  		KEY sndx_word (sndx_word)
  		) TYPE=MyISAM;
+ 
+ 
+ CREATE TABLE bibliothesaurus ( 
+    code bigint(20) NOT NULL auto_increment, 
+    freelib char(255) NOT NULL default '', 
+    stdlib char(255) NOT NULL default '', 
+    type char(80) NOT NULL default '', 
+    PRIMARY KEY  (code), 
+    KEY freelib (freelib), 
+    KEY stdlib (stdlib), 
+    KEY type (type) 
+  ) TYPE=MyISAM; 
  




From finlayt at users.sourceforge.net  Fri Aug  9 06:03:46 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:03:46 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.34,1.35
Message-ID: <E17d106-00082w-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv30707

Modified Files:
	circulation.pl 
Log Message:

fixed up the todays issues and previous issues tables so that they are both listed in reverse order by issue date.



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** circulation.pl	24 Jul 2002 05:11:07 -0000	1.34
--- circulation.pl	9 Aug 2002 04:03:43 -0000	1.35
***************
*** 44,48 ****
  
  my @datearr = localtime(time());
! my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
  #warn $todaysdate;
  
--- 44,50 ----
  
  my @datearr = localtime(time());
! my $tday = localtime(time());
! warn "today: $tday \n";
! my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
  #warn $todaysdate;
  
***************
*** 367,381 ****
  my $previssues='';
  if ($borrower) {
      my $issueslist = getissues($borrower);
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $it (sort keys %$issueslist) {
! 	my $dd = $issueslist->{$it}->{'date_due'};
  	my $issuedate = $issueslist->{$it}->{'timestamp'};
  	$issuedate = substr($issuedate, 0, 8);
! 
! 	my $bookissue = $issueslist->{$it};
! 	my $bgcolor='';
! 	my $datedue = $bookissue->{'date_due'};
  	#convert to nz style dates
  	#this should be set with some kinda config variable	    
--- 369,389 ----
  my $previssues='';
  if ($borrower) {
+     my @todaysissues;
+     my @previousissues;
      my $issueslist = getissues($borrower);
!     foreach my $it (keys %$issueslist) {
  	my $issuedate = $issueslist->{$it}->{'timestamp'};
  	$issuedate = substr($issuedate, 0, 8);
! 	if ($todaysdate == $issuedate) {
! 	    push @todaysissues, $issueslist->{$it};
! 	} else {
! 	    push @previousissues, $issueslist->{$it};
! 	}
!     }
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
  	#this should be set with some kinda config variable	    
***************
*** 386,410 ****
  	    $dd="<font color=red>$dd</font>\n";
  	}
! 	if ($todaysdate == $issuedate) {
! 	    ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	    $todaysissues .=<< "EOF";
  <tr><td bgcolor=$tcolor align=center>$dd</td>
  <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$bookissue->{'title'}</td>
! <td bgcolor=$tcolor>$bookissue->{'author'}</td>
! <td bgcolor=$tcolor align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>
! EOF
!         } else {
! 	    ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	    $previssues .= << "EOF";
  <tr><td bgcolor=$pcolor align=center>$dd</td>
  <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$bookissue->{'title'}</td>
! <td bgcolor=$pcolor>$bookissue->{'author'}</td>
! <td bgcolor=$pcolor align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>
  EOF
- 	}
      }
  }
--- 394,427 ----
  	    $dd="<font color=red>$dd</font>\n";
  	}
! 	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	$todaysissues .=<< "EOF";
  <tr><td bgcolor=$tcolor align=center>$dd</td>
  <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$book->{'title'}</td>
! <td bgcolor=$tcolor>$book->{'author'}</td>
! <td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
! EOF
!     } 
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @previousissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
! 	#convert to nz style dates
! 	#this should be set with some kinda config variable	    
! 	my @tempdate=split(/-/,$dd);
! 	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
!      	$datedue=~s/-//g;
! 	if ($datedue < $todaysdate) {
! 	    $dd="<font color=red>$dd</font>\n";
! 	}
! 	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	$previssues .= << "EOF";
  <tr><td bgcolor=$pcolor align=center>$dd</td>
  <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$book->{'title'}</td>
! <td bgcolor=$pcolor>$book->{'author'}</td>
! <td bgcolor=$pcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
  EOF
      }
  }




From finlayt at users.sourceforge.net  Fri Aug  9 06:14:59 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:14:59 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.35,1.36
Message-ID: <E17d1Ax-0000KE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1091

Modified Files:
	circulation.pl 
Log Message:

changed the previous issues to be listed in order of due date



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** circulation.pl	9 Aug 2002 04:03:43 -0000	1.35
--- circulation.pl	9 Aug 2002 04:14:56 -0000	1.36
***************
*** 404,408 ****
  EOF
      } 
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @previousissues){
  	my $dd = $book->{'date_due'};
  	my $datedue = $book->{'date_due'};
--- 404,408 ----
  EOF
      } 
!     foreach my $book (sort {$a->{'due_date'} <=> $b->{'due_date'}} @previousissues){
  	my $dd = $book->{'date_due'};
  	my $datedue = $book->{'date_due'};




From finlayt at users.sourceforge.net  Fri Aug  9 06:33:04 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:33:04 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.7,1.8
Message-ID: <E17d1SS-0001Mp-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv5004

Modified Files:
	request.pl 
Log Message:

I have changed the branch options to only include the Issueing branches. Also if no branch is set it Defaults to Levin.



Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.pl	31 Jul 2002 04:27:57 -0000	1.7
--- request.pl	9 Aug 2002 04:33:01 -0000	1.8
***************
*** 35,41 ****
  # get branch information
  my $branch = $input->cookie('branch');
  my $branches = getbranches();
- 
- 
  my $branchoptions = branchoptions($branch);
  
--- 35,40 ----
  # get branch information
  my $branch = $input->cookie('branch');
+ ($branch) || ($branch = 'L');
  my $branches = getbranches();
  my $branchoptions = branchoptions($branch);
  
***************
*** 155,159 ****
      my $out = "";
      foreach my $br (keys %$branches) {
! 	(next) unless $branches->{$br}->{'CU'};
  	my $selected = "";
  	if ($br eq $selbr) {
--- 154,158 ----
      my $out = "";
      foreach my $br (keys %$branches) {
! 	(next) unless $branches->{$br}->{'IS'};
  	my $selected = "";
  	if ($br eq $selbr) {




From tonnesen at users.sourceforge.net  Wed Aug 14 01:04:10 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Tue, 13 Aug 2002 16:04:10 -0700
Subject: [Koha-cvs] CVS: koha addcopyrightstatements.pl,NONE,1.1.2.1
Message-ID: <E17ekhu-0006GV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv23985

Added Files:
      Tag: rel-1-2
	addcopyrightstatements.pl 
Log Message:
Little script to add a copyright statement to all .pl and .pm files


--- NEW FILE ---
#!/usr/bin/perl
#
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

my $copyrightstatement=qq|
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

|;

open (PL, "find -name '*.pl' -o -name '*.pm'|");
while (<PL>) {
    my $filename=$_;
    chomp $filename;
    my $holder='';
    my $newversion='';
    open (IN, "$filename");
    my $begin='';
    my $end='';
    my $alreaddone=0;
    while (<IN>) {
	if ((/^\s*#/ || /^\s*$/ || /^\s*package/) && $end eq '') {
	    $begin.=$_;
	} else {
	    $end.=$_;
	}
	if (/^\s*#\s*Copyright/) {
	    print "$filename already has a copyright statement\n";
	    $alreadydone=1;
	}
    }
    close IN;
    unless ($alreadydone) {
	open (OUT, ">$filename");
	print OUT "$begin$copyrightstatement$end";
	close OUT;
    }
}




From finlayt at users.sourceforge.net  Wed Aug 14 07:35:55 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 13 Aug 2002 22:35:55 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.11,1.12
Message-ID: <E17eqp1-0005Xm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv20936/circ

Modified Files:
	returns.pl 
Log Message:

all items are listed in the returned items list, regardless of whether they were issued or not.
Changed some messageing stuff as well, but will be back to fix that up some more.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** returns.pl	26 Jul 2002 02:27:16 -0000	1.11
--- returns.pl	14 Aug 2002 05:35:53 -0000	1.12
***************
*** 107,117 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
      if ($returned) {
- 	$returneditems{0} = $barcode;
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
- 	$ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
      }
  }
--- 107,122 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
+     $returneditems{0} = $barcode;
+     $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
+     } else {
+ 	$riborrowernumber{0} = 0;
+ 	$riduedate{0} = 0;
+ 	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
+ 	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
***************
*** 207,211 ****
  
  BORROWER:
! $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 212,216 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
***************
*** 216,224 ****
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  EOF
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
! for $name ($number).
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
--- 221,230 ----
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  EOF
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
! for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
***************
*** 249,252 ****
--- 255,259 ----
  # collect the messages and put into message table....
  foreach my $code (keys %$messages) {
+     warn $code;
      if ($code eq 'BadBarcode'){
  	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
***************
*** 259,262 ****
--- 266,272 ----
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
+     if ($code eq 'wthdrawm'){
+ 	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
+     }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
  	if ($messages->{'IsPermanent'} ne $branch) {
***************
*** 345,351 ****
  <b>Flags</b></td></tr>
  $flaginfotext 
- </table>
  EOF
      }
  }
  
--- 355,361 ----
  <b>Flags</b></td></tr>
  $flaginfotext 
  EOF
      }
+     $borrowertable .= "</table>";
  }
  
***************
*** 366,382 ****
  	my $barcode = $returneditems{$_};
  	my $duedate = $riduedate{$_};
! 	my @datearr = localtime(time());
! 	###
! 	# convert to nz date format
! 	my @tempdate = split(/-/,$duedate);
! 	my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
! 	####
! 	my $todaysdate 
! 	    = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
! 	my $overduetext = "$duedatenz";
! 	($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
! 	($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
! 	my $borrowernumber = $riborrowernumber{$_};
! 	my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
  	$returneditemstable .= << "EOF";
--- 376,399 ----
  	my $barcode = $returneditems{$_};
  	my $duedate = $riduedate{$_};
! 	my $overduetext;
! 	if ($duedate) {
! 	    my @tempdate = split ( /-/ , $duedate ) ;
!             my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
!             my @datearr = localtime(time());
!             my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
! 	    $overduetext = "$duedatenz";
! 	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
! 	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
!         } else {
!             $overduetext = "Not on loan.";
! 	}
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
! 	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
! 	    $borrowerinfo = "Not on loan.";
! 	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
  	$returneditemstable .= << "EOF";
***************
*** 388,392 ****
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>
  EOF
      } else {
--- 405,409 ----
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! $borrowerinfo</td></tr>
  EOF
      } else {




From finlayt at users.sourceforge.net  Wed Aug 14 07:37:09 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 13 Aug 2002 22:37:09 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.30,1.31
Message-ID: <E17eqqD-0005eK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv21418/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

added a check in the returnbook subroutine that checks to see if a book has been cancelled: i.e. that the wthdrawn field has been set to 1.


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** Circ2.pm	2 Jul 2002 23:31:33 -0000	1.30
--- Circ2.pm	14 Aug 2002 05:37:07 -0000	1.31
***************
*** 500,503 ****
--- 500,508 ----
  	$messages->{'IsPermanent'} = $hbr;
      }
+ # check that the book has been cancelled
+     if ($iteminformation->{'wthdrawn'}) {
+ 	$messages->{'wthdrawn'} = 1;
+ 	$doreturn = 0;
+     }
  # update issues, thereby returning book (should push this out into another subroutine
      my ($borrower) = getpatroninformation(\%env, $currentborrower, 0);




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/C4/Interface AccountsCDK.pm,1.1.1.1,1.2 BorrowerCDK.pm,1.1.1.1,1.2 FlagsCDK.pm,1.1.1.1,1.2 RenewalsCDK.pm,1.1.1.1,1.2 ReserveentCDK.pm,1.1.1.1,1.2
Message-ID: <E17f2da-0002MY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Interface
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4/Interface

Modified Files:
	AccountsCDK.pm BorrowerCDK.pm FlagsCDK.pm RenewalsCDK.pm 
	ReserveentCDK.pm 
Log Message:
Added copyright statement to all .pl and .pm files


Index: AccountsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/AccountsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AccountsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- AccountsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: BorrowerCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/BorrowerCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** BorrowerCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- BorrowerCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: FlagsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/FlagsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FlagsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- FlagsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Interface::FlagsCDK; #asummes C4/Interface/FlagsCDK
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: RenewalsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/RenewalsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** RenewalsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- RenewalsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Cdk;

Index: ReserveentCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/ReserveentCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ReserveentCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- ReserveentCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/acqui acquire.pl,1.4,1.5 addorder.pl,1.9,1.10 basket.pl,1.4,1.5 finishreceive.pl,1.6,1.7 modorders.pl,1.3,1.4 newbasket.pl,1.4,1.5 newbasket2.pl,1.4,1.5 newbiblio.pl,1.6,1.7 order.pl,1.3,1.4 receive.pl,1.4,1.5 recieveorder.pl,1.3,1.4 supplier.pl,1.3,1.4 updatesupplier.pl,1.3,1.4
Message-ID: <E17f2da-0002Mv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv8581/acqui

Modified Files:
	acquire.pl addorder.pl basket.pl finishreceive.pl modorders.pl 
	newbasket.pl newbasket2.pl newbiblio.pl order.pl receive.pl 
	recieveorder.pl supplier.pl updatesupplier.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acquire.pl	4 Jul 2002 15:53:02 -0000	1.4
--- acquire.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** addorder.pl	4 Jul 2002 15:53:02 -0000	1.9
--- addorder.pl	14 Aug 2002 18:12:52 -0000	1.10
***************
*** 4,7 ****
--- 4,25 ----
  #written 29/2/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.pl	4 Jul 2002 15:53:02 -0000	1.4
--- basket.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** finishreceive.pl	4 Jul 2002 15:53:02 -0000	1.6
--- finishreceive.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 4,7 ****
--- 4,25 ----
  #written 1/3/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Output;
  use C4::Catalogue;

Index: modorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/modorders.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modorders.pl	4 Jul 2002 15:53:02 -0000	1.3
--- modorders.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written 29/2/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: newbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket.pl	4 Jul 2002 15:53:02 -0000	1.4
--- newbasket.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket2.pl	4 Jul 2002 15:53:02 -0000	1.4
--- newbasket2.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 3,6 ****
--- 3,24 ----
  #now script to do searching for acquisitions
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbiblio.pl	4 Jul 2002 15:53:02 -0000	1.6
--- newbiblio.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** order.pl	4 Jul 2002 15:53:02 -0000	1.3
--- order.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 23/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** receive.pl	4 Jul 2002 15:53:02 -0000	1.4
--- receive.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** recieveorder.pl	4 Jul 2002 15:53:02 -0000	1.3
--- recieveorder.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** supplier.pl	4 Jul 2002 15:53:02 -0000	1.3
--- supplier.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatesupplier.pl	4 Jul 2002 15:53:02 -0000	1.3
--- updatesupplier.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 23/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Borrissues.pm,1.1.1.1,1.2 Borrower.pm,1.1.1.1,1.2 Circ2.pm,1.31,1.32 Fines.pm,1.3,1.4 Issues.pm,1.1.1.1,1.2 Main.pm,1.2,1.3 Renewals.pm,1.1.1.1,1.2 Renewals2.pm,1.4,1.5 Returns.pm,1.1.1.1,1.2
Message-ID: <E17f2da-0002MQ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4/Circulation

Modified Files:
	Borrissues.pm Borrower.pm Circ2.pm Fines.pm Issues.pm Main.pm 
	Renewals.pm Renewals2.pm Returns.pm 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Borrissues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrissues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Borrissues.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Borrissues.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Borrower.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrower.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Borrower.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Borrower.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** Circ2.pm	14 Aug 2002 05:37:07 -0000	1.31
--- Circ2.pm	14 Aug 2002 18:12:52 -0000	1.32
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  # use warnings;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Fines.pm	17 Mar 2002 02:58:00 -0000	1.3
--- Fines.pm	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Issues.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Issues.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Main.pm	5 Jan 2001 17:39:25 -0000	1.2
--- Main.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Renewals.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Renewals.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 7/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Renewals2.pm	24 Jun 2002 21:54:44 -0000	1.4
--- Renewals2.pm	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 8,11 ****
--- 8,29 ----
  #need to update stats with renewals
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Returns.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Returns.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/admin aqbookfund.pl,1.3,1.4 aqbudget.pl,1.4,1.5 branches.pl,1.2,1.3 categorie.pl,1.2,1.3 categoryitem.pl,1.2,1.3 currency.pl,1.3,1.4 itemtypes.pl,1.3,1.4 marctagstructure.pl,1.2,1.3 printers.pl,1.4,1.5 stopwords.pl,1.4,1.5 systempreferences.pl,1.4,1.5
Message-ID: <E17f2db-0002NX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8581/admin

Modified Files:
	aqbookfund.pl aqbudget.pl branches.pl categorie.pl 
	categoryitem.pl currency.pl itemtypes.pl marctagstructure.pl 
	printers.pl stopwords.pl systempreferences.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** aqbookfund.pl	2 Jul 2002 21:46:52 -0000	1.3
--- aqbookfund.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** aqbudget.pl	25 Jun 2002 11:05:45 -0000	1.4
--- aqbudget.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branches.pl	2 May 2002 00:08:53 -0000	1.2
--- branches.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  # Reorganising this branches admin page.....
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categorie.pl	24 Jun 2002 18:40:56 -0000	1.2
--- categorie.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 19,22 ****
--- 19,40 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: categoryitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categoryitem.pl	24 Jun 2002 18:40:56 -0000	1.2
--- categoryitem.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** currency.pl	2 Jul 2002 21:46:53 -0000	1.3
--- currency.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemtypes.pl	2 Jul 2002 21:46:53 -0000	1.3
--- itemtypes.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marctagstructure.pl	8 Jul 2002 16:45:57 -0000	1.2
--- marctagstructure.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** printers.pl	2 Jul 2002 21:46:53 -0000	1.4
--- printers.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stopwords.pl	2 Jul 2002 21:46:53 -0000	1.4
--- stopwords.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** systempreferences.pl	4 Jul 2002 12:46:42 -0000	1.4
--- systempreferences.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.1,1.2 addbooks.pl,1.10,1.11 addbookslccn.pl,1.6,1.7 additem.pl,1.5,1.6 bulkmarcimport.pl,1.6,1.7 isbnsearch.pl,1.3,1.4 keywordsearch.pl,1.4,1.5 marcimport.pl,1.12,1.13 savebiblio.pl,1.5,1.6 saveitem.pl,1.5,1.6 viewmarc.pl,1.3,1.4 websitesearch.pl,1.3,1.4
Message-ID: <E17f2db-0002NP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv8581/acqui.simple

Modified Files:
	addbiblio.pl addbooks.pl addbookslccn.pl additem.pl 
	bulkmarcimport.pl isbnsearch.pl keywordsearch.pl marcimport.pl 
	savebiblio.pl saveitem.pl viewmarc.pl websitesearch.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblio.pl	29 Apr 2002 05:29:02 -0000	1.1
--- addbiblio.pl	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** addbooks.pl	24 Jul 2002 16:24:20 -0000	1.10
--- addbooks.pl	14 Aug 2002 18:12:52 -0000	1.11
***************
*** 14,17 ****
--- 14,35 ----
  # Add info on biblioitems and items already entered as you enter new ones
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: addbookslccn.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbookslccn.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** addbookslccn.pl	24 Jul 2002 16:24:20 -0000	1.6
--- addbookslccn.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 14,17 ****
--- 14,35 ----
  # Add info on biblioitems and items already entered as you enter new ones
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** additem.pl	24 Jul 2002 16:24:20 -0000	1.5
--- additem.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: bulkmarcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/bulkmarcimport.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bulkmarcimport.pl	24 Jul 2002 16:24:20 -0000	1.6
--- bulkmarcimport.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 12,15 ****
--- 12,33 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $file=$ARGV[0];
  

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isbnsearch.pl	24 Jul 2002 16:24:20 -0000	1.3
--- isbnsearch.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: keywordsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/keywordsearch.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** keywordsearch.pl	24 Jul 2002 16:24:20 -0000	1.4
--- keywordsearch.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marcimport.pl	24 Jul 2002 16:24:20 -0000	1.12
--- marcimport.pl	14 Aug 2002 18:12:52 -0000	1.13
***************
*** 10,13 ****
--- 10,31 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 988,991 ****
--- 1006,1012 ----
  #---------------
  # $Log$
+ # Revision 1.13  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.12  2002/07/24 16:24:20  tipaul
  # Now, the acqui.simple system...

Index: savebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** savebiblio.pl	24 Jul 2002 16:24:20 -0000	1.5
--- savebiblio.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: saveitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** saveitem.pl	24 Jul 2002 16:24:20 -0000	1.5
--- saveitem.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/viewmarc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** viewmarc.pl	24 Jul 2002 16:24:20 -0000	1.3
--- viewmarc.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $starttime=gettime();
  

Index: websitesearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/websitesearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** websitesearch.pl	24 Jul 2002 16:24:20 -0000	1.3
--- websitesearch.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.11,1.12 circulation.pl,1.36,1.37 returns.pl,1.12,1.13 selectbranchprinter.pl,1.2,1.3
Message-ID: <E17f2db-0002Nj-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv8581/circ

Modified Files:
	branchtransfers.pl circulation.pl returns.pl 
	selectbranchprinter.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** branchtransfers.pl	23 Jul 2002 01:28:42 -0000	1.11
--- branchtransfers.pl	14 Aug 2002 18:12:53 -0000	1.12
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute branch transfers of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** circulation.pl	9 Aug 2002 04:14:56 -0000	1.36
--- circulation.pl	14 Aug 2002 18:12:53 -0000	1.37
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute issuing of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** returns.pl	14 Aug 2002 05:35:53 -0000	1.12
--- returns.pl	14 Aug 2002 18:12:53 -0000	1.13
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute returns of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** selectbranchprinter.pl	18 May 2002 05:37:28 -0000	1.2
--- selectbranchprinter.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI qw/:standard/;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/sec writeoff.pl,1.3,1.4
Message-ID: <E17f2dc-0002OX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/sec
In directory usw-pr-cvs1:/tmp/cvs-serv8581/sec

Modified Files:
	writeoff.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: writeoff.pl
===================================================================
RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** writeoff.pl	2 Apr 2001 22:51:26 -0000	1.3
--- writeoff.pl	14 Aug 2002 18:12:54 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #script to write off accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/html-template Search.pm,1.2,1.3 detail.pl,1.3,1.4 moredetail.pl,1.1,1.2 search.pl,1.16,1.17
Message-ID: <E17f2db-0002Nv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/html-template
In directory usw-pr-cvs1:/tmp/cvs-serv8581/html-template

Modified Files:
	Search.pm detail.pl moredetail.pl search.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/html-template/Search.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Search.pm	10 May 2002 22:34:36 -0000	1.2
--- Search.pm	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/detail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.pl	31 Jul 2002 09:17:34 -0000	1.3
--- detail.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/moredetail.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** moredetail.pl	15 May 2002 04:54:07 -0000	1.1
--- moredetail.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** search.pl	19 May 2002 21:27:12 -0000	1.16
--- search.pl	14 Aug 2002 18:12:53 -0000	1.17
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/maint catmaintain.pl,1.3,1.4 shiftbib.pl,1.1,1.2
Message-ID: <E17f2db-0002O1-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/maint
In directory usw-pr-cvs1:/tmp/cvs-serv8581/maint

Modified Files:
	catmaintain.pl shiftbib.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: catmaintain.pl
===================================================================
RCS file: /cvsroot/koha/koha/maint/catmaintain.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** catmaintain.pl	26 Feb 2002 09:31:15 -0000	1.3
--- catmaintain.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  # by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: shiftbib.pl
===================================================================
RCS file: /cvsroot/koha/koha/maint/shiftbib.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** shiftbib.pl	15 Mar 2001 10:11:33 -0000	1.1
--- shiftbib.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/telnet borrwraper.pl,1.1.1.1,1.2 doreturns.pl,1.1.1.1,1.2 issuewrapper.pl,1.1.1.1,1.2 returnswrapper.pl,1.1.1.1,1.2 startint.pl,1.1.1.1,1.2
Message-ID: <E17f2dc-0002Or-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/telnet
In directory usw-pr-cvs1:/tmp/cvs-serv8581/telnet

Modified Files:
	borrwraper.pl doreturns.pl issuewrapper.pl returnswrapper.pl 
	startint.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: borrwraper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/borrwraper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** borrwraper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- borrwraper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use DBI;
  use C4::Database;

Index: doreturns.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/doreturns.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** doreturns.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- doreturns.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use DBI;
  use C4::Database;

Index: issuewrapper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/issuewrapper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** issuewrapper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- issuewrapper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}");
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $done = "Issues";                                                                
  my $i=0;

Index: returnswrapper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/returnswrapper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** returnswrapper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- returnswrapper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $done = "returns";                                                                
  my $i=0;

Index: startint.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/startint.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** startint.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- startint.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use C4::Security;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/translator translator.pl,1.2,1.3
Message-ID: <E17f2dc-0002Ox-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/translator
In directory usw-pr-cvs1:/tmp/cvs-serv8581/translator

Modified Files:
	translator.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: translator.pl
===================================================================
RCS file: /cvsroot/koha/koha/translator/translator.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** translator.pl	27 Jun 2001 21:53:05 -0000	1.2
--- translator.pl	14 Aug 2002 18:12:54 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/marc File.pm,1.1,1.2 MARCdetail.pl,1.1,1.2 USMARC.pm,1.1,1.2 fill_usmarc.pl,1.2,1.3 viewmarc.pl,1.3,1.4
Message-ID: <E17f2dc-0002Om-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv8581/marc

Modified Files:
	File.pm MARCdetail.pl USMARC.pm fill_usmarc.pl viewmarc.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: File.pm
===================================================================
RCS file: /cvsroot/koha/koha/marc/File.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** File.pm	24 Jul 2002 15:52:53 -0000	1.1
--- File.pm	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package MARC::File;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  =head1 NAME
  

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/MARCdetail.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MARCdetail.pl	25 Jul 2002 09:55:51 -0000	1.1
--- MARCdetail.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: USMARC.pm
===================================================================
RCS file: /cvsroot/koha/koha/marc/USMARC.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** USMARC.pm	24 Jul 2002 15:52:53 -0000	1.1
--- USMARC.pm	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package MARC::File::USMARC;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  =head1 NAME
  

Index: fill_usmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/fill_usmarc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fill_usmarc.pl	24 Jul 2002 15:52:53 -0000	1.2
--- fill_usmarc.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #---- this simple script fills the tables with US MARC
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/viewmarc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** viewmarc.pl	20 Jun 2002 17:33:17 -0000	1.3
--- viewmarc.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $starttime=gettime();
  




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/updater thesaurus_create.pl,1.1,1.2 updatedatabase2.pl,1.3,1.4
Message-ID: <E17f2dc-0002P9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory usw-pr-cvs1:/tmp/cvs-serv8581/updater

Modified Files:
	thesaurus_create.pl updatedatabase2.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: thesaurus_create.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/thesaurus_create.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_create.pl	14 May 2002 11:26:10 -0000	1.1
--- thesaurus_create.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  # This script generates and fill the thesaurus table

Index: updatedatabase2.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase2.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatedatabase2.pl	24 Jun 2002 15:00:13 -0000	1.3
--- updatedatabase2.pl	14 Aug 2002 18:12:54 -0000	1.4
***************
*** 14,17 ****
--- 14,35 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use C4::Catalogue;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/misc fines2.pl,1.5,1.6 fixborrower.pl,1.2,1.3 fixcatalog.pl,1.1.1.1,1.2 fixorders.pl,1.1.1.1,1.2 fixrefs.pl,1.1.1.1,1.2 makebaskets.pl,1.1.1.1,1.2 makeformats.pl,1.1.1.1,1.2 tidyaccounts.pl,1.1.1.1,1.2
Message-ID: <E17f2dc-0002Ob-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory usw-pr-cvs1:/tmp/cvs-serv8581/misc

Modified Files:
	fines2.pl fixborrower.pl fixcatalog.pl fixorders.pl fixrefs.pl 
	makebaskets.pl makeformats.pl tidyaccounts.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: fines2.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fines2.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fines2.pl	10 Apr 2002 00:02:59 -0000	1.5
--- fines2.pl	14 Aug 2002 18:12:54 -0000	1.6
***************
*** 9,12 ****
--- 9,30 ----
  #  This script is meant to be run nightly out of cron.
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use C4::Search;

Index: fixborrower.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixborrower.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fixborrower.pl	9 Apr 2002 22:08:15 -0000	1.2
--- fixborrower.pl	14 Aug 2002 18:12:54 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixcatalog.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixcatalog.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixcatalog.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixcatalog.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixorders.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixorders.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixorders.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixrefs.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixrefs.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixrefs.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixrefs.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: makebaskets.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/makebaskets.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** makebaskets.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- makebaskets.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: makeformats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/makeformats.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** makeformats.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- makeformats.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: tidyaccounts.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/tidyaccounts.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** tidyaccounts.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- tidyaccounts.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:13:24 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:13:24 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts.pm,1.2,1.3 Accounts2.pm,1.11,1.12 Acquisitions.pm,1.22,1.23 Auth.pm,1.9,1.10 Biblio.pm,1.6,1.7 BookShelves.pm,1.3,1.4 Catalogue.pm,1.20,1.21 Circmain.pm,1.2,1.3 Circulation.pm,1.2,1.3 Database.pm,1.5,1.6 Format.pm,1.2,1.3 Groups.pm,1.2,1.3 Input.pm,1.3,1.4 InterfaceCDK.pm,1.2,1.3 Koha.pm,1.5,1.6 Maintainance.pm,1.5,1.6 Output.pm,1.14,1.15 Print.pm,1.7,1.8 Reserves.pm,1.1.1.1,1.2 Reserves2.pm,1.12,1.13 Scan.pm,1.2,1.3 Search.pm,1.32,1.33 Security.pm,1.2,1.3 SimpleMarc.pm,1.2,1.3 Stats.pm,1.6,1.7 Stock.pm,1.2,1.3 Z3950.pm,1.2,1.3 test.pl,1.3,1.4
Message-ID: <E17f2e4-0002Vy-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4

Modified Files:
	Accounts.pm Accounts2.pm Acquisitions.pm Auth.pm Biblio.pm 
	BookShelves.pm Catalogue.pm Circmain.pm Circulation.pm 
	Database.pm Format.pm Groups.pm Input.pm InterfaceCDK.pm 
	Koha.pm Maintainance.pm Output.pm Print.pm Reserves.pm 
	Reserves2.pm Scan.pm Search.pm Security.pm SimpleMarc.pm 
	Stats.pm Stock.pm Z3950.pm test.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Accounts.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Accounts.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts; #assumes C4/Accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Accounts2.pm	2 Jul 2002 20:49:44 -0000	1.11
--- Accounts2.pm	14 Aug 2002 18:12:51 -0000	1.12
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts2; #assumes C4/Accounts2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Acquisitions.pm	22 Jul 2002 20:45:47 -0000	1.22
--- Acquisitions.pm	14 Aug 2002 18:12:51 -0000	1.23
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Acquisitions; #assumes C4/Acquisitions.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Auth.pm	11 Jul 2002 05:46:58 -0000	1.9
--- Auth.pm	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Auth;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Digest::MD5 qw(md5_base64);

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Biblio.pm	25 Jul 2002 13:40:31 -0000	1.6
--- Biblio.pm	14 Aug 2002 18:12:51 -0000	1.7
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  # $Log$
+ # Revision 1.7  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.6  2002/07/25 13:40:31  tipaul
  # pod documenting the API.
***************
*** 52,55 ****
--- 55,76 ----
  # in 1.4 version, the translations will be nicer, as we have NOTHING to do in code. Everything has to be done in Biblio.pm ;-)
  
+ 
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
  
  use strict;

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BookShelves.pm	2 Jul 2002 17:48:06 -0000	1.3
--- BookShelves.pm	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 6,9 ****
--- 6,27 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;
***************
*** 134,137 ****
--- 152,158 ----
  #
  # $Log$
+ # Revision 1.4  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.3  2002/07/02 17:48:06  tonnesen
  # Merged in updates from rel-1-2

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Catalogue.pm	4 Jul 2002 15:53:02 -0000	1.20
--- Catalogue.pm	14 Aug 2002 18:12:51 -0000	1.21
***************
*** 10,13 ****
--- 10,31 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Circmain.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Circmain.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Circulation.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Circulation.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Database.pm	24 Jul 2002 16:11:37 -0000	1.5
--- Database.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Format.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Format.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Format; #assumes C4/Format
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Groups.pm	20 Jun 2002 18:04:47 -0000	1.2
--- Groups.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Input.pm	3 Jul 2002 03:18:50 -0000	1.3
--- Input.pm	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Input; #assumes C4/Input
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** InterfaceCDK.pm	20 Jun 2002 18:56:52 -0000	1.2
--- InterfaceCDK.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use strict;

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Koha.pm	20 Jun 2002 18:56:52 -0000	1.5
--- Koha.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Koha;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Maintainance.pm	20 Jun 2002 18:56:52 -0000	1.5
--- Maintainance.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with marking up output
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Output.pm	24 Jul 2002 16:11:37 -0000	1.14
--- Output.pm	14 Aug 2002 18:12:51 -0000	1.15
***************
*** 5,8 ****
--- 5,26 ----
  #set the value of path to be where your html lives
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Print.pm	24 Jul 2002 03:16:21 -0000	1.7
--- Print.pm	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Print; #assumes C4/Print.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Reserves.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Reserves.pm	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Reserves2.pm	26 Jul 2002 01:08:48 -0000	1.12
--- Reserves2.pm	14 Aug 2002 18:12:51 -0000	1.13
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Reserves2; #assumes C4/Reserves2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Scan.pm	20 Jun 2002 18:04:48 -0000	1.2
--- Scan.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Scan; #assumes C4/Scan.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Search.pm	31 Jul 2002 01:50:06 -0000	1.32
--- Search.pm	14 Aug 2002 18:12:51 -0000	1.33
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Search; #assumes C4/Search
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Security.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Security.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Security; #assumes C4/Security
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SimpleMarc.pm	2 Jul 2002 20:30:15 -0000	1.2
--- SimpleMarc.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 448,451 ****
--- 466,472 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.3  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.2  2002/07/02 20:30:15  tonnesen
  # Merged SimpleMarc.pm over from rel-1-2

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Stats.pm	20 Jun 2002 20:43:26 -0000	1.6
--- Stats.pm	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stats; #assumes C4/Stats
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Stock.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Stock.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stock; #assumes C4/Stock.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Z3950.pm	2 Jul 2002 20:31:33 -0000	1.2
--- Z3950.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 190,193 ****
--- 208,214 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.3  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.2  2002/07/02 20:31:33  tonnesen
  # module added from rel-1-2 branch

Index: test.pl
===================================================================
RCS file: /cvsroot/koha/koha/C4/test.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** test.pl	10 Jun 2002 20:49:54 -0000	1.3
--- test.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 1,3 ****
--- 1,21 ----
  package C4::test;
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:52 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:52 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.11,1.1.2.12
Message-ID: <E17f2uy-00058T-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19575

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -r1.1.2.11 -r1.1.2.12
*** Install.pm	27 Jul 2002 07:00:14 -0000	1.1.2.11
--- Install.pm	14 Aug 2002 18:30:50 -0000	1.1.2.12
***************
*** 1,4 ****
--- 1,22 ----
  package Install; #assumes Install.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Borrissues.pm,1.1.1.1,1.1.1.1.2.1 Borrower.pm,1.1.1.1,1.1.1.1.2.1 Circ2.pm,1.21.2.3,1.21.2.4 Fines.pm,1.3,1.3.2.1 Issues.pm,1.1.1.1,1.1.1.1.2.1 Main.pm,1.2,1.2.2.1 Renewals.pm,1.1.1.1,1.1.1.1.2.1 Renewals2.pm,1.2.2.2,1.2.2.3 Returns.pm,1.1.1.1,1.1.1.1.2.1
Message-ID: <E17f2uz-00059K-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Borrissues.pm Borrower.pm Circ2.pm Fines.pm Issues.pm Main.pm 
	Renewals.pm Renewals2.pm Returns.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Borrissues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrissues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Borrissues.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Borrissues.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Borrower.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrower.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Borrower.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Borrower.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -C2 -r1.21.2.3 -r1.21.2.4
*** Circ2.pm	27 Jul 2002 05:30:12 -0000	1.21.2.3
--- Circ2.pm	14 Aug 2002 18:30:50 -0000	1.21.2.4
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** Fines.pm	17 Mar 2002 02:58:00 -0000	1.3
--- Fines.pm	14 Aug 2002 18:30:50 -0000	1.3.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Issues.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Issues.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** Main.pm	5 Jan 2001 17:39:25 -0000	1.2
--- Main.pm	14 Aug 2002 18:30:50 -0000	1.2.2.1
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Renewals.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Renewals.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 7/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** Renewals2.pm	24 Jun 2002 21:54:09 -0000	1.2.2.2
--- Renewals2.pm	14 Aug 2002 18:30:50 -0000	1.2.2.3
***************
*** 8,11 ****
--- 8,29 ----
  #need to update stats with renewals
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Returns.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Returns.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.3,1.3.2.1 circulation.pl,1.23.2.2,1.23.2.3
Message-ID: <E17f2uz-00059S-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv19575/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** branchtransfers.pl	14 Mar 2002 01:51:16 -0000	1.3
--- branchtransfers.pl	14 Aug 2002 18:30:51 -0000	1.3.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute branch transfers of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -r1.23.2.2 -r1.23.2.3
*** circulation.pl	11 Jul 2002 18:05:29 -0000	1.23.2.2
--- circulation.pl	14 Aug 2002 18:30:51 -0000	1.23.2.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI qw/:standard/;
  use C4::Circulation::Circ2;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4/Interface AccountsCDK.pm,1.1.1.1,1.1.1.1.2.1 BorrowerCDK.pm,1.1.1.1,1.1.1.1.2.1 FlagsCDK.pm,1.1.1.1,1.1.1.1.2.1 RenewalsCDK.pm,1.1.1.1,1.1.1.1.2.1 ReserveentCDK.pm,1.1.1.1,1.1.1.1.2.1
Message-ID: <E17f2uz-00059N-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Interface
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4/Interface

Modified Files:
      Tag: rel-1-2
	AccountsCDK.pm BorrowerCDK.pm FlagsCDK.pm RenewalsCDK.pm 
	ReserveentCDK.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: AccountsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/AccountsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** AccountsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- AccountsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: BorrowerCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/BorrowerCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** BorrowerCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- BorrowerCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: FlagsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/FlagsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** FlagsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- FlagsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Interface::FlagsCDK; #asummes C4/Interface/FlagsCDK
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: RenewalsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/RenewalsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** RenewalsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- RenewalsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Cdk;

Index: ReserveentCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/ReserveentCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** ReserveentCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- ReserveentCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts.pm,1.1.1.1.2.1,1.1.1.1.2.2 Accounts2.pm,1.9.2.4,1.9.2.5 Acquisitions.pm,1.5.2.12,1.5.2.13 Auth.pm,1.9.2.7,1.9.2.8 Biblio.pm,1.1.2.4,1.1.2.5 BookShelves.pm,1.2.2.1,1.2.2.2 Catalogue.pm,1.11.2.1,1.11.2.2 Circmain.pm,1.1.1.1.2.2,1.1.1.1.2.3 Circulation.pm,1.1.1.1.2.1,1.1.1.1.2.2 Database.pm,1.2.2.6,1.2.2.7 Format.pm,1.1.1.1.2.2,1.1.1.1.2.3 Groups.pm,1.1.2.1,1.1.2.2 Input.pm,1.1.1.1.2.4,1.1.1.1.2.5 InterfaceCDK.pm,1.1.1.1.2.2,1.1.1.1.2.3 Koha.pm,1.4.2.4,1.4.2.5 Maintainance.pm,1.4.2.1,1.4.2.2 Output.pm,1.6.2.15,1.6.2.16 Print.pm,1.3.2.3,1.3.2.4 Reserves.pm,1.1.1.1,1.1.1.1.2.1 Reserves2.pm,1.5.2.5,1.5.2.6 Scan.pm,1.1.1.1.2.1,1.1.1.1.2.2 Search.pm,1.18.2.6,1.18.2.7 Security.pm,1.1.1.1.2.1,1.1.1.1.2.2 SimpleMarc.pm,1.1.2.4,1.1.2.5 Stats.pm,1.3.2.2,1.3.2.3 Stock.pm,1.1.1.1.2.1,1.1.1.1.2.2 Z3950.pm,1.1.2.5,1.1.2.6
Message-ID: <E17f2uz-00059m-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4

Modified Files:
      Tag: rel-1-2
	Accounts.pm Accounts2.pm Acquisitions.pm Auth.pm Biblio.pm 
	BookShelves.pm Catalogue.pm Circmain.pm Circulation.pm 
	Database.pm Format.pm Groups.pm Input.pm InterfaceCDK.pm 
	Koha.pm Maintainance.pm Output.pm Print.pm Reserves.pm 
	Reserves2.pm Scan.pm Search.pm Security.pm SimpleMarc.pm 
	Stats.pm Stock.pm Z3950.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Accounts.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Accounts.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts; #assumes C4/Accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** Accounts2.pm	24 Jun 2002 16:15:00 -0000	1.9.2.4
--- Accounts2.pm	14 Aug 2002 18:30:50 -0000	1.9.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts2; #assumes C4/Accounts2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -C2 -r1.5.2.12 -r1.5.2.13
*** Acquisitions.pm	24 Jun 2002 16:15:01 -0000	1.5.2.12
--- Acquisitions.pm	14 Aug 2002 18:30:50 -0000	1.5.2.13
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Acquisitions; #assumes C4/Acquisitions.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -C2 -r1.9.2.7 -r1.9.2.8
*** Auth.pm	27 Jul 2002 04:33:57 -0000	1.9.2.7
--- Auth.pm	14 Aug 2002 18:30:50 -0000	1.9.2.8
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Auth;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Digest::MD5 qw(md5_base64);

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** Biblio.pm	26 Jun 2002 22:13:49 -0000	1.1.2.4
--- Biblio.pm	14 Aug 2002 18:30:50 -0000	1.1.2.5
***************
*** 5,8 ****
--- 5,26 ----
  #-----------------
  # General requirements
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 982,985 ****
--- 1000,1006 ----
  #---------------------------------------
  # $Log$
+ # Revision 1.1.2.5  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.4  2002/06/26 22:13:49  tonnesen
  # Fix to allow non-numeric barcodes.

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** BookShelves.pm	26 Jun 2002 20:46:48 -0000	1.2.2.1
--- BookShelves.pm	14 Aug 2002 18:30:50 -0000	1.2.2.2
***************
*** 6,9 ****
--- 6,27 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;
***************
*** 134,137 ****
--- 152,158 ----
  #
  # $Log$
+ # Revision 1.2.2.2  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.2.2.1  2002/06/26 20:46:48  tonnesen
  # Inserting some changes I made locally a while ago.

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** Catalogue.pm	25 Apr 2002 21:59:55 -0000	1.11.2.1
--- Catalogue.pm	14 Aug 2002 18:30:50 -0000	1.11.2.2
***************
*** 10,13 ****
--- 10,31 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** Circmain.pm	20 Jun 2002 18:33:56 -0000	1.1.1.1.2.2
--- Circmain.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Circulation.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Circulation.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -C2 -r1.2.2.6 -r1.2.2.7
*** Database.pm	27 Jul 2002 04:41:30 -0000	1.2.2.6
--- Database.pm	14 Aug 2002 18:30:50 -0000	1.2.2.7
***************
*** 3,6 ****
--- 3,24 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** Format.pm	20 Jun 2002 18:33:56 -0000	1.1.1.1.2.2
--- Format.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Format; #assumes C4/Format
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Groups.pm	25 Apr 2002 21:59:55 -0000	1.1.2.1
--- Groups.pm	14 Aug 2002 18:30:50 -0000	1.1.2.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** Input.pm	5 Jul 2002 04:45:13 -0000	1.1.1.1.2.4
--- Input.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Input; #assumes C4/Input
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** InterfaceCDK.pm	21 Jun 2002 18:26:28 -0000	1.1.1.1.2.2
--- InterfaceCDK.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use strict;

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** Koha.pm	12 Jul 2002 23:58:35 -0000	1.4.2.4
--- Koha.pm	14 Aug 2002 18:30:50 -0000	1.4.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Koha;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** Maintainance.pm	25 Apr 2002 21:59:55 -0000	1.4.2.1
--- Maintainance.pm	14 Aug 2002 18:30:50 -0000	1.4.2.2
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with marking up output
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.6.2.15
retrieving revision 1.6.2.16
diff -C2 -r1.6.2.15 -r1.6.2.16
*** Output.pm	11 Jul 2002 21:06:19 -0000	1.6.2.15
--- Output.pm	14 Aug 2002 18:30:50 -0000	1.6.2.16
***************
*** 7,10 ****
--- 7,28 ----
  #set the value of path to be where your html lives
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** Print.pm	20 Jun 2002 20:42:35 -0000	1.3.2.3
--- Print.pm	14 Aug 2002 18:30:50 -0000	1.3.2.4
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Print; #assumes C4/Print.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Reserves.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Reserves.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** Reserves2.pm	11 Jul 2002 18:05:29 -0000	1.5.2.5
--- Reserves2.pm	14 Aug 2002 18:30:50 -0000	1.5.2.6
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Reserves2; #assumes C4/Reserves2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Scan.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Scan.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Scan; #assumes C4/Scan.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -C2 -r1.18.2.6 -r1.18.2.7
*** Search.pm	11 Jul 2002 18:05:29 -0000	1.18.2.6
--- Search.pm	14 Aug 2002 18:30:50 -0000	1.18.2.7
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Search; #assumes C4/Search
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Security.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Security.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Security; #assumes C4/Security
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** SimpleMarc.pm	28 Jun 2002 14:36:47 -0000	1.1.2.4
--- SimpleMarc.pm	14 Aug 2002 18:30:50 -0000	1.1.2.5
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 448,451 ****
--- 466,472 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.1.2.5  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.4  2002/06/28 14:36:47  amillar
  # Fix broken logic on illustrator vs. add'l author

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** Stats.pm	18 May 2002 10:21:51 -0000	1.3.2.2
--- Stats.pm	14 Aug 2002 18:30:50 -0000	1.3.2.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stats; #assumes C4/Stats
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Stock.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Stock.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stock; #assumes C4/Stock.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** Z3950.pm	29 Jun 2002 17:33:47 -0000	1.1.2.5
--- Z3950.pm	14 Aug 2002 18:30:50 -0000	1.1.2.6
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 190,193 ****
--- 208,214 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.1.2.6  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.5  2002/06/29 17:33:47  amillar
  # Allow DEFAULT as input to addz3950search.




From tonnesen at users.sourceforge.net  Wed Aug 14 20:13:24 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:13:24 -0700
Subject: [Koha-cvs] CVS: koha addwebsite.pl,1.1,1.2 barcodes.pl,1.1,1.2 bookcount.pl,1.1,1.2 boraccount.pl,1.2,1.3 charges.pl,1.1.1.1,1.2 currency.pl,1.2,1.3 delbiblio.pl,1.4,1.5 deletebiblioitem.pl,1.1,1.2 deletemem.pl,1.2,1.3 deletewebsite.pl,1.1,1.2 delitem.pl,1.2,1.3 detail.pl,1.9,1.10 groups.pl,1.1,1.2 imemberentry.pl,1.1.1.1,1.2 insertdata.pl,1.7,1.8 insertidata.pl,1.1.1.1,1.2 insertjdata.pl,1.1.1.1,1.2 installer-lite.pl,1.1,1.2 installer.pl,1.7,1.8 jmemberentry.pl,1.1.1.1,1.2 loadmodules.pl,1.3,1.4 logout.pl,1.2,1.3 mancredit.pl,1.2,1.3 maninvoice.pl,1.2,1.3 member.pl,1.2,1.3 memberentry.pl,1.7,1.8 modbib.pl,1.5,1.6 modbibitem.pl,1.8,1.9 moditem.pl,1.2,1.3 modrequest.pl,1.1.1.1,1.2 modwebsites.pl,1.1,1.2 moredetail.pl,1.8,1.9 moremember.pl,1.13,1.14 newimember.pl,1.1.1.1,1.2 newjmember.pl,1.1.1.1,1.2 newmember.pl,1.1.1.1,1.2 orderbreakdown.pl,1.2,1.3 overdue.pl,1.1,1.2 pay.pl,1.3,1.4 placerequest.pl,1.1.1.1,1.2 readingrec.pl,1.2,1.3 renewscript.pl,1.2,1.3 reports.pl,1.1.1.1,1.2 request.pl,1.8,1.9 reservereport.pl,1.1.1.1,1.2 search.pl,1.9,1.10 shelves.pl,1.7,1.8 showbudget.pl,1.3,1.4 simpleredirect.pl,1.1.1.1,1.2 stats.pl,1.4,1.5 stats2.pl,1.1.1.1,1.2 subjectsearch.pl,1.2,1.3 testKoha.pl,1.5,1.6 thesaurus_popup.pl,1.1,1.2 tidyaccounts.pl,1.1.1.1,1.2 updatebibitem.pl,1.7,1.8 updatebiblio.pl,1.3,1.4 updatecharges.pl,1.1.1.1,1.2 updateitem.pl,1.3,1.4 updatewebsite.pl,1.1,1.2 userpage.pl,1.2,1.3
Message-ID: <E17f2e4-0002VU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv8581

Modified Files:
	addwebsite.pl barcodes.pl bookcount.pl boraccount.pl 
	charges.pl currency.pl delbiblio.pl deletebiblioitem.pl 
	deletemem.pl deletewebsite.pl delitem.pl detail.pl groups.pl 
	imemberentry.pl insertdata.pl insertidata.pl insertjdata.pl 
	installer-lite.pl installer.pl jmemberentry.pl loadmodules.pl 
	logout.pl mancredit.pl maninvoice.pl member.pl memberentry.pl 
	modbib.pl modbibitem.pl moditem.pl modrequest.pl 
	modwebsites.pl moredetail.pl moremember.pl newimember.pl 
	newjmember.pl newmember.pl orderbreakdown.pl overdue.pl pay.pl 
	placerequest.pl readingrec.pl renewscript.pl reports.pl 
	request.pl reservereport.pl search.pl shelves.pl showbudget.pl 
	simpleredirect.pl stats.pl stats2.pl subjectsearch.pl 
	testKoha.pl thesaurus_popup.pl tidyaccounts.pl 
	updatebibitem.pl updatebiblio.pl updatecharges.pl 
	updateitem.pl updatewebsite.pl userpage.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: addwebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/addwebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addwebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- addwebsite.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: barcodes.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes.pl	29 May 2002 21:06:17 -0000	1.1
--- barcodes.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 6,9 ****
--- 6,27 ----
  # Variable Section #
  ####################
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $pretext='T ';
  my $startnumber=1000;

Index: bookcount.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookcount.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bookcount.pl	2 May 2002 00:08:53 -0000	1.1
--- bookcount.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/boraccount.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** boraccount.pl	2 May 2001 21:11:41 -0000	1.2
--- boraccount.pl	14 Aug 2002 18:12:50 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: charges.pl
===================================================================
RCS file: /cvsroot/koha/koha/charges.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** charges.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- charges.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/currency.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** currency.pl	20 Jun 2002 17:23:09 -0000	1.2
--- currency.pl	14 Aug 2002 18:12:50 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #script to display and update currency rates
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Acquisitions;

Index: delbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/delbiblio.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** delbiblio.pl	20 Jun 2002 17:45:18 -0000	1.4
--- delbiblio.pl	14 Aug 2002 18:12:51 -0000	1.5
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: deletebiblioitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletebiblioitem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** deletebiblioitem.pl	14 May 2002 04:12:52 -0000	1.1
--- deletebiblioitem.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletemem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** deletemem.pl	11 Sep 2001 02:03:26 -0000	1.2
--- deletemem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: deletewebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletewebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** deletewebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- deletewebsite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: delitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/delitem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** delitem.pl	20 Jun 2002 17:23:09 -0000	1.2
--- delitem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** detail.pl	22 May 2002 18:35:25 -0000	1.9
--- detail.pl	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** groups.pl	2 May 2001 23:06:44 -0000	1.1
--- groups.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI qw/:standard/;
  use C4::Output;

Index: imemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/imemberentry.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** imemberentry.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- imemberentry.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: insertdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertdata.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** insertdata.pl	9 Apr 2002 00:04:39 -0000	1.7
--- insertdata.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: insertidata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertidata.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** insertidata.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- insertidata.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: insertjdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertjdata.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** insertjdata.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- insertjdata.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: installer-lite.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer-lite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** installer-lite.pl	11 Jun 2002 11:24:36 -0000	1.1
--- installer-lite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl -w # please develop with -w
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use diagnostics;
  use strict; # please develop with the strict pragma

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** installer.pl	23 Jul 2002 06:06:42 -0000	1.7
--- installer.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 2,5 ****
--- 2,23 ----
  
  #use diagnostics;
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict; # please develop with the strict pragma
  

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** jmemberentry.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- jmemberentry.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: loadmodules.pl
===================================================================
RCS file: /cvsroot/koha/koha/loadmodules.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** loadmodules.pl	20 Jun 2002 17:23:09 -0000	1.3
--- loadmodules.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  #called as an include by the acquisitions index page
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: logout.pl
===================================================================
RCS file: /cvsroot/koha/koha/logout.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** logout.pl	5 Jul 2002 05:03:36 -0000	1.2
--- logout.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: mancredit.pl
===================================================================
RCS file: /cvsroot/koha/koha/mancredit.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mancredit.pl	9 May 2001 23:22:10 -0000	1.2
--- mancredit.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: maninvoice.pl
===================================================================
RCS file: /cvsroot/koha/koha/maninvoice.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** maninvoice.pl	9 May 2001 23:22:10 -0000	1.2
--- maninvoice.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	6 May 2002 04:12:48 -0000	1.2
--- member.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** memberentry.pl	4 Jul 2002 13:53:56 -0000	1.7
--- memberentry.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: modbib.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbib.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** modbib.pl	28 Jun 2002 12:07:16 -0000	1.5
--- modbib.pl	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 5,8 ****
--- 5,26 ----
  # modified 11/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: modbibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbibitem.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** modbibitem.pl	20 Jun 2002 18:04:45 -0000	1.8
--- modbibitem.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 6,9 ****
--- 6,27 ----
  # modified 11/11/99 by chris at katipo.co.nz
  # modified 18/4/00 by chris at katipo.co.nz
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: moditem.pl
===================================================================
RCS file: /cvsroot/koha/koha/moditem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** moditem.pl	20 Jun 2002 17:23:09 -0000	1.2
--- moditem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  # modified 11/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: modrequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/modrequest.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** modrequest.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- modrequest.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  #last update 27/1/2000 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: modwebsites.pl
===================================================================
RCS file: /cvsroot/koha/koha/modwebsites.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modwebsites.pl	12 May 2002 15:37:53 -0000	1.1
--- modwebsites.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** moredetail.pl	31 Jul 2002 03:56:44 -0000	1.8
--- moredetail.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** moremember.pl	27 Jun 2002 21:16:20 -0000	1.13
--- moremember.pl	14 Aug 2002 18:12:51 -0000	1.14
***************
*** 11,14 ****
--- 11,32 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newimember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newimember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newimember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newimember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newjmember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newjmember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newmember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newmember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: orderbreakdown.pl
===================================================================
RCS file: /cvsroot/koha/koha/orderbreakdown.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** orderbreakdown.pl	20 Jun 2002 17:23:09 -0000	1.2
--- orderbreakdown.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 31/01/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: overdue.pl
===================================================================
RCS file: /cvsroot/koha/koha/overdue.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** overdue.pl	18 Mar 2001 22:06:39 -0000	1.1
--- overdue.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pay.pl	27 Mar 2002 00:02:40 -0000	1.3
--- pay.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #part of the koha library system, script to facilitate paying off fines
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: placerequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/placerequest.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** placerequest.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- placerequest.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #writen 2/1/00 by chris at katipo.oc.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: readingrec.pl
===================================================================
RCS file: /cvsroot/koha/koha/readingrec.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** readingrec.pl	20 Jun 2001 03:36:01 -0000	1.2
--- readingrec.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** renewscript.pl	9 May 2001 23:23:52 -0000	1.2
--- renewscript.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to renew items from the web
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Circulation::Renewals2;

Index: reports.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** reports.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- reports.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** request.pl	9 Aug 2002 04:33:01 -0000	1.8
--- request.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 4,7 ****
--- 4,25 ----
  #writen 2/1/00 by chris at katipo.oc.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: reservereport.pl
===================================================================
RCS file: /cvsroot/koha/koha/reservereport.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** reservereport.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- reservereport.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** search.pl	15 May 2002 04:36:51 -0000	1.9
--- search.pl	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 2,5 ****
--- 2,23 ----
  #script to provide intranet (librarian) advanced search facility
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;

Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/shelves.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** shelves.pl	5 Jul 2002 05:03:37 -0000	1.7
--- shelves.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 5,8 ****
--- 5,26 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;
***************
*** 170,173 ****
--- 188,194 ----
  #
  # $Log$
+ # Revision 1.8  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.7  2002/07/05 05:03:37  tonnesen
  # Minor changes to authentication routines.

Index: showbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/showbudget.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** showbudget.pl	20 Jun 2002 17:23:09 -0000	1.3
--- showbudget.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  #called as an include by the acquisitions index page
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: simpleredirect.pl
===================================================================
RCS file: /cvsroot/koha/koha/simpleredirect.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** simpleredirect.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- simpleredirect.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #used by members section
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stats.pl	2 Apr 2001 22:51:26 -0000	1.4
--- stats.pl	14 Aug 2002 18:12:51 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: stats2.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats2.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** stats2.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- stats2.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: subjectsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/subjectsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subjectsearch.pl	9 Jul 2002 03:07:05 -0000	1.2
--- subjectsearch.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: testKoha.pl
===================================================================
RCS file: /cvsroot/koha/koha/testKoha.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** testKoha.pl	20 Jun 2002 18:04:46 -0000	1.5
--- testKoha.pl	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  # $Id$
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Test::Harness;
***************
*** 24,27 ****
--- 42,48 ----
  
  # $Log$
+ # Revision 1.6  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.5  2002/06/20 18:04:46  tonnesen
  # Are we getting sick of merging yet?  Not me!

Index: thesaurus_popup.pl
===================================================================
RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_popup.pl	14 May 2002 11:26:10 -0000	1.1
--- thesaurus_popup.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  # build Subject field using bibliothesaurus table
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: tidyaccounts.pl
===================================================================
RCS file: /cvsroot/koha/koha/tidyaccounts.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** tidyaccounts.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- tidyaccounts.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: updatebibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebibitem.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** updatebibitem.pl	28 Jun 2002 12:53:02 -0000	1.7
--- updatebibitem.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebiblio.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatebiblio.pl	28 Jun 2002 12:19:50 -0000	1.3
--- updatebiblio.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatecharges.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatecharges.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** updatecharges.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- updatecharges.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 6,9 ****
--- 6,27 ----
  # written 1/1/2000 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: updateitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/updateitem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updateitem.pl	20 Jun 2002 17:23:09 -0000	1.3
--- updateitem.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatewebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatewebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** updatewebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- updatewebsite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: userpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/userpage.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** userpage.pl	11 Jul 2002 06:40:06 -0000	1.2
--- userpage.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;




From rangi at users.sourceforge.net  Thu Aug 15 02:46:28 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 17:46:28 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.4,1.21.2.5
Message-ID: <E17f8mS-0000S3-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv1318/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -C2 -r1.21.2.4 -r1.21.2.5
*** Circ2.pm	14 Aug 2002 18:30:50 -0000	1.21.2.4
--- Circ2.pm	15 Aug 2002 00:46:26 -0000	1.21.2.5
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ # use warnings;
  require Exporter;
  use DBI;
***************
*** 33,36 ****
--- 34,38 ----
  #use C4::Scan;
[...1274 lines suppressed...]
! 		if (my $conrec = $consth->fetchrow_hashref) {
! 		    if ($resrec->{'constrainttype'} eq "o") {
! 			$resfound = 1;
! 		    }
! 		}
! 		$consth->finish;
! 	    }
! 	}
! 	if ($resfound) {
!             my $updquery = "update reserves set found = 'W', itemnumber = '$itemno'
!                   where borrowernumber = $brn and reservedate = $rdate and biblionumber = $bibno";
! 	    my $updsth = $dbh->prepare($updquery);
! 	    $updsth->execute;
! 	    $updsth->finish;
! 	}
      }
!     $sth->finish;
!     return ($resfound,$lastrec);
  }
  




From rangi at users.sourceforge.net  Thu Aug 15 02:46:28 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 17:46:28 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,NONE,1.13.2.1 selectbranchprinter.pl,NONE,1.3.2.1 branchtransfers.pl,1.3.2.1,1.3.2.2 circulation.pl,1.23.2.3,1.23.2.4
Message-ID: <E17f8mS-0000SD-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1318/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl 
Added Files:
      Tag: rel-1-2
	returns.pl selectbranchprinter.pl 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



--- NEW FILE ---
#!/usr/bin/perl

#written 11/3/2002 by Finlay
#script to execute returns of books


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
use C4::Print;
use C4::Reserves2;

my %env;
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";

my $query=new CGI;
my $branches = getbranches();
my $printers = getprinters(\%env);

my $branch = $query->param("branch");
my $printer = $query->param("printer");

($branch) || ($branch=$query->cookie('branch')) ;
($printer) || ($printer=$query->cookie('printer')) ;


#
# Some code to handle the error if there is no branch or printer setting.....
#


$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;

# Set up the item stack ....
my $ritext = '';
my %returneditems;
my %riduedate;
my %riborrowernumber;
foreach ($query->param) {
    (next) unless (/ri-(\d*)/);
    my $counter=$1;
    (next) if ($counter>20);
    my $barcode=$query->param("ri-$counter");
    my $duedate=$query->param("dd-$counter");
    my $borrowernumber=$query->param("bn-$counter");
    $counter++;
    # decode cuecat
    $barcode = cuecatbarcodedecode($barcode);
    $returneditems{$counter}=$barcode;
    $riduedate{$counter}=$duedate;
    $riborrowernumber{$counter}=$borrowernumber;
    $ritext.="<input type=hidden name=ri-$counter value=$barcode>\n";
    $ritext.="<input type=hidden name=dd-$counter value=$duedate>\n";
    $ritext.="<input type=hidden name=bn-$counter value=$borrowernumber>\n";
}

# Collect a few messages here...
my $messagetext='';
my $reservetext='';

############
# Deal with the requests....
if ($query->param('resbarcode')) {
    my $item = $query->param('itemnumber');
    my $borrnum = $query->param('borrowernumber');
    my $resbarcode = $query->param('resbarcode');
    my $tobranchcd = ReserveWaiting($item, $borrnum);
    my $branchname = $branches->{$tobranchcd}->{'branchname'};
    my ($borr) = getpatroninformation(\%env, $borrnum, 0);
    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
    my $slip = $query->param('resslip');
    printslip(\%env, $slip);
    if ($tobranchcd ne $branch) {
	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
	$reservetext .= <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
    Item: $iteminfo->{'title'} ($iteminfo->{'author'})<br>
 needs to be transfered to <b>$branchname</b> <br>
to be picked up by $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
    }
}


my $iteminformation;
my $borrower;
my $returned = 0;
my $messages;
my $barcode = $query->param('barcode');
# actually return book and prepare item table.....
if ($barcode) {
    # decode cuecat
    $barcode = cuecatbarcodedecode($barcode);
    ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
    $returneditems{0} = $barcode;
    $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
    if ($returned) {
	$riborrowernumber{0} = $borrower->{'borrowernumber'};
	$riduedate{0} = $iteminformation->{'date_due'};
	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
    } else {
	$riborrowernumber{0} = 0;
	$riduedate{0} = 0;
	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
    }
}

##################################################################################
# HTML code....
# title....
my $title = <<"EOF";
<FONT SIZE=6><em>Circulation: Returns</em></FONT><br>
<b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
<b>Printer:</b> $printers->{$printer}->{'printername'}<br>
<a href=selectbranchprinter.pl>Change Settings</a>
<input type=hidden name=branch value=$branch>
<input type=hidden name=printer value=$printer>
<p>
EOF

my $links = <<"EOF";
<table align="right"><tr><td>
<a href=circulation.pl>
<img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
&nbsp<a href=branchtransfers.pl>
<img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
</td></tr></table>
EOF


my $itemtable;
if ($iteminformation) {
    $itemtable = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Item Information</font></th></tr>
<tr><td>
Title: $iteminformation->{'title'}<br>
<!--Hlt decided they dont want these showing, uncoment the html to make it work

Author: $iteminformation->{'author'}<br>
Barcode: <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
&type=intra onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a><br>
Date Due: $iteminformation->{'date_due'}-->
</td></tr>
</table>
EOF
}

# Barcode entry box, with hidden inputs attached....
my $barcodeentrytext = << "EOF";
<form method=post action=/cgi-bin/koha/circ/returns.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
<font color=black><b>Enter Book Barcode</b></font></td></tr>
<tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
</table>
$ritext
</form>
EOF


if ($messages->{'ResFound'}) {
    my $res = $messages->{'ResFound'};
    my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
    my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
    my ($iteminfo) = getiteminformation(\%env, 0, $barcode);

    if ($res->{'ResFound'} eq "Waiting") {
	$reservetext = <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
    Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
is marked waiting at <b>$branchname</b> for $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
    } 
    if ($res->{'ResFound'} eq "Reserved") {
	my @da = localtime(time());
	my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
	my $slip =  <<"EOF";
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Date: $todaysdate;

ITEM RESERVED: 
$iteminfo->{'title'} ($iteminfo->{'author'})
barcode: $iteminfo->{'barcode'}
itemtype: $iteminfo->{'itemtype'} 

COLLECT AT: $branchname

BORROWER:
$borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
card number: $borr->{'cardnumber'}
Phone: $borr->{'phone'}
$borr->{'streetaddress'}
$borr->{'suburb'}
$borr->{'town'}
$borr->{'emailaddress'}

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

EOF

	$reservetext = <<"EOF";
<font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
for $name ($number) to be collected at <b>$branchname</b>.
<table cellpadding=5 cellspacing=0>
<tr><td valign="top">Change status to waiting and print 
<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
<td valign="top">
<form method=post action='returns.pl'>
$ritext
<input type=hidden name=itemnumber value=$res->{'itemnumber'}>
<input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
<input type=hidden name=resbarcode value=$barcode>
<input type=hidden name=resslip value="$slip">
<input type=submit value="Print">
</form>
</td></tr>
</table>
EOF
    }
}
my $reservefoundtext;
if ($reservetext) {
    $reservefoundtext = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
<tr><td> $reservetext </td></tr></table>
EOF
}

# collect the messages and put into message table....
foreach my $code (keys %$messages) {
    warn $code;
    if ($code eq 'BadBarcode'){
	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
    }
    if ($code eq 'NotIssued'){
	my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
	$messagetext .= "<font color='red' size='+2'> Item not on issue. </font> <br>";
    }
    if ($code eq 'WasLost'){
	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
    }
    if ($code eq 'wthdrawm'){
	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
    }
    if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
	if ($messages->{'IsPermanent'} ne $branch) {
	    $messagetext .= "<font color='red' size='+2'> Please return to $branches->{$messages->{'IsPermanent'}}->{'branchname'} </font> <br>";
	}
    }
}
$messagetext = substr($messagetext, 0, -4);

my $messagetable;
if ($messagetext) {
    $messagetable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
<tr><td> $messagetext </td></tr></table>
EOF
}


# patrontable ....
my $borrowertable;
my $flaginfotable;
if ($borrower) {
    $borrowertable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black><b>Borrower Information</b></font></td></tr>
<tr><td colspan=2>
<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} 
onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a>
$borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
</td></tr>
EOF
    my $flags = $borrower->{'flags'};
    my $flaginfotext='';
    my $color = '';
    foreach my $flag (sort keys %$flags) {
	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
	if ($flags->{$flag}->{'noissues'}) {
	    $flag = "<font color=red>$flag</font>";
	}
	if ($flag eq 'CHARGES') {
	    $flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
<a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
EOF
	} elsif ($flag eq 'WAITING') {
	    my $itemswaiting='';
	    my $items = $flags->{$flag}->{'itemlist'};
	    foreach my $item (@$items) {
		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
		$itemswaiting .= <<"EOF";
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
$iteminformation->{'title'} 
($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>
EOF
            }
            $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
	} elsif ($flag eq 'ODUES') {
	    my $itemsoverdue = '';
	    my $items = $flags->{$flag}->{'itemlist'};
            foreach my $item (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$items) {
		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
                $itemsoverdue .=  <<"EOF";
<font color=red>$item->{'date_due'}</font>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
$iteminformation->{'title'}
<br>
EOF
	    }
	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
        } else {
	    $flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
EOF
	}
    }
    if ($flaginfotext) {
	$borrowertable .= << "EOF";
<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
<b>Flags</b></td></tr>
$flaginfotext 
EOF
    }
    $borrowertable .= "</table>";
}

# the returned items.....
my $returneditemstable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Items</font></th></tr>
<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr>
EOF

my $color='';
#set up so only the lat 8 returned items display (make for faster loading pages)
my $count=0;
foreach (sort {$a <=> $b} keys %returneditems) {
    if ($count < 8) {
	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
	my $barcode = $returneditems{$_};
	my $duedate = $riduedate{$_};
	my $overduetext;
	if ($duedate) {
	    my @tempdate = split ( /-/ , $duedate ) ;
            my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
            my @datearr = localtime(time());
            my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
	    $overduetext = "$duedatenz";
	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
        } else {
            $overduetext = "Not on loan.";
	}
        my $borrowernumber = $riborrowernumber{$_};
        my $borrowerinfo;
        if ($borrowernumber) {
	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
            my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
        } else {
	    $borrowerinfo = "Not on loan.";
	}
	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
	$returneditemstable .= << "EOF";
<tr><td bgcolor=$color>$overduetext</td>
<td bgcolor=$color align=center>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td>
<td bgcolor=$color>$iteminformation->{'title'}</td>
<td bgcolor=$color>$iteminformation->{'author'}</td>
<td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
<td bgcolor=$color>
$borrowerinfo</td></tr>
EOF
    } else {
	last;
    }
    $count++;
}
$returneditemstable .= "</table>\n";


# actually print the page!
print $query->header();
print startpage();
print startmenu('circulation');

print <<"EOF";
$links
$title
<table cellpadding=5 cellspacing=0 width=100%>
EOF

if ($reservefoundtext) {
    print <<"EOF";
<tr>
<td colspan=2>$reservefoundtext</td>
</tr>
<tr>
<td colspan=2>$messagetable</td>
</tr>

EOF
} else {
    print <<"EOF";
<tr>
<td valign=top align=left>$barcodeentrytext</td>
<td valign=top align=left>$messagetable</td>
</tr>
EOF
}
if ($returned) {
    print <<"EOF";
<tr>
<td valign=top align=left>$itemtable</td>
<td valign=top align=left>$borrowertable</td>
<tr>
EOF
}
if (%returneditems) {
    print "<tr><td colspan=2>$returneditemstable</td></tr>";
}

print "</table>";

print endmenu('circulation');
print endpage();

sub cuecatbarcodedecode {
    my ($barcode) = @_;
    chomp($barcode);
    my @fields = split(/\./,$barcode);
    my @results = map(decode($_), @fields[1..$#fields]);
    if ($#results == 2){
  	return $results[2];
    } else {
	return $barcode;
    } 
} 


--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI qw/:standard/;
use C4::Circulation::Circ2;
use C4::Output;
use C4::Print;
use DBI;


# this is a reorganisation of circulationold.pl 
# dividing it up into three scripts......
# this will be the first one that chooses branch and printer settings....

#general design stuff...
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";

# try to get the branch and printer settings from the http....
my %env;
my $query=new CGI;
my $branches=getbranches(\%env);
my $printers=getprinters(\%env);
my $branch=$query->param('branch');
my $printer=$query->param('printer');

($branch) || ($branch=$query->cookie('branch'));
($printer) || ($printer=$query->cookie('printer'));

# is you force a selection....
my $oldbranch = $branch;
my $oldprinter = $printer;

$branch='';
$printer='';


$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;

# set up select options....
my $branchcount=0;
my $printercount=0;
my $branchoptions;
my $printeroptions;
foreach (keys %$branches) {
    (next) unless ($_);
    (next) unless ($branches->{$_}->{'IS'});
    $branchcount++;
    my $selected='';
    ($selected='selected') if ($_ eq $oldbranch);
    $branchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
}
foreach (keys %$printers) {
    (next) unless ($_);
    $printercount++;
    my $selected='';
    ($selected='selected') if ($_ eq $oldprinter);
    $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n";
}

# if there is only one....

if ($printercount==1) {
    ($printer)=keys %$printers;
}
if ($branchcount==1) {
    ($branch)=keys %$branches;
}

# set up printer and branch selection forms....
my ($printerform, $branchform);
if ($printercount>1) {
    $printerform=<<"EOF";
<select name=printer> $printeroptions </select>
EOF
} else {
    my ($printer) = keys %$printers;
} 

if ($branchcount>1) {
    $branchform=<<"EOF";
<select name=branch> $branchoptions </select>
EOF
} else {
    my ($branch) = keys %$branches;
} 



#############################################################################################
# Start writing page....
# set header with cookie....

print $query->header();

print startpage();
print startmenu('circulation');

print << "EOF";
<FONT SIZE=6><em>Circulation: Select Printer and Branch Settings</em></FONT><br>

<center>
<form method=post action=/cgi-bin/koha/circ/circulation.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
<font color=black><b>Please Set Branch and Printer</b></font></td></tr>
<tr><td>
$branchform
</td>
<td>
$printerform
</td></tr>
</table>
<input type="hidden" name="setcookies" value=1>
<input type="submit" value="Submit" type="changesettings">
</form>
</center>

EOF


print endmenu('circulation');
print endpage();


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** branchtransfers.pl	14 Aug 2002 18:30:51 -0000	1.3.2.1
--- branchtransfers.pl	15 Aug 2002 00:46:26 -0000	1.3.2.2
***************
*** 25,31 ****
  use CGI;
  use C4::Circulation::Circ2;
- use C4::Search;
  use C4::Output;
  
  
  my %env;
--- 25,33 ----
  use CGI;
  use C4::Circulation::Circ2;
  use C4::Output;
+ use C4::Reserves2;
  
+ ###############################################
+ # constants
  
  my %env;
***************
*** 37,60 ****
  my $backgroundimage="/images/background-mem.gif";
  
  my $query=new CGI;
- my $branches=getbranches(\%env);
  
- my $tobranchcd=$query->param('tobranchcd');
- my $frbranchcd='';
  
! $env{'tobranchcd'}=$tobranchcd;
  
  
  my $tobranchoptions;
! foreach (keys %$branches) {
!         (next) unless ($_);
!         (next) if (/^TR$/);
!         my $selected='';
!         ($selected='selected') if ($_ eq $tobranchcd);
!         $tobranchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
  }
  
  # collect the stack of books already transfered so they can printed...
- my @messages;
  my %transfereditems;
  my $ritext = '';
--- 39,75 ----
  my $backgroundimage="/images/background-mem.gif";
  
+ my $branches = getbranches();
+ my $printers = getprinters(\%env);
+ 
+ 
+ ###############################################
+ #  Getting state
+ 
  my $query=new CGI;
  
  
! my $branch = $query->param("branch");
! my $printer = $query->param("printer");
  
  
+ ($branch) || ($branch=$query->cookie('branch')) ;
+ ($printer) || ($printer=$query->cookie('printer')) ;
+ 
+ my $request=$query->param('request');
+ 
+ 
+ my $tobranchcd=$query->param('tobranchcd');
+ my $frbranchcd='';
+ 
+ # set up the branchselect options....
  my $tobranchoptions;
! foreach my $br (keys %$branches) {
!     (next) unless $branches->{$br}->{'CU'};
!     my $selected='';
!     ($selected='selected') if ($br eq $tobranchcd);
!     $tobranchoptions.="<option value=$br $selected>$branches->{$br}->{'branchname'}\n";
  }
  
  # collect the stack of books already transfered so they can printed...
  my %transfereditems;
  my $ritext = '';
***************
*** 76,112 ****
      }
  
- #if the barcode has been entered action that and write a message and onto the top of the stack...
- my $iteminformation;
  
! my $todaysdate;
! if (my $barcode=$query->param('barcode')) {
!     my $iteminformation = getiteminformation(\%env,0, $barcode);
!     my $fail=0;
!     if (not $iteminformation) {
! 	$fail=1;
! 	@messages = ("There is no book with barcode: $barcode ", @messages);
!     }
!     $frbranchcd = $iteminformation->{'holdingbranch'};
!     %env->{'frbranchcd'} = $frbranchcd;
!     if ($frbranchcd eq $tobranchcd) {
! 	$fail=1;
! 	@messages = ("You can't transfer the book to the branch it is already at!", @messages);
!     }
! # should add some more tests ... like is the book already out, maybe it cant be moved....
!     if (not $fail) {
! 	my ($transfered, $message) = transferbook(\%env, $iteminformation, $barcode);
! 	if (not $transfered) {@messages = ($message, @messages);}
! 	else {
! 	    $ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! 	    $ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! 	    $ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! 	    $transfereditems{0}=$barcode;
! 	    $frbranchcds{0}=$frbranchcd;
! 	    $tobranchcds{0}=$tobranchcd;
! 	    @messages = ("Book: $barcode has been transfered", @messages);
! 	}
      }
  }
  
  my $entrytext= << "EOF";
  <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
--- 91,151 ----
      }
  
  
! # Collect a few messages here...
! my $messagetext='';
! 
! ############
! # Deal with the requests....
! if ($request eq "KillWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve(0, $item, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! my $ignoreRs = 0;
! if ($request eq "SetWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     $tobranchcd = ReserveWaiting($item, $borrnum);
!     $ignoreRs = 1;
!     $messagetext .= "Item should now be waiting at branch: $branches->{$tobranchcd}->{'branchname'}<br>";
! }
! if ($request eq 'KillReserved'){
!     my $biblio = $query->param('biblionumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve($biblio, 0, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! 
! 
! 
! 
! # Warnings etc that get displayed at top of next page....
! my $messages;
! # if the barcode has been entered action that and write a message 
! # and put onto the top of the stack...
! my $iteminformation;
! my $barcode = $query->param('barcode');
! if ($barcode) {
!     my $transfered;
!     my $iteminformation;
!     ($transfered, $messages, $iteminformation) 
!                    = transferbook($tobranchcd, $barcode, $ignoreRs);
!     if ($transfered) {
! 	my $frbranchcd = $iteminformation->{'holdingbranch'};
! 	$ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! 	$ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! 	$ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! 	$transfereditems{0}=$barcode;
! 	$frbranchcds{0}=$frbranchcd;
! 	$tobranchcds{0}=$tobranchcd;
      }
  }
  
+ 
+ #################################################################################
+ # Html code....
+ # collect together the various elements...
+ 
  my $entrytext= << "EOF";
  <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
***************
*** 129,160 ****
  EOF
  
! my $messagetable;
! if (@messages) {
!     my $messagetext='';
!     foreach (@messages) {
! 	$messagetext.="$_<p>\n";
      }
      $messagetable = << "EOF";
! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Messages</font></th></tr>
  <tr><td> $messagetext </td></tr></table>
  EOF
  }
  
! 
  
  print $query->header;
  print startpage;
! print startmenu('circulation');
! print "<FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>";
! 
! 
! print $messagetable if (@messages);
  
  
! print $entrytext;
  
! if (%transfereditems) {
!     print << "EOF"; 
  <p>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>                                                                
--- 168,336 ----
  EOF
  
! 
! 
! #####################
! 
! my $reservefoundtext;
! if ($messages->{'ResFound'}) {
!     my $res = $messages->{'ResFound'};
!     my $reservetext;
!     my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!     my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
!     my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
!     my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
!     if ($res->{'ResFound'} eq "Waiting") {
! 	$reservetext = <<"EOF";
! <font color='red' size='+2'>Item marked Waiting:</font><br>
!     Item is marked waiting at $branchname for $name ($number).<br>
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillWaiting'>
! <input type=submit value="Cancel">
! </form>
! </td></tr>
! <tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
!     } 
!     if ($res->{'ResFound'} eq "Reserved") {
! 	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved:</font> reserve found for $name ($number).
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Set reserve to waiting and transfer book to <b>$branchname </b>: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='SetWaiting'>
! <input type=submit value="Waiting">
! </form>
! </td></tr>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=biblionumber value=$res->{'biblionumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillReserved'>
! <input type=submit value="Cancel">
! </form>
! </td></tr><tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! $ritext
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
      }
+     $reservefoundtext = <<"EOF";
+ <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
+ <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
+ <tr><td> $reservetext </td></tr></table>
+ EOF
+ }
+ 
+ #####################
+ 
+ foreach my $code (keys %$messages) {
+     if ($code eq 'BadBarcode'){
+ 	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
+     }
+     if ($code eq 'IsPermanent'){
+ 	my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
+ 	$messagetext .= "<font color='red' size='+2'> Please return item to home branch: $braname  </font> <br>";
+     }
+     if ($code eq 'DestinationEqualsHolding'){
+ 	$messagetext .= "<font color='red' size='+2'> Item is already at destination branch. </font> <br>";
+     }
+     if ($code eq 'WasReturned') {
+ 	my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
+ 
+ 	my $binfo = <<"EOF";
+ <a href=/cgi-bin/koha/moremember.pl?bornum=$borrowerinfo->{'borrowernumber'} 
+ onClick="openWindow(this,'Member', 480, 640)">$borrowerinfo->{'cardnumber'}</a>
+ $borrowerinfo->{'surname'}, $borrowerinfo->{'title'} $borrowerinfo->{'firstname'}
+ EOF
+ 	$messagetext .= "Item was on loan to $binfo and has been returned. <br>";
+     }
+     if ($code eq 'WasTransfered'){
+ # Put code here if you want to notify the user that item was transfered...
+     }
+ }
+ $messagetext = substr($messagetext, 0, -4);
+ 
+ my $messagetable;
+ if ($messagetext) {
      $messagetable = << "EOF";
! <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
  <tr><td> $messagetext </td></tr></table>
+ <img src="/images/holder.gif" width=24 height=24>
  EOF
  }
  
! #######################################################################################
! # Make the page .....
  
  print $query->header;
  print startpage;
! #print startmenu('circulation');
! my @inp=startmenu('circulation');
! my $count=@inp;
! for (my $i=0;$i<$count;$i++){
!         $inp[$i]=~ s/document.forms\[0\].elements\[0\]/document\.forms\[0\]\.elements\[1\]/;
!     }
! print @inp;
  
+ #foreach my $key (%$messages) {
+ #    print $key." : ".$messages->{$key}."<br>";
+ #}
+ 
+ print <<"EOF";
+ <table align=right><tr><td>
+ <a href=circulation.pl>
+ <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Next Borrower"></a> &nbsp
+ <a href=returns.pl>
+ <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
+ </td></tr></table>
+ 
+ <FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>
+ <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
+ <b>Printer:</b> $printers->{$printer}->{'printername'}<br>
+ <a href=selectbranchprinter.pl>Change Settings</a>
+ <input type=hidden name=branch value=$branch>
+ <input type=hidden name=printer value=$printer>
+ <p>           
+ EOF
  
! if ($reservefoundtext) {
!     print $reservefoundtext;
! } else {
!     print $messagetable;
!     print $entrytext;
  
!     if (%transfereditems) {
! 	print << "EOF";
  <p>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>                                                                
***************
*** 162,173 ****
  <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  EOF
!     my $color='';
!     foreach (keys %transfereditems) {
! 	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 	my $barcode=$transfereditems{$_};
! 	my $frbcd=$frbranchcds{$_};
! 	my $tobcd=$tobranchcds{$_};
! 	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! 	print << "EOF";
  <tr><td bgcolor=$color align=center>
  <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
--- 338,349 ----
  <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  EOF
!         my $color='';
! 	foreach (sort keys %transfereditems) {
! 	    ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 	    my $barcode=$transfereditems{$_};
! 	    my $frbcd=$frbranchcds{$_};
! 	    my $tobcd=$tobranchcds{$_};
! 	    my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! 	    print << "EOF";
  <tr><td bgcolor=$color align=center>
  <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
***************
*** 180,188 ****
  </tr>\n
  EOF
! }
!     print "</table>\n";
  }
  
  print endmenu('circulation');
  print endpage;
  
--- 356,366 ----
  </tr>\n
  EOF
!         }
! 	print "</table>\n";
!     }
  }
  
  print endmenu('circulation');
  print endpage;
+ 
  

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -r1.23.2.3 -r1.23.2.4
*** circulation.pl	14 Aug 2002 18:30:51 -0000	1.23.2.3
--- circulation.pl	15 Aug 2002 00:46:26 -0000	1.23.2.4
***************
*** 1,4 ****
--- 1,7 ----
  #!/usr/bin/perl
  
+ #written 8/5/2002 by Finlay
+ #script to execute issuing of books
+ 
  
  # Copyright 2000-2002 Katipo Communications
***************
*** 19,24 ****
[...1514 lines suppressed...]
+     foreach (sort keys %$borrowerissues) {
+ 	$issues[$i]=$borrowerissues->{$_};
+ 	my $dd=$issues[$i]->{'date_due'};
+ 	#convert to nz style dates
+ 	#this should be set with some kinda config variable
+ 	my @tempdate=split(/-/,$dd);
+ 	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ 	$i++;
+     }
+     foreach (sort keys %$borroweriss2) {
+ 	$issues[$i]=$borroweriss2->{$_};
+ 	my $dd=$issues[$i]->{'date_due'};
+ 	#convert to nz style dates
+ 	#this should be set with some kinda config variable
+ 	my @tempdate=split(/-/,$dd);
+ 	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ 	$i++;
+     }
+     remoteprint($env,\@issues,$borrower);
  }




From rangi at users.sourceforge.net  Thu Aug 15 04:02:43 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 19:02:43 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.33,1.34
Message-ID: <E17f9yF-0001qE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv6628/C4

Modified Files:
	Search.pm 
Log Message:
Fix for last borrower for the moredetail.pl page
sCVS: 


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Search.pm	14 Aug 2002 18:12:51 -0000	1.33
--- Search.pm	15 Aug 2002 02:02:40 -0000	1.34
***************
*** 123,127 ****
      }
    }
!   if ($env->{itemcount}) {
      foreach my $data (@results){
        my ($counts) = itemcount2($env, $data->{'biblionumber'}, 'intra');
--- 123,127 ----
      }
    }
!   if ($env->{itemcount} eq '1') {
      foreach my $data (@results){
        my ($counts) = itemcount2($env, $data->{'biblionumber'}, 'intra');
***************
*** 337,340 ****
--- 337,341 ----
          $sth->finish;                                             
  	$data2->{'dewey'}=$dewey;
+ 	
  	$res2[$i]=$data2;
  #	$res2[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey";
***************
*** 561,565 ****
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	 }
! 	 
  
  	 $query.=" group by biblio.biblionumber";
--- 562,568 ----
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	 }
! 	 if ($search->{'date-before'} ne ''){
! 	    $query.= " and (copyrightdate like '%$search->{'date-before'}%')";
! 	   }
  
  	 $query.=" group by biblio.biblionumber";
***************
*** 608,611 ****
--- 611,617 ----
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	   }
+ 	   if ($search->{'date-before'} ne ''){
+ 	    $query.= " and (copyrightdate like '%$search->{'date-before'}%')";
+ 	   }
  	  } elsif ($search->{'class'} ne ''){
  	     $query="select * from biblioitems,biblio where biblio.biblionumber=biblioitems.biblionumber";
***************
*** 636,639 ****
--- 642,648 ----
  	  } elsif ($search->{'abstract'} ne ''){
  	    $query.= "Select * from biblio where abstract like '%$search->{'abstract'}%'";
+ 	  
+ 	  } elsif ($search->{'date-before'} ne ''){
+ 	    $query.= "Select * from biblio where copyrightdate like '%$search->{'date-before'}%'";
  	  }
            $query .=" group by biblio.biblionumber";	 
***************
*** 716,720 ****
  my $limit= $num+$offset;
  while (my $data=$sth->fetchrow_hashref){
!   my $query="select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'}";
    	    if ($search->{'class'} ne ''){
  	      my @temp=split(/\|/,$search->{'class'});
--- 725,729 ----
  my $limit= $num+$offset;
  while (my $data=$sth->fetchrow_hashref){
!   my $query="select dewey,subclass,publishercode from biblioitems where biblionumber=$data->{'biblionumber'}";
    	    if ($search->{'class'} ne ''){
  	      my @temp=split(/\|/,$search->{'class'});
***************
*** 735,739 ****
  	    $query.= " and (publishercode like '%$search->{'publisher'}%')";
  	    }
! #print STDERR "$query\n";
    my $sti=$dbh->prepare($query);
    $sti->execute;
--- 744,748 ----
  	    $query.= " and (publishercode like '%$search->{'publisher'}%')";
  	    }
! 
    my $sti=$dbh->prepare($query);
    $sti->execute;
***************
*** 741,751 ****
    my $subclass;
    my $true=0;
!   if (($dewey, $subclass) = $sti->fetchrow || $type eq 'subject'){
      $true=1;
    }
    $dewey=~s/\.*0*$//;
    ($dewey == 0) && ($dewey='');
    ($dewey) && ($dewey.=" $subclass");
    $data->{'dewey'}=$dewey;
    $sti->finish;
    if ($true == 1){
--- 750,767 ----
    my $subclass;
    my $true=0;
!   my $publishercode;
!   my $bibitemdata;
!   if ($bibitemdata = $sti->fetchrow_hashref() || $type eq 'subject'){
      $true=1;
+     $dewey=$bibitemdata->{'dewey'};
+     $subclass=$bibitemdata->{'subclass'};
+     $publishercode=$bibitemdata->{'publishercode'};
    }
+   print STDERR "$dewey $subclass $publishercode\n";
    $dewey=~s/\.*0*$//;
    ($dewey == 0) && ($dewey='');
    ($dewey) && ($dewey.=" $subclass");
    $data->{'dewey'}=$dewey;
+   $data->{'publishercode'}=$publishercode;
    $sti->finish;
    if ($true == 1){
***************
*** 968,972 ****
      $sth->execute;
      while (my $dat = $sth->fetchrow_hashref){
!         $data->{'subject'} .= " | $dat->{'subject'}";
      } # while
  
--- 984,988 ----
      $sth->execute;
      while (my $dat = $sth->fetchrow_hashref){
!         $data->{'subject'} .= " , $dat->{'subject'}";
      } # while
  
***************
*** 1086,1090 ****
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! order by date_due desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
--- 1102,1107 ----
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! and returndate is not NULL
! order by returndate desc,timestamp desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
***************
*** 1385,1389 ****
      $sth2->execute;         
      if (my $data2=$sth2->fetchrow_hashref){         
!        $counts{'notavailable'}++;         
      } else {         
         $counts{$data->{'branchname'}}++;
--- 1402,1406 ----
      $sth2->execute;         
      if (my $data2=$sth2->fetchrow_hashref){         
!        $counts{'not available'}++;         
      } else {         
         $counts{$data->{'branchname'}}++;




From rangi at users.sourceforge.net  Thu Aug 15 04:05:01 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 19:05:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.7,1.18.2.8
Message-ID: <E17fA0T-00029t-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7951/C4

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
Fix for itemissues, fetching the right dates for last borrowers for use on
the moredetail.pl page


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -C2 -r1.18.2.7 -r1.18.2.8
*** Search.pm	14 Aug 2002 18:30:50 -0000	1.18.2.7
--- Search.pm	15 Aug 2002 02:04:59 -0000	1.18.2.8
***************
*** 1120,1124 ****
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! order by date_due desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
--- 1120,1125 ----
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! and returndate is not NULL
! order by returndate desc, timestamp desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;




From finlayt at users.sourceforge.net  Thu Aug 15 05:13:46 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:13:46 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.37,1.38
Message-ID: <E17fB50-0003gH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv13754/circ

Modified Files:
	circulation.pl 
Log Message:

changed the color to red and size to +2 for the Issuing Question....


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.pl	14 Aug 2002 18:12:53 -0000	1.37
--- circulation.pl	15 Aug 2002 03:13:44 -0000	1.38
***************
*** 246,250 ****
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
! <font color=black><b>Issuing Question</b></font></th></tr>
  <tr><td><table border=0 cellpadding=10><tr><td> 
  Attempting to issue $iteminformation->{'title'} 
--- 246,250 ----
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
! <font size=+2 color=red><b>Issuing Question</b></font></th></tr>
  <tr><td><table border=0 cellpadding=10><tr><td> 
  Attempting to issue $iteminformation->{'title'} 




From finlayt at users.sourceforge.net  Thu Aug 15 05:27:30 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:27:30 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.32,1.33
Message-ID: <E17fBII-0005ES-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19837/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

Added some red color here into the message that appears when a waiting book is attempted to be issued.


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Circ2.pm	14 Aug 2002 18:12:52 -0000	1.32
--- Circ2.pm	15 Aug 2002 03:27:28 -0000	1.33
***************
*** 328,335 ****
  	my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date);
  	if ($amount > 5 && $patroninformation->{'categorycode'} ne 'L' &&
!                          $patroninformation->{'categorycode'} ne 'W' &&
!                          $patroninformation->{'categorycode'} ne 'I' && 
!                          $patroninformation->{'categorycode'} ne 'B' &&
!                          $patroninformation->{'categorycode'} ne 'P') {
  	    $rejected = sprintf "Patron owes \$%.02f.", $amount;
  	    last SWITCH;
--- 328,335 ----
  	my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date);
  	if ($amount > 5 && $patroninformation->{'categorycode'} ne 'L' &&
!                            $patroninformation->{'categorycode'} ne 'W' &&
!                            $patroninformation->{'categorycode'} ne 'I' && 
!                            $patroninformation->{'categorycode'} ne 'B' &&
!                            $patroninformation->{'categorycode'} ne 'P') {
  	    $rejected = sprintf "Patron owes \$%.02f.", $amount;
  	    last SWITCH;
***************
*** 408,412 ****
  		if ($responses->{2} eq '') {
  		    $questionnumber=2;
! 		    $question="Waiting for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) at $branchname \nAllow issue?";
  		    $defaultanswer='N';
  		    last SWITCH;
--- 408,412 ----
  		if ($responses->{2} eq '') {
  		    $questionnumber=2;
! 		    $question="<font color=red>Waiting</font> for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) at $branchname \nAllow issue?";
  		    $defaultanswer='N';
  		    last SWITCH;




From finlayt at users.sourceforge.net  Thu Aug 15 05:31:04 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:31:04 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.13,1.14
Message-ID: <E17fBLk-0005ds-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv21129/C4

Modified Files:
	Reserves2.pm 
Log Message:

Fixed a really terrible bug! Took out the fixpriorities call in FillReserve. This is not necesary because the priorities are fixed up when the item is set to waiting in ReserveWaiting.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Reserves2.pm	14 Aug 2002 18:12:51 -0000	1.13
--- Reserves2.pm	15 Aug 2002 03:31:02 -0000	1.14
***************
*** 66,70 ****
    }
    $query.=" order by priority";
-   warn $query;
    my $sth=$dbh->prepare($query);
    $sth->execute;
--- 66,69 ----
***************
*** 124,133 ****
  	    }
  	}
- 	warn "highest = $highest";
  	$highest->{'itemnumber'} = $item;
- 	foreach my $key (keys %$highest) {
- 	    warn "$key : $highest->{$key}\n";
- 	}
- 
  	return ("Reserved", $highest);
      } else {
--- 123,127 ----
***************
*** 203,208 ****
      $sth->finish;
      $dbh->disconnect;
- # now fix the priority on the others....
-     fixpriority($res->{'priority'}, $biblio);
  }
  
--- 197,200 ----
***************
*** 337,341 ****
      my $nextacctno = &getnextacctno($env,$borrnum,$dbh);   
      my $updquery = "insert into accountlines       
!     (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)                                              
  						          values
      ($borrnum,$nextacctno,now(),$fee,'Reserve Charge - $title','Res',$fee)";          
--- 329,333 ----
      my $nextacctno = &getnextacctno($env,$borrnum,$dbh);   
      my $updquery = "insert into accountlines       
!     (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
  						          values
      ($borrnum,$nextacctno,now(),$fee,'Reserve Charge - $title','Res',$fee)";          




From finlayt at users.sourceforge.net  Fri Aug 16 00:26:36 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 15 Aug 2002 15:26:36 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.13,1.14
Message-ID: <E17fT4e-0004vP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv18824/circ

Modified Files:
	returns.pl 
Log Message:

Changed the wording of the reserves print slip slightly.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** returns.pl	14 Aug 2002 18:12:53 -0000	1.13
--- returns.pl	15 Aug 2002 22:26:34 -0000	1.14
***************
*** 230,234 ****
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 230,234 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'firstname'} $borr->{'surname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}




From tonnesen at users.sourceforge.net  Fri Aug 16 22:42:34 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:42:34 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.5,1.21.2.6
Message-ID: <E17fnvW-0005ol-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv22304

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Added missing $accessflagshash chunk to getpatroninformation


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -C2 -r1.21.2.5 -r1.21.2.6
*** Circ2.pm	15 Aug 2002 00:46:26 -0000	1.21.2.5
--- Circ2.pm	16 Aug 2002 20:42:32 -0000	1.21.2.6
***************
*** 138,141 ****
--- 138,150 ----
      my $borrower = $sth->fetchrow_hashref;
      my $flags = patronflags($env, $borrower, $dbh);
+     my $accessflagshash;
+ 
+     $sth=$dbh->prepare("select bit,flag from userflags");
+     $sth->execute;
+     while (my ($bit, $flag) = $sth->fetchrow) {
+ 	if ($flags & 2**$bit) {
+ 	    $accessflagshash->{$flag}=1;
+ 	}
+     }
      $sth->finish;
      $dbh->disconnect;




From tonnesen at users.sourceforge.net  Fri Aug 16 22:44:44 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:44:44 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.23.2.4,1.23.2.5 returns.pl,1.13.2.1,1.13.2.2
Message-ID: <E17fnxc-000616-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv23048

Modified Files:
      Tag: rel-1-2
	circulation.pl returns.pl 
Log Message:
Fixed '_' character between issues, returns, and transfers buttons.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -C2 -r1.23.2.4 -r1.23.2.5
*** circulation.pl	15 Aug 2002 00:46:26 -0000	1.23.2.4
--- circulation.pl	16 Aug 2002 20:44:42 -0000	1.23.2.5
***************
*** 201,207 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 201,205 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
***************
*** 218,224 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 216,220 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** returns.pl	15 Aug 2002 00:46:26 -0000	1.13.2.1
--- returns.pl	16 Aug 2002 20:44:42 -0000	1.13.2.2
***************
*** 157,162 ****
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF
--- 157,161 ----
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF




From tonnesen at users.sourceforge.net  Fri Aug 16 22:46:42 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:46:42 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.14,1.15 circulation.pl,1.38,1.39
Message-ID: <E17fnzW-00069u-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv23614

Modified Files:
	returns.pl circulation.pl 
Log Message:
Removed '_' between issues, returns, and transfers graphics


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** returns.pl	15 Aug 2002 22:26:34 -0000	1.14
--- returns.pl	16 Aug 2002 20:46:40 -0000	1.15
***************
*** 157,162 ****
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF
--- 157,161 ----
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** circulation.pl	15 Aug 2002 03:13:44 -0000	1.38
--- circulation.pl	16 Aug 2002 20:46:40 -0000	1.39
***************
*** 192,198 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 192,196 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
***************
*** 209,215 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 207,211 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>




From tonnesen at users.sourceforge.net  Fri Aug 16 22:53:25 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:53:25 -0700
Subject: [Koha-cvs] CVS: koha buildrelease,1.1.2.19,1.1.2.20
Message-ID: <E17fo61-0006kK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv25854

Modified Files:
      Tag: rel-1-2
	buildrelease 
Log Message:
Set all .pl scripts in intranet-cgi executable


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -C2 -r1.1.2.19 -r1.1.2.20
*** buildrelease	26 Jul 2002 13:46:50 -0000	1.1.2.19
--- buildrelease	16 Aug 2002 20:53:23 -0000	1.1.2.20
***************
*** 266,269 ****
--- 266,271 ----
  system("rm -rf $rootdir/intranet-cgi/t");
  
+ # Set all .pl scripts executable
+ system("find $rootdir/intranet-cgi -name '*.pl' -exec chmod a+x \\{\\} \\;"); 
  # Copy all CVS files to intranet-html and opac-html
  system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");




From tonnesen at users.sourceforge.net  Fri Aug 16 23:01:22 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 14:01:22 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.12,1.1.2.13
Message-ID: <E17foDi-0007UG-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28633

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Added 'IS' and 'CU' flags for default MAIN branch.


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -r1.1.2.12 -r1.1.2.13
*** Install.pm	14 Aug 2002 18:30:50 -0000	1.1.2.12
--- Install.pm	16 Aug 2002 21:01:20 -0000	1.1.2.13
***************
*** 1123,1126 ****
--- 1123,1128 ----
  	    system("gzip -9 sampledata-1.2");
  	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
+ 	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
+ 	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
  	    showmessage(getmessage('SampleDataInstalled'), 'PressEnter');




From tonnesen at users.sourceforge.net  Fri Aug 16 23:02:11 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 14:02:11 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.13,1.1.2.14
Message-ID: <E17foEV-0007Ze-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28934

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
branchrelations fix needed to be done in two places...


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -r1.1.2.13 -r1.1.2.14
*** Install.pm	16 Aug 2002 21:01:20 -0000	1.1.2.13
--- Install.pm	16 Aug 2002 21:02:09 -0000	1.1.2.14
***************
*** 1147,1150 ****
--- 1147,1152 ----
  
  		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
+ 		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
+ 		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='Library Printer';




From rangi at users.sourceforge.net  Sat Aug 17 00:50:07 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Fri, 16 Aug 2002 15:50:07 -0700
Subject: [Koha-cvs] CVS: koha/C4 Print.pm,1.3.2.4,1.3.2.5
Message-ID: <E17fpux-0007AZ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv27379/C4

Modified Files:
      Tag: rel-1-2
	Print.pm 
Log Message:
Merging across print.pm fixes bug 80
missing printslip routine


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** Print.pm	14 Aug 2002 18:30:50 -0000	1.3.2.4
--- Print.pm	16 Aug 2002 22:50:05 -0000	1.3.2.5
***************
*** 29,33 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve);
  
  sub remoteprint {
--- 29,34 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve &printslip);
! 
  
  sub remoteprint {
***************
*** 73,102 ****
  
  sub printreserve {
!   my($env,$resrec,$rbordata,$itemdata)=@_;
    my $file=time;
!   my $queue = $env->{'queue'};
!   #if ($queue eq "") {
      open (PRINTER,">/tmp/kohares");
!   #} else {
!   #  open (PRINTER, "| lpr -P $queue") or die "Couldn't write to queue:$!\n";
!   #}  
!   print PRINTER "Collect at $resrec->{'branchcode'}\r\n\r\n";
!   print PRINTER "$rbordata->{'surname'}; $rbordata->{'firstname'}\r\n";
!   print PRINTER "$rbordata->{'cardnumber'}\r\n";
!   print PRINTER "Phone: $rbordata->{'phone'}\r\n";
!   print PRINTER "$rbordata->{'streetaddress'}\r\n";
!   print PRINTER "$rbordata->{'suburb'}\r\n";
!   print PRINTER "$rbordata->{'town'}\r\n";   
!   print PRINTER "$rbordata->{'emailaddress'}\r\n\r\n";
!   print PRINTER "$itemdata->{'barcode'}\r\n";
!   print PRINTER "$itemdata->{'title'}\r\n";
!   print PRINTER "$itemdata->{'author'}";
!   print PRINTER "\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
!   if ($env->{'printtype'} eq "docket"){ 
!     #print chr(27).char(105);
!   }  
    close PRINTER;
-   #system("lpr /tmp/$file"); 
  }
  END { }       # module clean-up code here (global destructor)
    
--- 74,128 ----
  
  sub printreserve {
!   my($env, $branchname, $bordata, $itemdata)=@_;
    my $file=time;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
!     open (PRINTER,">>/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   my @da = localtime(time());
!   my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
! 
! #(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
!   my $slip = <<"EOF";
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Date: $todaysdate;
! 
! ITEM RESERVED: 
! $itemdata->{'title'} ($itemdata->{'author'})
! barcode: $itemdata->{'barcode'}
! 
! COLLECT AT: $branchname
! 
! BORROWER:
! $bordata->{'surname'}, $bordata->{'firstname'}
! card number: $bordata->{'cardnumber'}
! Phone: $bordata->{'phone'}
! $bordata->{'streetaddress'}
! $bordata->{'suburb'}
! $bordata->{'town'}
! $bordata->{'emailaddress'}
! 
! 
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! EOF
!     print PRINTER $slip;
!   close PRINTER;
!   return $slip;
! }
! 
! sub printslip {
!   my($env, $slip)=@_;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
      open (PRINTER,">/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   print PRINTER $slip;
    close PRINTER;
  }
+ 
  END { }       # module clean-up code here (global destructor)
    




From finlayt at users.sourceforge.net  Mon Aug 19 07:37:17 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 22:37:17 -0700
Subject: [Koha-cvs] CVS: koha detail.pl,1.10,1.11
Message-ID: <E17gfE5-0005KW-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20254

Modified Files:
	detail.pl 
Log Message:

added a Boolean: $norequests whhich is set on the template detail.tmpl so that the "requests" button only apears if it is actually possible to make a request. This is set by checking against the "notforloan" field on the itemtypes table.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** detail.pl	14 Aug 2002 18:12:51 -0000	1.10
--- detail.pl	19 Aug 2002 05:37:15 -0000	1.11
***************
*** 46,57 ****
     $value=~s/\s*$//g;
     $configfile{$variable}=$value;
-  }
  }
  
  my $biblionumber=$query->param('bib');
  my $type='intra';
  
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
  my $dat=bibdata($biblionumber);
  my ($authorcount, $addauthor)= &addauthor($biblionumber);
--- 46,67 ----
     $value=~s/\s*$//g;
     $configfile{$variable}=$value;
  }
+ }	
  
  my $biblionumber=$query->param('bib');
  my $type='intra';
  
+ 
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
+ my $norequests = 1;
+ foreach my $itm (@items) {
+      $norequests = 0 unless $itm->{'notforloan'};
+ }
+ 
+ warn "Biblionumber: $biblionumber";
+ warn "Norequests: $norequests"; 
+ 
+ 
  my $dat=bibdata($biblionumber);
  my ($authorcount, $addauthor)= &addauthor($biblionumber);
***************
*** 101,104 ****
--- 111,115 ----
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
+ $template->param(norequests => $norequests);
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray);




From finlayt at users.sourceforge.net  Mon Aug 19 07:39:03 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 22:39:03 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue detail.tmpl,1.4.4.3,1.4.4.4
Message-ID: <E17gfFn-0005Pq-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv20654

Modified Files:
      Tag: rel-1-2
	detail.tmpl 
Log Message:

Added an if loop to check the "norequests" variable so as to decide whether to put the Requests button. See detail.pl



Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/detail.tmpl,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -C2 -r1.4.4.3 -r1.4.4.4
*** detail.tmpl	31 Jul 2002 04:59:13 -0000	1.4.4.3
--- detail.tmpl	19 Aug 2002 05:39:01 -0000	1.4.4.4
***************
*** 1,4 ****
  <TMPL_INCLUDE NAME="cat-top.inc">
- <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <TMPL_IF NAME="loggedinuser">
--- 1,3 ----
***************
*** 9,15 ****
  
  
! 
  <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
  src="/images/requests.gif" align="right" border="0"></a>
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
  <TMPL_VAR NAME="class"></em></font><p>
--- 8,18 ----
  
  
! <TMPL_IF NAME="norequests">
! <TMPL_ELSE>
  <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
  src="/images/requests.gif" align="right" border="0"></a>
+ </TMPL_IF>
+ <TMPL_LOOP NAME="BIBLIO_RESULTS">
+ 
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
  <TMPL_VAR NAME="class"></em></font><p>
***************
*** 20,23 ****
--- 23,29 ----
  <td bgcolor="#cccc99" background="/images/background-mem.gif">
  <b>BIBLIO RECORD</b>
+ 
+ 
+ 
  
  <TMPL_VAR NAME="biblionumber">




From rangi at users.sourceforge.net  Mon Aug 19 08:20:50 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 18 Aug 2002 23:20:50 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.8,1.18.2.9
Message-ID: <E17gfuE-0007bY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv29203/C4

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
Fix for item search


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
diff -C2 -r1.18.2.8 -r1.18.2.9
*** Search.pm	15 Aug 2002 02:04:59 -0000	1.18.2.8
--- Search.pm	19 Aug 2002 06:20:48 -0000	1.18.2.9
***************
*** 106,112 ****
  #  }
    my ($count, at results);
! #  print STDERR "Doing a search \n";
    if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''){
!         print STDERR "Doing a precise search\n";
      ($count, at results)=CatSearch($env,'precise',$search,$num,$offset);
  
--- 106,112 ----
  #  }
    my ($count, at results);
! #  print STDERR "Doing a search $search->{'itemnumber'} $search->{'isbn'}\n";
    if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''){
! #        print STDERR "Doing a precise search $search->{'itemnumber'}\n";
      ($count, at results)=CatSearch($env,'precise',$search,$num,$offset);
  
***************
*** 663,669 ****
    if ($type eq 'precise'){
        
!       if ($search->{'item'} ne ''){
          $query="select * from items,biblio ";
!         my $search2=uc $search->{'item'};
          $query=$query." where 
          items.biblionumber=biblio.biblionumber 
--- 663,669 ----
    if ($type eq 'precise'){
        
!       if ($search->{'itemnumber'} ne ''){
          $query="select * from items,biblio ";
!         my $search2=uc $search->{'itemnumber'};
          $query=$query." where 
          items.biblionumber=biblio.biblionumber 
***************
*** 697,701 ****
        }
    }
! #print $query;
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){   
--- 697,701 ----
        }
    }
! #print STDERR $query;
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){   




From rangi at users.sourceforge.net  Mon Aug 19 08:21:45 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 18 Aug 2002 23:21:45 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/catalogue index.html,1.6.4.1,1.6.4.2
Message-ID: <E17gfv7-0007fM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv29454/intranet-html/catalogue

Modified Files:
      Tag: rel-1-2
	index.html 
Log Message:
Fix for item search


Index: index.html
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/catalogue/index.html,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -r1.6.4.1 -r1.6.4.2
*** index.html	11 Jul 2002 18:00:18 -0000	1.6.4.1
--- index.html	19 Aug 2002 06:21:43 -0000	1.6.4.2
***************
*** 17,21 ****
  
  <TR VALIGN=TOP>
! <TD>Item Number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="item"></td><td> <b> &nbsp; &nbsp; OR</b></TD></TR>
  <!-- <TR VALIGN=TOP>
  <TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
--- 17,21 ----
  
  <TR VALIGN=TOP>
! <TD>Item Number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td><td> <b> &nbsp; &nbsp; OR</b></TD></TR>
  <!-- <TR VALIGN=TOP>
  <TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>




From finlayt at users.sourceforge.net  Mon Aug 19 08:29:38 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:29:38 -0700
Subject: [Koha-cvs] CVS: koha detail.pl,1.11,1.12
Message-ID: <E17gg2k-00086A-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv30794

Modified Files:
	detail.pl 
Log Message:

fixed up the CheckReserves.pm routine so that it does not put Referece items into "waiting" status if there is a reserve. Also fixed a bug in detail.pl.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** detail.pl	19 Aug 2002 05:37:15 -0000	1.11
--- detail.pl	19 Aug 2002 06:29:36 -0000	1.12
***************
*** 60,63 ****
--- 60,64 ----
  }
  
+ 
  warn "Biblionumber: $biblionumber";
  warn "Norequests: $norequests"; 
***************
*** 70,73 ****
--- 71,75 ----
  
  $dat->{'count'}=@items;
+ $dat->{'norequests'} = $norequests;
  
  $dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 111,115 ****
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
- $template->param(norequests => $norequests);
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray);
--- 113,116 ----




From finlayt at users.sourceforge.net  Mon Aug 19 08:29:38 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:29:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.14,1.15
Message-ID: <E17gg2k-00086F-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv30794/C4

Modified Files:
	Reserves2.pm 
Log Message:

fixed up the CheckReserves.pm routine so that it does not put Referece items into "waiting" status if there is a reserve. Also fixed a bug in detail.pl.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Reserves2.pm	15 Aug 2002 03:31:02 -0000	1.14
--- Reserves2.pm	19 Aug 2002 06:29:36 -0000	1.15
***************
*** 103,111 ****
      my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("select biblionumber, biblioitemnumber from items where itemnumber=$qitem");
      $sth->execute;
!     my ($biblio, $bibitem) = $sth->fetchrow_array;
      $sth->finish;
      $dbh->disconnect;
  # get the reserves...
      my ($count, @reserves) = Findgroupreserve($bibitem, $biblio);
--- 103,118 ----
      my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
!                              FROM items, biblioitems, itemtypes 
!                             WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
!                               AND biblioitems.itemtype = itemtypes.itemtype
!                               AND itemnumber=$qitem");
      $sth->execute;
!     my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;
      $sth->finish;
      $dbh->disconnect;
+ # if item is not for loan it cannot be reserved either.....
+ warn "Not for loan: $notforloan";
+     return (0, 0) if ($notforloan);
  # get the reserves...
      my ($count, @reserves) = Findgroupreserve($bibitem, $biblio);




From finlayt at users.sourceforge.net  Mon Aug 19 08:30:28 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:30:28 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue detail.tmpl,1.4.4.4,1.4.4.5
Message-ID: <E17gg3Y-0008BX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv31392

Modified Files:
      Tag: rel-1-2
	detail.tmpl 
Log Message:

little bug fix



Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/detail.tmpl,v
retrieving revision 1.4.4.4
retrieving revision 1.4.4.5
diff -C2 -r1.4.4.4 -r1.4.4.5
*** detail.tmpl	19 Aug 2002 05:39:01 -0000	1.4.4.4
--- detail.tmpl	19 Aug 2002 06:30:26 -0000	1.4.4.5
***************
*** 1,3 ****
--- 1,4 ----
  <TMPL_INCLUDE NAME="cat-top.inc">
+ <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <TMPL_IF NAME="loggedinuser">
***************
*** 13,17 ****
  src="/images/requests.gif" align="right" border="0"></a>
  </TMPL_IF>
- <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
--- 14,17 ----




From dragon28 at users.sourceforge.net  Mon Aug 19 09:44:03 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Mon, 19 Aug 2002 00:44:03 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue searchresults.tmpl,1.4.4.2,1.4.4.3
Message-ID: <E17ghCl-00041K-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv15416/koha-html/intranet-html/includes/templates/default/catalogue

Modified Files:
      Tag: rel-1-2
	searchresults.tmpl 
Log Message:
fix for prev and next icons

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/searchresults.tmpl,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -C2 -r1.4.4.2 -r1.4.4.3
*** searchresults.tmpl	25 Jul 2002 04:06:24 -0000	1.4.4.2
--- searchresults.tmpl	19 Aug 2002 07:44:01 -0000	1.4.4.3
***************
*** 29,33 ****
      <!-- Row of numbers corresponding to search result pages -->
      <TMPL_IF NAME=displayprev>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
--- 29,33 ----
      <!-- Row of numbers corresponding to search result pages -->
      <TMPL_IF NAME=displayprev>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
***************
*** 37,45 ****
  	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
  	<TMPL_ELSE>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
  	</TMPL_IF>
      </TMPL_LOOP>
      <TMPL_IF NAME=displaynext>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
--- 37,45 ----
  	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
  	<TMPL_ELSE>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
  	</TMPL_IF>
      </TMPL_LOOP>
      <TMPL_IF NAME=displaynext>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>




From dragon28 at users.sourceforge.net  Tue Aug 20 11:18:16 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:18:16 -0700
Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.1.2.4,1.1.2.5
Message-ID: <E17h59U-0005Tl-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21038/koha/admin

Modified Files:
      Tag: rel-1-2
	branches.pl 
Log Message:
fixed image alt tag

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** branches.pl	25 Jun 2002 09:22:43 -0000	1.1.2.4
--- branches.pl	20 Aug 2002 09:18:13 -0000	1.1.2.5
***************
*** 274,278 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 274,278 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add branch\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:26:12 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:26:12 -0700
Subject: [Koha-cvs] CVS: koha/admin currency.pl,1.1.2.2,1.1.2.3
Message-ID: <E17h5HA-00060Z-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23072/koha/admin

Modified Files:
      Tag: rel-1-2
	currency.pl 
Log Message:
fixed image alt tag

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** currency.pl	24 Jun 2002 18:38:36 -0000	1.1.2.2
--- currency.pl	20 Aug 2002 09:26:10 -0000	1.1.2.3
***************
*** 248,252 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 248,252 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add currency\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:28:28 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:28:28 -0700
Subject: [Koha-cvs] CVS: koha/admin printers.pl,1.1.2.3,1.1.2.4
Message-ID: <E17h5JM-000697-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23603/koha/admin

Modified Files:
      Tag: rel-1-2
	printers.pl 
Log Message:
fixed image alt tag

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** printers.pl	25 Jun 2002 11:00:49 -0000	1.1.2.3
--- printers.pl	20 Aug 2002 09:28:26 -0000	1.1.2.4
***************
*** 239,243 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 239,243 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add printer\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:30:27 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:30:27 -0700
Subject: [Koha-cvs] CVS: koha/admin stopwords.pl,1.1.2.3,1.1.2.4
Message-ID: <E17h5LH-0006HL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24112/koha/admin

Modified Files:
      Tag: rel-1-2
	stopwords.pl 
Log Message:
fixed image alt tag

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** stopwords.pl	25 Jun 2002 10:52:37 -0000	1.1.2.3
--- stopwords.pl	20 Aug 2002 09:30:25 -0000	1.1.2.4
***************
*** 228,232 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 228,232 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add stopword\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:33:00 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:33:00 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.1.2.2,1.1.2.3
Message-ID: <E17h5Nk-0006SS-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24792/koha/admin

Modified Files:
      Tag: rel-1-2
	systempreferences.pl 
Log Message:
fixed image alt tag

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** systempreferences.pl	24 Jun 2002 18:38:36 -0000	1.1.2.2
--- systempreferences.pl	20 Aug 2002 09:32:58 -0000	1.1.2.3
***************
*** 239,243 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 239,243 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add parameter\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From finlayt at users.sourceforge.net  Wed Aug 21 00:40:14 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 15:40:14 -0700
Subject: [Koha-cvs] CVS: koha/C4 Print.pm,1.8,1.9
Message-ID: <E17hHfa-0005uL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv22265/C4

Modified Files:
	Print.pm 
Log Message:

removed the printreserve routine. It has been replaced by printslip.


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Print.pm	14 Aug 2002 18:12:51 -0000	1.8
--- Print.pm	20 Aug 2002 22:40:12 -0000	1.9
***************
*** 72,114 ****
  }
  
- sub printreserve {
-   my($env, $branchname, $bordata, $itemdata)=@_;
-   my $file=time;
-   my $printer = $env->{'printer'};
-   if ($printer eq "" || $printer eq 'nulllp') {
-     open (PRINTER,">>/tmp/kohares");
-   } else {
-     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
-   }
-   my @da = localtime(time());
-   my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
- 
- #(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
-   my $slip = <<"EOF";
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Date: $todaysdate;
- 
- ITEM RESERVED: 
- $itemdata->{'title'} ($itemdata->{'author'})
- barcode: $itemdata->{'barcode'}
- 
- COLLECT AT: $branchname
- 
- BORROWER:
- $bordata->{'surname'}, $bordata->{'firstname'}
- card number: $bordata->{'cardnumber'}
- Phone: $bordata->{'phone'}
- $bordata->{'streetaddress'}
- $bordata->{'suburb'}
- $bordata->{'town'}
- $bordata->{'emailaddress'}
- 
- 
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- EOF
-     print PRINTER $slip;
-   close PRINTER;
-   return $slip;
- }
  
  sub printslip {
--- 72,75 ----




From finlayt at users.sourceforge.net  Wed Aug 21 03:31:20 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 18:31:20 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.15,1.16
Message-ID: <E17hKLA-00012J-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv3804/C4

Modified Files:
	Reserves2.pm 
Log Message:

Fixed a bug in the reordering priorities in FillReserve and andother different bug in CheckReserves.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Reserves2.pm	19 Aug 2002 06:29:36 -0000	1.15
--- Reserves2.pm	21 Aug 2002 01:31:16 -0000	1.16
***************
*** 99,103 ****
  sub CheckReserves {
      my ($item) = @_;
!     warn "In CheckReserves";
      my $dbh=C4Connect;
      my $qitem=$dbh->quote($item);
--- 99,103 ----
  sub CheckReserves {
      my ($item) = @_;
!     warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
      my $qitem=$dbh->quote($item);
***************
*** 113,117 ****
      $dbh->disconnect;
  # if item is not for loan it cannot be reserved either.....
- warn "Not for loan: $notforloan";
      return (0, 0) if ($notforloan);
  # get the reserves...
--- 113,116 ----
***************
*** 130,133 ****
--- 129,134 ----
  	    }
  	}
+     }
+     if ($highest) {
  	$highest->{'itemnumber'} = $item;
  	return ("Reserved", $highest);
***************
*** 159,163 ****
  	my $q_biblio = $dbh->quote($biblio);
  	$borr = $dbh->quote($borr);
! # fix up the priorities on the other records....
  	my $query = "SELECT priority FROM reserves 
                                      WHERE biblionumber   = $q_biblio 
--- 160,164 ----
  	my $q_biblio = $dbh->quote($biblio);
  	$borr = $dbh->quote($borr);
! # get the prioritiy on this record....
  	my $query = "SELECT priority FROM reserves 
                                      WHERE biblionumber   = $q_biblio 
***************
*** 190,197 ****
      my ($res) = @_;
      my $dbh=C4Connect;
! # removing a waiting reserve record....
      my $biblio = $res->{'biblionumber'}; my $qbiblio = $dbh->quote($biblio);
      my $borr = $res->{'borrowernumber'}; $borr = $dbh->quote($borr);
      my $resdate = $res->{'reservedate'}; $resdate = $dbh->quote($resdate);
  # update the database...
      my $query = "UPDATE reserves SET found            = 'F', 
--- 191,207 ----
      my ($res) = @_;
      my $dbh=C4Connect;
! # fillinf a reserve record....
      my $biblio = $res->{'biblionumber'}; my $qbiblio = $dbh->quote($biblio);
      my $borr = $res->{'borrowernumber'}; $borr = $dbh->quote($borr);
      my $resdate = $res->{'reservedate'}; $resdate = $dbh->quote($resdate);
+ # get the prioritiy on this record....
+     my $query = "SELECT priority FROM reserves 
+                                 WHERE biblionumber   = $qbiblio 
+                                   AND borrowernumber = $borr
+                                   AND reservedate    = $resdate)";
+     my $sth=$dbh->prepare($query);
+     $sth->execute;
+     my ($priority) = $sth->fetchrow_array;
+     $sth->finish;
  # update the database...
      my $query = "UPDATE reserves SET found            = 'F', 
***************
*** 203,206 ****
--- 213,220 ----
      $sth->execute;
      $sth->finish;
+ # now fix the priority on the others (if the priority wasnt already sorted!)....
+     unless ($priority == 0) {
+ 	fixpriority($priority, $biblio);
+     }
      $dbh->disconnect;
  }




From finlayt at users.sourceforge.net  Wed Aug 21 03:40:49 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 18:40:49 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.39,1.40
Message-ID: <E17hKUL-0001VB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv5667/circ

Modified Files:
	circulation.pl 
Log Message:

Fixed a little bug so that flags get recalculated after an item is issued.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** circulation.pl	16 Aug 2002 20:46:40 -0000	1.39
--- circulation.pl	21 Aug 2002 01:40:47 -0000	1.40
***************
*** 102,106 ****
  
  
! # get the currently issued books......
  my $borrower;
  my $flags;
--- 102,106 ----
  
  
! # get the borrower information.....
  my $borrower;
  my $flags;
***************
*** 121,125 ****
  
  
! # if the barcode is set
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
--- 121,125 ----
  
  
! 
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
***************
*** 128,132 ****
  my $day=$query->param('day');
  
! 
  if ($barcode) {
      $barcode = cuecatbarcodedecode($barcode);
--- 128,132 ----
  my $day=$query->param('day');
  
! # if the barcode is set
  if ($barcode) {
      $barcode = cuecatbarcodedecode($barcode);
***************
*** 140,143 ****
--- 140,148 ----
                       = issuebook(\%env, $borrower, $barcode, \%responses, $date);
      }
+ }
+ 
+ # reload the borrower info for the sake of reseting the flags.....
+ if ($borrowernumber) {
+     ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
  }
  




From finlayt at users.sourceforge.net  Wed Aug 21 04:42:56 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:42:56 -0700
Subject: [Koha-cvs] CVS: koha fixBranches.pl,NONE,1.1
Message-ID: <E17hLSS-0005AH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19714

Added Files:
	fixBranches.pl 
Log Message:

A little script for performing changes to the branch fields on items. This script runs over the database.


--- NEW FILE ---
#!/usr/bin/perl

# script to fix all the branch settings in the items table of the koha database.

use strict;
use DBI;
use C4::Database;

# This script makes the following substitutions.
# on homebranch field:
my $home_default = 'C';
my %home = ( 'F'  => 'FP' ,
	     'FM' => 'FP' ,
	     'M'  => 'C'  ,
	     'P'  => 'C'  ,
	     'S'  => 'SP' ,
	     'T'  => 'C'  ,
	     'TR' => 'C'  ,
	     'I'  => 'C'  ,
	     'D'  => 'C'  ,
	     'L'  => 'LP' ,
	     'FP' => 'FP' ,
	     'SP' => 'SP' ,
	     'LP' => 'LP' ,
	     'C'  => 'C' );

# on holdingbranch field:
my $hold_default = 'L';
my %hold = ( 'F'  => 'F' ,
	     'FM' => 'FM' ,
	     'M'  => 'M'  ,
	     'P'  => 'P'  ,
	     'S'  => 'S' ,
	     'T'  => 'T'  ,
	     'TR' => 'TR'  ,
	     'I'  => 'I'  ,
	     'D'  => 'D'  ,
	     'L'  => 'L' ,
	     'FP' => 'F' ,
	     'C'  => 'L' ,
	     'SP' => 'S' ,
	     'LP' => 'L' );


# do the substitutions.....
my $dbh = &C4Connect;           

my $sth = $dbh->prepare("SELECT barcode, holdingbranch, homebranch FROM items");
$sth->execute();

my $today = localtime(time());
print "Output from fixBranches.pl   $today \n\n";

while (my $item = $sth->fetchrow_hashref) {
    my $oldhold = $item->{'holdingbranch'};
    my $newhold = $hold{$oldhold} ? $hold{$oldhold} : $hold_default ;
    if ($oldhold ne $newhold) {
	my $uth = $dbh->prepare("UPDATE items SET holdingbranch = ? WHERE barcode = ?");
	$uth->execute($newhold, $item->{'barcode'});
	print "$item->{'barcode'} : Holding branch setting changed from $oldhold -> $newhold \n";
	$uth->finish;
    }
    my $oldhome = $item->{'homebranch'};
    my $newhome = $home{$oldhome} ? $home{$oldhome} : $home_default ;
    if ($oldhome ne $newhome) {
	my $uth = $dbh->prepare("UPDATE items SET homebranch = ? WHERE barcode = ?");
	$uth->execute($newhome, $item->{'barcode'});
	print "$item->{'barcode'} : Home branch setting changed from $oldhome -> $newhome \n";
	$uth->finish;
    }
}

print "\nFinished output from fixbranches.pl\n";

$dbh->disconnect;




From finlayt at users.sourceforge.net  Wed Aug 21 04:45:32 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:45:32 -0700
Subject: [Koha-cvs] CVS: koha placerequest.pl,1.2,1.3 request.pl,1.9,1.10
Message-ID: <E17hLUy-0005IV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20314

Modified Files:
	placerequest.pl request.pl 
Log Message:

minor changes to comments etc....


Index: placerequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/placerequest.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** placerequest.pl	14 Aug 2002 18:12:51 -0000	1.2
--- placerequest.pl	21 Aug 2002 02:45:30 -0000	1.3
***************
*** 43,57 ****
  my $bornum=borrdata($borrower,'');
  if ($type eq 'str8' && $bornum ne ''){
! my $count=@bibitems;
! @bibitems=sort @bibitems;
! my $i2=1;
! my @realbi;
! $realbi[0]=$bibitems[0];
  for (my $i=1;$i<$count;$i++){
!   my $i3=$i2-1;
!   if ($realbi[$i3] ne $bibitems[$i]){
!     $realbi[$i2]=$bibitems[$i];
!     $i2++;
!   }
  }
  #print $input->dump;
--- 43,57 ----
  my $bornum=borrdata($borrower,'');
  if ($type eq 'str8' && $bornum ne ''){
!     my $count=@bibitems;
!     @bibitems=sort @bibitems;
!     my $i2=1;
!     my @realbi;
!     $realbi[0]=$bibitems[0];
  for (my $i=1;$i<$count;$i++){
!     my $i3=$i2-1;
!     if ($realbi[$i3] ne $bibitems[$i]){
! 	$realbi[$i2]=$bibitems[$i];
! 	$i2++;
!     }
  }
  #print $input->dump;

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** request.pl	14 Aug 2002 18:12:51 -0000	1.9
--- request.pl	21 Aug 2002 02:45:30 -0000	1.10
***************
*** 71,75 ****
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     if ($data[$i]->{'renewalsallowed'}){
  	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
  	if ($data[$i]->{'dewey'} == 0){
--- 71,75 ----
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     unless ($data[$i]->{'notforloan'}){
  	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
  	if ($data[$i]->{'dewey'} == 0){




From finlayt at users.sourceforge.net  Wed Aug 21 04:45:32 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:45:32 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.33,1.34
Message-ID: <E17hLUy-0005Ic-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv20314/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

minor changes to comments etc....


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Circ2.pm	15 Aug 2002 03:27:28 -0000	1.33
--- Circ2.pm	21 Aug 2002 02:45:30 -0000	1.34
***************
*** 205,208 ****
--- 205,209 ----
  	my $itemtype=$sth->fetchrow_hashref;
  	$iteminformation->{'loanlength'}=$itemtype->{'loanlength'};
+ 	$iteminformation->{'notforloan'}=$itemtype->{'notforloan'};
  	$sth->finish;
      }
***************
*** 340,344 ****
  	}
  	if ($iteminformation->{'notforloan'} == 1) {
! 	    $rejected="Item not for loan.";
  	    last SWITCH;
  	}
--- 341,345 ----
  	}
  	if ($iteminformation->{'notforloan'} == 1) {
! 	    $rejected="Reference item: not for loan.";
  	    last SWITCH;
  	}
***************
*** 349,356 ****
  	if ($iteminformation->{'restricted'} == 1) {
  	    $rejected="Restricted item.";
- 	    last SWITCH;
- 	}
- 	if ($iteminformation->{'itemtype'} eq 'REF') {
- 	    $rejected="Reference item:  Not for loan.";
  	    last SWITCH;
  	}
--- 350,353 ----




From finlayt at users.sourceforge.net  Wed Aug 21 05:54:41 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 20:54:41 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.15,1.16
Message-ID: <E17hMZt-00013P-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv3858/circ

Modified Files:
	returns.pl 
Log Message:

Fixed up some of the messaging stuff.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** returns.pl	16 Aug 2002 20:46:40 -0000	1.15
--- returns.pl	21 Aug 2002 03:54:39 -0000	1.16
***************
*** 91,94 ****
--- 91,95 ----
      my $borrnum = $query->param('borrowernumber');
      my $resbarcode = $query->param('resbarcode');
+ # set to waiting....
      my $tobranchcd = ReserveWaiting($item, $borrnum);
      my $branchname = $branches->{$tobranchcd}->{'branchname'};
***************
*** 125,140 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
-     $returneditems{0} = $barcode;
      $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
!     } else {
! 	$riborrowernumber{0} = 0;
  	$riduedate{0} = 0;
  	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
! 	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
--- 126,147 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
      $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
+ 	$returneditems{0} = $barcode;
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
!     } elsif (! $messages->{'BadBarcode'}) {
! 	$returneditems{0} = $barcode;
  	$riduedate{0} = 0;
  	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
! 	if ($messages->{'wthdrawn'}) {
! 	    $ritext.= "<input type=hidden name=bn-0 value='Item Cancelled'>\n";
! 	    $riborrowernumber{0} = 'Item Cancelled';
! 	} else {
! 	    $ritext.= "<input type=hidden name=bn-0 value='&nbsp;'>\n";
! 	    $riborrowernumber{0} = '&nbsp;';
! 	}
      }
  }
***************
*** 283,288 ****
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
!     if ($code eq 'wthdrawm'){
! 	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
      }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
--- 290,296 ----
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
!     if ($code eq 'wthdrawn'){
! 	$messagetext = "<font color='red' size='+2'> Item Cancelled. </font> <br>";
! 	last;
      }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
***************
*** 394,397 ****
--- 402,406 ----
  	my $duedate = $riduedate{$_};
  	my $overduetext;
+         my $borrowerinfo;
  	if ($duedate) {
  	    my @tempdate = split ( /-/ , $duedate ) ;
***************
*** 402,415 ****
  	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
  	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
          } else {
!             $overduetext = "Not on loan.";
! 	}
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
! 	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
! 	    $borrowerinfo = "Not on loan.";
  	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
--- 411,419 ----
  	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
  	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
+ 	    my ($borrower) = getpatroninformation(\%env, $riborrowernumber{$_}, 0);
+             $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
          } else {
!             $overduetext = "Not on Issue.";
! 	    $borrowerinfo = $riborrowernumber{$_};
  	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
***************
*** 437,443 ****
--- 441,456 ----
  print startmenu('circulation');
  
+ 
+ #debug
+ #    foreach my $key (keys %$messages) {
+ #	print "$key : $messages->{$key}<br>";
+ #    }
+ 
+ 
  print <<"EOF";
  $links
  $title
+ 
+ 
  <table cellpadding=5 cellspacing=0 width=100%>
  EOF




From finlayt at users.sourceforge.net  Wed Aug 21 06:29:06 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:29:06 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.16,1.17
Message-ID: <E17hN7C-0002li-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv10493/circ

Modified Files:
	returns.pl 
Log Message:

turned of the branchtransfer when an item is set to "waiting".



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** returns.pl	21 Aug 2002 03:54:39 -0000	1.16
--- returns.pl	21 Aug 2002 04:29:03 -0000	1.17
***************
*** 100,104 ****
      printslip(\%env, $slip);
      if ($tobranchcd ne $branch) {
! 	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
  	$reservetext .= <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>
--- 100,104 ----
      printslip(\%env, $slip);
      if ($tobranchcd ne $branch) {
! #	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
  	$reservetext .= <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>




From finlayt at users.sourceforge.net  Wed Aug 21 06:31:27 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:31:27 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.10,1.11
Message-ID: <E17hN9T-0002st-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv10938

Modified Files:
	request.pl 
Log Message:

Changed the display of lost, long overdue, reference, and cancelled items.



Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** request.pl	21 Aug 2002 02:45:30 -0000	1.10
--- request.pl	21 Aug 2002 04:31:25 -0000	1.11
***************
*** 71,88 ****
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     unless ($data[$i]->{'notforloan'}){
! 	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
! 	if ($data[$i]->{'dewey'} == 0){
! 	    $data[$i]->{'dewey'}="";
! 	}
! 	$data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
! 	$data[$i]->{'dewey'}=~ s/\.0000$//;
! 	$data[$i]->{'dewey'}=~ s/00$//;
! 	my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
! 	$bibitemrows .= <<"EOF";
  <tr VALIGN=TOP>
! <TD><input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}>
! <input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>
! </td>
  <TD>$data[$i]->{'description'}</td>
  <TD>$class</td>
--- 71,97 ----
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
! 	$data[$i]->{'dewey'}="";
!     }
!     $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
!     $data[$i]->{'dewey'}=~ s/\.0000$//;
!     $data[$i]->{'dewey'}=~ s/00$//;
!     my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
!     my $select;
!     if ($data[$i]->{'notforloan'}) {
! 	$select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
! 	$select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
! 	$select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
! 	$select = "Item Cancelled";
!     } else {
! 	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
!     }
!     $bibitemrows .= <<"EOF";
  <tr VALIGN=TOP>
! <TD>$select</td>
  <TD>$data[$i]->{'description'}</td>
  <TD>$class</td>
***************
*** 94,99 ****
  </tr>
  EOF
-     }
  }
  
  
--- 103,108 ----
  </tr>
  EOF
  }
+ 
  
  




From finlayt at users.sourceforge.net  Wed Aug 21 06:35:15 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:35:15 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.17,1.18
Message-ID: <E17hND9-000339-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv11617/circ

Modified Files:
	returns.pl 
Log Message:

fixed bug caused by last commit



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** returns.pl	21 Aug 2002 04:29:03 -0000	1.17
--- returns.pl	21 Aug 2002 04:35:13 -0000	1.18
***************
*** 92,95 ****
--- 92,96 ----
      my $resbarcode = $query->param('resbarcode');
  # set to waiting....
+     my $iteminfo = getiteminformation(\%env, $item);
      my $tobranchcd = ReserveWaiting($item, $borrnum);
      my $branchname = $branches->{$tobranchcd}->{'branchname'};




From finlayt at users.sourceforge.net  Thu Aug 22 04:32:01 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 19:32:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.34,1.35
Message-ID: <E17hhlR-00025z-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7872/C4

Modified Files:
	Search.pm 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items can be reserved.


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** Search.pm	15 Aug 2002 02:02:40 -0000	1.34
--- Search.pm	22 Aug 2002 02:31:58 -0000	1.35
***************
*** 1438,1457 ****
      my ($bibnum) = @_;
      my $dbh   = C4Connect;
!     my $query = "Select * from biblioitems, itemtypes, items
! where biblioitems.biblionumber = '$bibnum'
! and biblioitems.itemtype = itemtypes.itemtype
! and biblioitems.biblioitemnumber = items.biblioitemnumber
! group by items.biblioitemnumber";
      my $sth   = $dbh->prepare($query);
      my $count = 0;
      my @results;
! 
!     $sth->execute;
! 
      while (my $data = $sth->fetchrow_hashref) {
          $results[$count] = $data;
          $count++;
!     } # while
!     
      $sth->finish;
      $dbh->disconnect;
--- 1438,1455 ----
      my ($bibnum) = @_;
      my $dbh   = C4Connect;
!     my $query = "SELECT biblioitems.*, itemtypes.*, MIN(items.itemlost) as itemlost
!                           FROM biblioitems, itemtypes, items
!                          WHERE biblioitems.biblionumber     = ?
!                            AND biblioitems.itemtype         = itemtypes.itemtype
!                            AND biblioitems.biblioitemnumber = items.biblioitemnumber
!                       GROUP BY items.biblioitemnumber";
      my $sth   = $dbh->prepare($query);
      my $count = 0;
      my @results;
!     $sth->execute($bibnum);
      while (my $data = $sth->fetchrow_hashref) {
          $results[$count] = $data;
          $count++;
!     } # while    
      $sth->finish;
      $dbh->disconnect;
***************
*** 1459,1484 ****
  } # sub bibitems
  
- 
  sub barcodes{
!   #called from request.pl
!   my ($biblioitemnumber)=@_;
!   my $dbh=C4Connect;
!   my $query="Select barcode from items where
!    biblioitemnumber='$biblioitemnumber'
!    and ((itemlost <> 1 and itemlost <> 2) or itemlost is NULL) and
!    (wthdrawn <> 1 or wthdrawn is NULL)";
! 
!   my $sth=$dbh->prepare($query);
!   $sth->execute;
!   my @barcodes;
!   my $i=0;
!   while (my $data=$sth->fetchrow_hashref){
!     $barcodes[$i]=$data->{'barcode'};
!     $i++;
!   }
!   $sth->finish;
!   $dbh->disconnect;
!   return(@barcodes);
!   
  }
  
--- 1457,1478 ----
  } # sub bibitems
  
  sub barcodes{
!     #called from request.pl
!     my ($biblioitemnumber)=@_;
!     my $dbh=C4Connect;
!     my $query="SELECT barcode, itemlost FROM items
!                            WHERE biblioitemnumber = ?
!                              AND (wthdrawn <> 1 OR wthdrawn IS NULL)";
!     my $sth=$dbh->prepare($query);
!     $sth->execute($biblioitemnumber);
!     my @barcodes;
!     my $i=0;
!     while (my $data=$sth->fetchrow_hashref){
! 	$barcodes[$i]=$data;
! 	$i++;
!     }
!     $sth->finish;
!     $dbh->disconnect;
!     return(@barcodes);
  }
  




From finlayt at users.sourceforge.net  Thu Aug 22 04:32:01 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 19:32:01 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.11,1.12
Message-ID: <E17hhlR-000260-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv7872

Modified Files:
	request.pl 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items can be reserved.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** request.pl	21 Aug 2002 04:31:25 -0000	1.11
--- request.pl	22 Aug 2002 02:31:58 -0000	1.12
***************
*** 70,78 ****
  my ($count2, at data) = bibitems($bib);
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
! 	$data[$i]->{'dewey'}="";
      }
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 70,88 ----
  my ($count2, at data) = bibitems($bib);
  my $bibitemrows = "";
+ 
+ 
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     my $barcodestext = "";
!     foreach my $num (@barcodes) {
! 	my $message = $num->{'itemlost'} == 1 ? "(lost)" :
! 	    $num->{'itemlost'} == 2 ? "(long overdue)" : "";
! 	$barcodestext .= "$num->{'barcode'} $message <br>";
      }
+     $barcodestext = substr($barcodestext, 0, -4);
+ 
+     $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
+ 
+     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
***************
*** 80,91 ****
      my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if ($data[$i]->{'notforloan'}) {
! 	$select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
! 	$select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
! 	$select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
! 	$select = "Item Cancelled";
      } else {
  	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
--- 90,97 ----
      my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1)
! 	|| ($data[$i]->{'itemlost'} == 2))  {
! 	$select = "Cannot be reserved.";
      } else {
  	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
***************
*** 97,104 ****
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
- <td>$data[$i]->{'isbn'}</td>
- <td>$dat->{'copyrightdate'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>@barcodes</td>
  </tr>
  EOF
--- 103,108 ----
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>$barcodestext</td>
  </tr>
  EOF
***************
*** 139,146 ****
  	$rank = "<select name=rank-request>$prioropt<option value=del>Del</select>";
  	$pickup = "<select name=pickup>$bropt</select>";
-         $change = "<select name=itemtype>
-                    <option value=next>Next Available
-                    <option value=change>Change Selection
-                    <option value=nc >No Change</select>";
      }
      $existingreserves .= <<"EOF";
--- 143,146 ----
***************
*** 156,160 ****
  <TD>$pickup</td>
  <TD>$type</td>
- <TD>$change</td>
  </tr>
  EOF
--- 156,159 ----
***************
*** 254,259 ****
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Classification</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Volume</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>ISBN</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copyright</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pubdate</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copies</b></TD>
--- 253,256 ----
***************
*** 284,288 ****
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pickup</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Request</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Change To</b></TD>
  </TR>
  $existingreserves
--- 281,284 ----




From finlayt at users.sourceforge.net  Thu Aug 22 05:06:35 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 20:06:35 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.5,1.6
Message-ID: <E17hiIt-0004fg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17818/admin

Modified Files:
	systempreferences.pl 
Log Message:

Fixed bug by cleaning out crud.


Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** systempreferences.pl	14 Aug 2002 18:12:53 -0000	1.5
--- systempreferences.pl	22 Aug 2002 03:06:33 -0000	1.6
***************
*** 220,226 ****
  	print mkheadr(2,'System preferences admin');
  	print mkformnotable("$script_name", at inputs);
! 	print <<printend
! printend
! 	;
  	if  ($searchfield ne '') {
  		print "You Searched for <b>$searchfield<b><p>";
--- 220,224 ----
  	print mkheadr(2,'System preferences admin');
  	print mkformnotable("$script_name", at inputs);
! 
  	if  ($searchfield ne '') {
  		print "You Searched for <b>$searchfield<b><p>";




From finlayt at users.sourceforge.net  Thu Aug 22 06:20:35 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 21:20:35 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.18,1.19
Message-ID: <E17hjSV-0000To-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1672/circ

Modified Files:
	returns.pl 
Log Message:

added another link on the "Reserve Found" flag.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** returns.pl	21 Aug 2002 04:35:13 -0000	1.18
--- returns.pl	22 Aug 2002 04:20:33 -0000	1.19
***************
*** 250,254 ****
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
--- 250,254 ----
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <a href=/cgi-bin/koha/detail.pl?bib=$iteminfo->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a> <br>
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>




From finlayt at users.sourceforge.net  Thu Aug 22 06:45:09 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 21:45:09 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.12,1.13
Message-ID: <E17hjqH-0001co-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv6110

Modified Files:
	request.pl 
Log Message:

another little tinker. long overdues are now requestable.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** request.pl	22 Aug 2002 02:31:58 -0000	1.12
--- request.pl	22 Aug 2002 04:45:07 -0000	1.13
***************
*** 84,88 ****
      $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
  
-     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 84,87 ----
***************
*** 91,96 ****
      my $select;
      if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1)
! 	|| ($data[$i]->{'itemlost'} == 2))  {
  	$select = "Cannot be reserved.";
      } else {
--- 90,94 ----
      my $select;
      if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1))  {
  	$select = "Cannot be reserved.";
      } else {




From finlayt at users.sourceforge.net  Fri Aug 23 03:56:06 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 22 Aug 2002 18:56:06 -0700
Subject: [Koha-cvs] CVS: koha/acqui finishreceive.pl,1.1.1.1.2.1,1.1.1.1.2.2
Message-ID: <E17i3gE-0005Mv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv20498/acqui

Modified Files:
      Tag: rel-1-2
	finishreceive.pl 
Log Message:

merged in the version 1.5 from the main branch



Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** finishreceive.pl	14 Jun 2002 21:20:27 -0000	1.1.1.1.2.1
--- finishreceive.pl	23 Aug 2002 01:56:04 -0000	1.1.1.1.2.2
***************
*** 15,19 ****
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblio=$input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
--- 15,19 ----
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblionumber = $input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
***************
*** 22,26 ****
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
- my $id=$input->param('id');
  my $bibitemno=$input->param('biblioitemnum');
  my $data=bibitemdata($bibitemno);
--- 22,25 ----
***************
*** 39,48 ****
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $series=$input->param('Series');
! my $bookseller=$input->param('bookseller');
! $id=$bookseller;
! my $title=$input->param('title');
! my $author=$input->param('author');
! my $copyright=$input->param('copyright');
  
  if ($quantrec != 0){
--- 38,50 ----
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $bookseller = $input->param('bookseller');
! my $id         = $bookseller;
! my $biblio = {
!     biblionumber  => $biblionumber,
!     title         => $input->param('title')?$input->param('title'):"",
!     author        => $input->param('author')?$input->param('author'):"",
!     copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
!     series        => $input->param('Series')?$input->param('Series'):""
! }; # my $biblio
  
  if ($quantrec != 0){
***************
*** 61,72 ****
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class);
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio,$title,$author,$copyright,$series);
!   modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
!   #print $notes;
    my $barcode=$input->param('barcode');
    my @barcodes;
--- 63,92 ----
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno = &newbiblioitem({
!       biblionumber   => $biblionumber,
!       itemtype       => $itemtype?$itemtype:"",
!       isbn           => $isbn?$isbn:"",
!       volumeddesc    => $volinf?$volinf:"",
!       classification => $class?$class:"" });
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio);
!   &modbibitem({
!       biblioitemnumber => $bibitemno,
!       itemtype         => $itemtype?$itemtype:"",
!       isbn             => $isbn?$isbn:"",
!       publisher        => $publisher?$publisher:"",
!       publicationyear  => $pubdate?$pubdate:"",
!       class            => $class?$class:"",
!       dewey            => $dewey?$dewey:"",
!       subclass         => $subclass?$subclass:"",
!       illus            => $illus?$illus:"",
!       pages            => $pages?$pages:"",
!       volumeddesc      => $volinf?$volinf:"",
!       notes            => $notes?$notes:"",
!       size             => $size?$size:"" });
! 
    my $barcode=$input->param('barcode');
    my @barcodes;
***************
*** 81,85 ****
    #  print $barcode;
    }
!   my ($error)=makeitems($quantrec,$bibitemno,$biblio,$replacement,$cost,$bookseller,$branch,$loan, at barcodes);
    if ($error eq ''){
      if ($itemtype ne 'PER'){
--- 101,113 ----
    #  print $barcode;
    }
!   my ($error) = newitems({ biblioitemnumber => $bibitemno,
! 	                   biblionumber     => $biblionumber,
! 	                   replacementprice => $replacement,
! 	                   price            => $cost,
! 	                   booksellerid     => $bookseller,
! 	                   homebranch       => $branch,
! 	                   loan             => $loan },
! 			 @barcodes);
! 
    if ($error eq ''){
      if ($itemtype ne 'PER'){
***************
*** 94,98 ****
  } else {
    print $input->header;
!   delorder($biblio,$ordnum);
         print $input->redirect("/acquisitions/");
  }
--- 122,126 ----
  } else {
    print $input->header;
!   delorder($biblionumber,$ordnum);
         print $input->redirect("/acquisitions/");
  }




From tonnesen at users.sourceforge.net  Mon Aug 26 19:08:58 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Mon, 26 Aug 2002 10:08:58 -0700
Subject: [Koha-cvs] CVS: koha admin-home.pl,1.1.2.1,1.1.2.2 catalogue-home.pl,1.1.2.1,1.1.2.2 groups.pl,1.1,1.1.2.1 members-home.pl,1.1.2.2,1.1.2.3 reports-home.pl,1.1.2.1,1.1.2.2
Message-ID: <E17jNMI-0008TU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv32358

Modified Files:
      Tag: rel-1-2
	admin-home.pl catalogue-home.pl groups.pl members-home.pl 
	reports-home.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/admin-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- admin-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,21 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/admin/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/admin/index.html";
  while (<H>) {
      print $_;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/catalogue-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** catalogue-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- catalogue-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,25 ****
  
  my $classlist='';
! open C, "/usr/local/koha/intranet/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "/usr/local/koha/intranet/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;
--- 21,29 ----
  
  my $classlist='';
! open C, "$intranetdir/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "$intranetdir/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** groups.pl	2 May 2001 23:06:44 -0000	1.1
--- groups.pl	26 Aug 2002 17:08:56 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,18 ----
  use C4::Print;
  use DBI;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
+ 
  
  my $input=new CGI;
***************
*** 214,218 ****
      $output= "<head><title>Overdue list for $groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img src=/usr/local/koha/librarian/htdocs/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';
--- 219,223 ----
      $output= "<head><title>Overdue list for $groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img src=/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/members-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** members-home.pl	27 Jul 2002 04:33:57 -0000	1.1.2.2
--- members-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.3
***************
*** 5,9 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
  
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  my $query = new CGI;
  my $flagsrequired;
***************
*** 18,22 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/members/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/members/index.html";
  while (<H>) {
      print $_;

Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/reports-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** reports-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- reports-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 16,20 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/reports/index.html";
  while (<H>) {
      print $_;
--- 20,24 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/reports/index.html";
  while (<H>) {
      print $_;




From tonnesen at users.sourceforge.net  Mon Aug 26 19:08:58 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Mon, 26 Aug 2002 10:08:58 -0700
Subject: [Koha-cvs] CVS: koha/admin templates.pl,1.1.2.1,1.1.2.2
Message-ID: <E17jNMI-0008TT-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32358/admin

Modified Files:
      Tag: rel-1-2
	templates.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: templates.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/Attic/templates.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** templates.pl	11 Jul 2002 18:05:29 -0000	1.1.2.1
--- templates.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 15,18 ****
--- 15,22 ----
  
  
+ my $configfile=configfile();
+ my $includes=$configfile->{'includes'};
+ 
+ 
  my $dbh=C4Connect();
  
***************
*** 34,38 ****
  
  my $templateoptions='';
! opendir D, "/usr/local/koha/intranet/htdocs/includes/templates";
  my @dirlist=readdir D;
  foreach (@dirlist) {
--- 38,42 ----
  
  my $templateoptions='';
! opendir D, "$includes/templates";
  my @dirlist=readdir D;
  foreach (@dirlist) {




From finlayt at users.sourceforge.net  Tue Aug 27 00:34:31 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Mon, 26 Aug 2002 15:34:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.16,1.17
Message-ID: <E17jSRL-0004qn-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv18350/C4

Modified Files:
	Reserves2.pm 
Log Message:

rewrote CheckReserves so that it can be called with a barcode as well as on itemnumber.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Reserves2.pm	21 Aug 2002 01:31:16 -0000	1.16
--- Reserves2.pm	26 Aug 2002 22:34:29 -0000	1.17
***************
*** 98,111 ****
  
  sub CheckReserves {
!     my ($item) = @_;
!     warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
!     my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
                               FROM items, biblioitems, itemtypes 
                              WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
                                AND biblioitems.itemtype = itemtypes.itemtype
                                AND itemnumber=$qitem");
      $sth->execute;
      my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;
--- 98,122 ----
  
  sub CheckReserves {
!     my ($item, $barcode) = @_;
! #    warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
!     my $sth;
!     if ($item) {
! 	my $qitem=$dbh->quote($item);
  # get the biblionumber...
! 	$sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
                               FROM items, biblioitems, itemtypes 
                              WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
                                AND biblioitems.itemtype = itemtypes.itemtype
                                AND itemnumber=$qitem");
+     } else {
+ 	my $qbc=$dbh->quote($barcode);
+ # get the biblionumber...
+ 	$sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
+                              FROM items, biblioitems, itemtypes 
+                             WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
+                               AND biblioitems.itemtype = itemtypes.itemtype
+                               AND barcode=$qbc");
+     }
      $sth->execute;
      my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;




From dragon28 at users.sourceforge.net  Tue Aug 27 07:10:29 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Mon, 26 Aug 2002 22:10:29 -0700
Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.1.2.5,1.1.2.6
Message-ID: <E17jYcX-0003Dm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12369/koha/admin

Modified Files:
      Tag: rel-1-2
	branches.pl 
Log Message:
small tidy up of branch table output

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** branches.pl	20 Aug 2002 09:18:13 -0000	1.1.2.5
--- branches.pl	27 Aug 2002 05:10:27 -0000	1.1.2.6
***************
*** 257,261 ****
  	  	}
  		print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
! 		$results->[$i]{'branchaddress1'}.$results->[$i]{'branchaddress2'}.$results->[$i]{'branchaddress3'},
  		$results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchemail'},,$results->[$i]{'issuing'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),
--- 257,261 ----
  	  	}
  		print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
! 		$results->[$i]{'branchaddress1'}." ".$results->[$i]{'branchaddress2'}." ".$results->[$i]{'branchaddress3'},
  		$results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchemail'},,$results->[$i]{'issuing'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),




From finlayt at users.sourceforge.net  Thu Aug 29 02:00:47 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 28 Aug 2002 17:00:47 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.19,1.20
Message-ID: <E17kCjv-0006Gz-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv24047/circ

Modified Files:
	returns.pl 
Log Message:

Fixed bug in flags display



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** returns.pl	22 Aug 2002 04:20:33 -0000	1.19
--- returns.pl	29 Aug 2002 00:00:45 -0000	1.20
***************
*** 329,341 ****
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $flag = "<font color=red>$flag</font>";
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
--- 329,344 ----
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
+     my $displayflag = '';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $displayflag = "<font color=red>$flag</font>";
! 	} else {
! 	    $displayflag = $flag;
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
***************
*** 354,358 ****
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
--- 357,361 ----
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$displayflag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
***************
*** 368,375 ****
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF
--- 371,378 ----
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$displayflag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF




From tonnesen at users.sourceforge.net  Fri Aug 30 18:30:12 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 30 Aug 2002 09:30:12 -0700
Subject: [Koha-cvs] CVS: koha koha.upgrade,1.1.2.17,1.1.2.18
Message-ID: <E17koey-0000a9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv2060

Modified Files:
      Tag: rel-1-2
	koha.upgrade 
Log Message:
Was checking for 'RC' in installed version


Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -r1.1.2.17 -r1.1.2.18
*** koha.upgrade	27 Jul 2002 05:38:53 -0000	1.1.2.17
--- koha.upgrade	30 Aug 2002 16:30:10 -0000	1.1.2.18
***************
*** 19,25 ****
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! my $newversion=`cat koha.version`;
! chomp $newversion;
! if ($::kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
--- 19,25 ----
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
***************
*** 31,35 ****
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 31,35 ----
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $::newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 359,363 ****
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
--- 359,363 ----
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$::newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
***************
*** 376,380 ****
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$newversion\n";
  }
  unless (defined($kc->{'includes'})) {
--- 376,380 ----
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$::newversion\n";
  }
  unless (defined($kc->{'includes'})) {




From tonnesen at users.sourceforge.net  Fri Aug 30 19:26:16 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 30 Aug 2002 10:26:16 -0700
Subject: [Koha-cvs] CVS: koha/marc marcschema.sql,1.15,1.16
Message-ID: <E17kpXE-0005cA-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv21498

Modified Files:
	marcschema.sql 
Log Message:
Added bibliothesaurus table


Index: marcschema.sql
===================================================================
RCS file: /cvsroot/koha/koha/marc/marcschema.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** marcschema.sql	24 Jul 2002 15:52:53 -0000	1.15
--- marcschema.sql	30 Aug 2002 17:26:14 -0000	1.16
***************
*** 2,5 ****
--- 2,8 ----
  #  
  #  $Log$
+ #  Revision 1.16  2002/08/30 17:26:14  tonnesen
+ #  Added bibliothesaurus table
+ #
  #  Revision 1.15  2002/07/24 15:52:53  tipaul
  #  1st scripts for MARC-DB.
***************
*** 124,126 ****
--- 127,141 ----
  		KEY sndx_word (sndx_word)
  		) TYPE=MyISAM;
+ 
+ 
+ CREATE TABLE bibliothesaurus ( 
+    code bigint(20) NOT NULL auto_increment, 
+    freelib char(255) NOT NULL default '', 
+    stdlib char(255) NOT NULL default '', 
+    type char(80) NOT NULL default '', 
+    PRIMARY KEY  (code), 
+    KEY freelib (freelib), 
+    KEY stdlib (stdlib), 
+    KEY type (type) 
+  ) TYPE=MyISAM; 
  




From finlayt at users.sourceforge.net  Fri Aug  9 06:03:46 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:03:46 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.34,1.35
Message-ID: <E17d106-00082w-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv30707

Modified Files:
	circulation.pl 
Log Message:

fixed up the todays issues and previous issues tables so that they are both listed in reverse order by issue date.



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** circulation.pl	24 Jul 2002 05:11:07 -0000	1.34
--- circulation.pl	9 Aug 2002 04:03:43 -0000	1.35
***************
*** 44,48 ****
  
  my @datearr = localtime(time());
! my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
  #warn $todaysdate;
  
--- 44,50 ----
  
  my @datearr = localtime(time());
! my $tday = localtime(time());
! warn "today: $tday \n";
! my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
  #warn $todaysdate;
  
***************
*** 367,381 ****
  my $previssues='';
  if ($borrower) {
      my $issueslist = getissues($borrower);
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $it (sort keys %$issueslist) {
! 	my $dd = $issueslist->{$it}->{'date_due'};
  	my $issuedate = $issueslist->{$it}->{'timestamp'};
  	$issuedate = substr($issuedate, 0, 8);
! 
! 	my $bookissue = $issueslist->{$it};
! 	my $bgcolor='';
! 	my $datedue = $bookissue->{'date_due'};
  	#convert to nz style dates
  	#this should be set with some kinda config variable	    
--- 369,389 ----
  my $previssues='';
  if ($borrower) {
+     my @todaysissues;
+     my @previousissues;
      my $issueslist = getissues($borrower);
!     foreach my $it (keys %$issueslist) {
  	my $issuedate = $issueslist->{$it}->{'timestamp'};
  	$issuedate = substr($issuedate, 0, 8);
! 	if ($todaysdate == $issuedate) {
! 	    push @todaysissues, $issueslist->{$it};
! 	} else {
! 	    push @previousissues, $issueslist->{$it};
! 	}
!     }
!     my $tcolor = '';
!     my $pcolor = '';
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
  	#convert to nz style dates
  	#this should be set with some kinda config variable	    
***************
*** 386,410 ****
  	    $dd="<font color=red>$dd</font>\n";
  	}
! 	if ($todaysdate == $issuedate) {
! 	    ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	    $todaysissues .=<< "EOF";
  <tr><td bgcolor=$tcolor align=center>$dd</td>
  <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$bookissue->{'title'}</td>
! <td bgcolor=$tcolor>$bookissue->{'author'}</td>
! <td bgcolor=$tcolor align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>
! EOF
!         } else {
! 	    ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	    $previssues .= << "EOF";
  <tr><td bgcolor=$pcolor align=center>$dd</td>
  <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$bookissue->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$bookissue->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$bookissue->{'title'}</td>
! <td bgcolor=$pcolor>$bookissue->{'author'}</td>
! <td bgcolor=$pcolor align=center>$bookissue->{'dewey'} $bookissue->{'subclass'}</td></tr>
  EOF
- 	}
      }
  }
--- 394,427 ----
  	    $dd="<font color=red>$dd</font>\n";
  	}
! 	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
! 	$todaysissues .=<< "EOF";
  <tr><td bgcolor=$tcolor align=center>$dd</td>
  <td bgcolor=$tcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$tcolor>$book->{'title'}</td>
! <td bgcolor=$tcolor>$book->{'author'}</td>
! <td bgcolor=$tcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
! EOF
!     } 
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @previousissues){
! 	my $dd = $book->{'date_due'};
! 	my $datedue = $book->{'date_due'};
! 	#convert to nz style dates
! 	#this should be set with some kinda config variable	    
! 	my @tempdate=split(/-/,$dd);
! 	$dd="$tempdate[2]/$tempdate[1]/$tempdate[0]";
!      	$datedue=~s/-//g;
! 	if ($datedue < $todaysdate) {
! 	    $dd="<font color=red>$dd</font>\n";
! 	}
! 	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
! 	$previssues .= << "EOF";
  <tr><td bgcolor=$pcolor align=center>$dd</td>
  <td bgcolor=$pcolor align=center>
! <a href=/cgi-bin/koha/detail.pl?bib=$book->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$book->{'barcode'}</a></td>
! <td bgcolor=$pcolor>$book->{'title'}</td>
! <td bgcolor=$pcolor>$book->{'author'}</td>
! <td bgcolor=$pcolor align=center>$book->{'dewey'} $book->{'subclass'}</td></tr>
  EOF
      }
  }




From finlayt at users.sourceforge.net  Fri Aug  9 06:14:59 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:14:59 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.35,1.36
Message-ID: <E17d1Ax-0000KE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1091

Modified Files:
	circulation.pl 
Log Message:

changed the previous issues to be listed in order of due date



Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** circulation.pl	9 Aug 2002 04:03:43 -0000	1.35
--- circulation.pl	9 Aug 2002 04:14:56 -0000	1.36
***************
*** 404,408 ****
  EOF
      } 
!     foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @previousissues){
  	my $dd = $book->{'date_due'};
  	my $datedue = $book->{'date_due'};
--- 404,408 ----
  EOF
      } 
!     foreach my $book (sort {$a->{'due_date'} <=> $b->{'due_date'}} @previousissues){
  	my $dd = $book->{'date_due'};
  	my $datedue = $book->{'date_due'};




From finlayt at users.sourceforge.net  Fri Aug  9 06:33:04 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 08 Aug 2002 21:33:04 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.7,1.8
Message-ID: <E17d1SS-0001Mp-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv5004

Modified Files:
	request.pl 
Log Message:

I have changed the branch options to only include the Issueing branches. Also if no branch is set it Defaults to Levin.



Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.pl	31 Jul 2002 04:27:57 -0000	1.7
--- request.pl	9 Aug 2002 04:33:01 -0000	1.8
***************
*** 35,41 ****
  # get branch information
  my $branch = $input->cookie('branch');
  my $branches = getbranches();
- 
- 
  my $branchoptions = branchoptions($branch);
  
--- 35,40 ----
  # get branch information
  my $branch = $input->cookie('branch');
+ ($branch) || ($branch = 'L');
  my $branches = getbranches();
  my $branchoptions = branchoptions($branch);
  
***************
*** 155,159 ****
      my $out = "";
      foreach my $br (keys %$branches) {
! 	(next) unless $branches->{$br}->{'CU'};
  	my $selected = "";
  	if ($br eq $selbr) {
--- 154,158 ----
      my $out = "";
      foreach my $br (keys %$branches) {
! 	(next) unless $branches->{$br}->{'IS'};
  	my $selected = "";
  	if ($br eq $selbr) {




From tonnesen at users.sourceforge.net  Wed Aug 14 01:04:10 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Tue, 13 Aug 2002 16:04:10 -0700
Subject: [Koha-cvs] CVS: koha addcopyrightstatements.pl,NONE,1.1.2.1
Message-ID: <E17ekhu-0006GV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv23985

Added Files:
      Tag: rel-1-2
	addcopyrightstatements.pl 
Log Message:
Little script to add a copyright statement to all .pl and .pm files


--- NEW FILE ---
#!/usr/bin/perl
#
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

my $copyrightstatement=qq|
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

|;

open (PL, "find -name '*.pl' -o -name '*.pm'|");
while (<PL>) {
    my $filename=$_;
    chomp $filename;
    my $holder='';
    my $newversion='';
    open (IN, "$filename");
    my $begin='';
    my $end='';
    my $alreaddone=0;
    while (<IN>) {
	if ((/^\s*#/ || /^\s*$/ || /^\s*package/) && $end eq '') {
	    $begin.=$_;
	} else {
	    $end.=$_;
	}
	if (/^\s*#\s*Copyright/) {
	    print "$filename already has a copyright statement\n";
	    $alreadydone=1;
	}
    }
    close IN;
    unless ($alreadydone) {
	open (OUT, ">$filename");
	print OUT "$begin$copyrightstatement$end";
	close OUT;
    }
}




From finlayt at users.sourceforge.net  Wed Aug 14 07:35:55 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 13 Aug 2002 22:35:55 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.11,1.12
Message-ID: <E17eqp1-0005Xm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv20936/circ

Modified Files:
	returns.pl 
Log Message:

all items are listed in the returned items list, regardless of whether they were issued or not.
Changed some messageing stuff as well, but will be back to fix that up some more.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** returns.pl	26 Jul 2002 02:27:16 -0000	1.11
--- returns.pl	14 Aug 2002 05:35:53 -0000	1.12
***************
*** 107,117 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
      if ($returned) {
- 	$returneditems{0} = $barcode;
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
- 	$ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
      }
  }
--- 107,122 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
+     $returneditems{0} = $barcode;
+     $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
+     } else {
+ 	$riborrowernumber{0} = 0;
+ 	$riduedate{0} = 0;
+ 	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
+ 	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
***************
*** 207,211 ****
  
  BORROWER:
! $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 212,216 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
***************
*** 216,224 ****
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  EOF
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
! for $name ($number).
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
--- 221,230 ----
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
  EOF
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
! for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
  <tr><td valign="top">Change status to waiting and print 
***************
*** 249,252 ****
--- 255,259 ----
  # collect the messages and put into message table....
  foreach my $code (keys %$messages) {
+     warn $code;
      if ($code eq 'BadBarcode'){
  	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
***************
*** 259,262 ****
--- 266,272 ----
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
+     if ($code eq 'wthdrawm'){
+ 	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
+     }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
  	if ($messages->{'IsPermanent'} ne $branch) {
***************
*** 345,351 ****
  <b>Flags</b></td></tr>
  $flaginfotext 
- </table>
  EOF
      }
  }
  
--- 355,361 ----
  <b>Flags</b></td></tr>
  $flaginfotext 
  EOF
      }
+     $borrowertable .= "</table>";
  }
  
***************
*** 366,382 ****
  	my $barcode = $returneditems{$_};
  	my $duedate = $riduedate{$_};
! 	my @datearr = localtime(time());
! 	###
! 	# convert to nz date format
! 	my @tempdate = split(/-/,$duedate);
! 	my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
! 	####
! 	my $todaysdate 
! 	    = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
! 	my $overduetext = "$duedatenz";
! 	($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
! 	($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
! 	my $borrowernumber = $riborrowernumber{$_};
! 	my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
  	$returneditemstable .= << "EOF";
--- 376,399 ----
  	my $barcode = $returneditems{$_};
  	my $duedate = $riduedate{$_};
! 	my $overduetext;
! 	if ($duedate) {
! 	    my @tempdate = split ( /-/ , $duedate ) ;
!             my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
!             my @datearr = localtime(time());
!             my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
! 	    $overduetext = "$duedatenz";
! 	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
! 	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
!         } else {
!             $overduetext = "Not on loan.";
! 	}
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
! 	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
! 	    $borrowerinfo = "Not on loan.";
! 	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
  	$returneditemstable .= << "EOF";
***************
*** 388,392 ****
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>
  EOF
      } else {
--- 405,409 ----
  <td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
  <td bgcolor=$color>
! $borrowerinfo</td></tr>
  EOF
      } else {




From finlayt at users.sourceforge.net  Wed Aug 14 07:37:09 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 13 Aug 2002 22:37:09 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.30,1.31
Message-ID: <E17eqqD-0005eK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv21418/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

added a check in the returnbook subroutine that checks to see if a book has been cancelled: i.e. that the wthdrawn field has been set to 1.


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** Circ2.pm	2 Jul 2002 23:31:33 -0000	1.30
--- Circ2.pm	14 Aug 2002 05:37:07 -0000	1.31
***************
*** 500,503 ****
--- 500,508 ----
  	$messages->{'IsPermanent'} = $hbr;
      }
+ # check that the book has been cancelled
+     if ($iteminformation->{'wthdrawn'}) {
+ 	$messages->{'wthdrawn'} = 1;
+ 	$doreturn = 0;
+     }
  # update issues, thereby returning book (should push this out into another subroutine
      my ($borrower) = getpatroninformation(\%env, $currentborrower, 0);




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/C4/Interface AccountsCDK.pm,1.1.1.1,1.2 BorrowerCDK.pm,1.1.1.1,1.2 FlagsCDK.pm,1.1.1.1,1.2 RenewalsCDK.pm,1.1.1.1,1.2 ReserveentCDK.pm,1.1.1.1,1.2
Message-ID: <E17f2da-0002MY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Interface
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4/Interface

Modified Files:
	AccountsCDK.pm BorrowerCDK.pm FlagsCDK.pm RenewalsCDK.pm 
	ReserveentCDK.pm 
Log Message:
Added copyright statement to all .pl and .pm files


Index: AccountsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/AccountsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AccountsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- AccountsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: BorrowerCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/BorrowerCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** BorrowerCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- BorrowerCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: FlagsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/FlagsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FlagsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- FlagsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Interface::FlagsCDK; #asummes C4/Interface/FlagsCDK
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: RenewalsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/RenewalsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** RenewalsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- RenewalsCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Cdk;

Index: ReserveentCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/ReserveentCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ReserveentCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- ReserveentCDK.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/acqui acquire.pl,1.4,1.5 addorder.pl,1.9,1.10 basket.pl,1.4,1.5 finishreceive.pl,1.6,1.7 modorders.pl,1.3,1.4 newbasket.pl,1.4,1.5 newbasket2.pl,1.4,1.5 newbiblio.pl,1.6,1.7 order.pl,1.3,1.4 receive.pl,1.4,1.5 recieveorder.pl,1.3,1.4 supplier.pl,1.3,1.4 updatesupplier.pl,1.3,1.4
Message-ID: <E17f2da-0002Mv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv8581/acqui

Modified Files:
	acquire.pl addorder.pl basket.pl finishreceive.pl modorders.pl 
	newbasket.pl newbasket2.pl newbiblio.pl order.pl receive.pl 
	recieveorder.pl supplier.pl updatesupplier.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acquire.pl	4 Jul 2002 15:53:02 -0000	1.4
--- acquire.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** addorder.pl	4 Jul 2002 15:53:02 -0000	1.9
--- addorder.pl	14 Aug 2002 18:12:52 -0000	1.10
***************
*** 4,7 ****
--- 4,25 ----
  #written 29/2/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.pl	4 Jul 2002 15:53:02 -0000	1.4
--- basket.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** finishreceive.pl	4 Jul 2002 15:53:02 -0000	1.6
--- finishreceive.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 4,7 ****
--- 4,25 ----
  #written 1/3/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Output;
  use C4::Catalogue;

Index: modorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/modorders.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modorders.pl	4 Jul 2002 15:53:02 -0000	1.3
--- modorders.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written 29/2/00 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: newbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket.pl	4 Jul 2002 15:53:02 -0000	1.4
--- newbasket.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbasket2.pl	4 Jul 2002 15:53:02 -0000	1.4
--- newbasket2.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 3,6 ****
--- 3,24 ----
  #now script to do searching for acquisitions
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbiblio.pl	4 Jul 2002 15:53:02 -0000	1.6
--- newbiblio.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** order.pl	4 Jul 2002 15:53:02 -0000	1.3
--- order.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 23/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** receive.pl	4 Jul 2002 15:53:02 -0000	1.4
--- receive.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** recieveorder.pl	4 Jul 2002 15:53:02 -0000	1.3
--- recieveorder.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** supplier.pl	4 Jul 2002 15:53:02 -0000	1.3
--- supplier.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 24/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;

Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatesupplier.pl	4 Jul 2002 15:53:02 -0000	1.3
--- updatesupplier.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 23/2/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Catalogue;
  use C4::Biblio;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:54 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:54 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Borrissues.pm,1.1.1.1,1.2 Borrower.pm,1.1.1.1,1.2 Circ2.pm,1.31,1.32 Fines.pm,1.3,1.4 Issues.pm,1.1.1.1,1.2 Main.pm,1.2,1.3 Renewals.pm,1.1.1.1,1.2 Renewals2.pm,1.4,1.5 Returns.pm,1.1.1.1,1.2
Message-ID: <E17f2da-0002MQ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4/Circulation

Modified Files:
	Borrissues.pm Borrower.pm Circ2.pm Fines.pm Issues.pm Main.pm 
	Renewals.pm Renewals2.pm Returns.pm 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Borrissues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrissues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Borrissues.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Borrissues.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Borrower.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrower.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Borrower.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Borrower.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** Circ2.pm	14 Aug 2002 05:37:07 -0000	1.31
--- Circ2.pm	14 Aug 2002 18:12:52 -0000	1.32
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  # use warnings;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Fines.pm	17 Mar 2002 02:58:00 -0000	1.3
--- Fines.pm	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Issues.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Issues.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Main.pm	5 Jan 2001 17:39:25 -0000	1.2
--- Main.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Renewals.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Renewals.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 7/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Renewals2.pm	24 Jun 2002 21:54:44 -0000	1.4
--- Renewals2.pm	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 8,11 ****
--- 8,29 ----
  #need to update stats with renewals
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Returns.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Returns.pm	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/admin aqbookfund.pl,1.3,1.4 aqbudget.pl,1.4,1.5 branches.pl,1.2,1.3 categorie.pl,1.2,1.3 categoryitem.pl,1.2,1.3 currency.pl,1.3,1.4 itemtypes.pl,1.3,1.4 marctagstructure.pl,1.2,1.3 printers.pl,1.4,1.5 stopwords.pl,1.4,1.5 systempreferences.pl,1.4,1.5
Message-ID: <E17f2db-0002NX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8581/admin

Modified Files:
	aqbookfund.pl aqbudget.pl branches.pl categorie.pl 
	categoryitem.pl currency.pl itemtypes.pl marctagstructure.pl 
	printers.pl stopwords.pl systempreferences.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** aqbookfund.pl	2 Jul 2002 21:46:52 -0000	1.3
--- aqbookfund.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** aqbudget.pl	25 Jun 2002 11:05:45 -0000	1.4
--- aqbudget.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branches.pl	2 May 2002 00:08:53 -0000	1.2
--- branches.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  # Reorganising this branches admin page.....
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categorie.pl	24 Jun 2002 18:40:56 -0000	1.2
--- categorie.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 19,22 ****
--- 19,40 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: categoryitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categoryitem.pl	24 Jun 2002 18:40:56 -0000	1.2
--- categoryitem.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** currency.pl	2 Jul 2002 21:46:53 -0000	1.3
--- currency.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** itemtypes.pl	2 Jul 2002 21:46:53 -0000	1.3
--- itemtypes.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marctagstructure.pl	8 Jul 2002 16:45:57 -0000	1.2
--- marctagstructure.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** printers.pl	2 Jul 2002 21:46:53 -0000	1.4
--- printers.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stopwords.pl	2 Jul 2002 21:46:53 -0000	1.4
--- stopwords.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** systempreferences.pl	4 Jul 2002 12:46:42 -0000	1.4
--- systempreferences.pl	14 Aug 2002 18:12:53 -0000	1.5
***************
*** 20,23 ****
--- 20,41 ----
  #	- we delete the record having primkey=$primkey
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.1,1.2 addbooks.pl,1.10,1.11 addbookslccn.pl,1.6,1.7 additem.pl,1.5,1.6 bulkmarcimport.pl,1.6,1.7 isbnsearch.pl,1.3,1.4 keywordsearch.pl,1.4,1.5 marcimport.pl,1.12,1.13 savebiblio.pl,1.5,1.6 saveitem.pl,1.5,1.6 viewmarc.pl,1.3,1.4 websitesearch.pl,1.3,1.4
Message-ID: <E17f2db-0002NP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv8581/acqui.simple

Modified Files:
	addbiblio.pl addbooks.pl addbookslccn.pl additem.pl 
	bulkmarcimport.pl isbnsearch.pl keywordsearch.pl marcimport.pl 
	savebiblio.pl saveitem.pl viewmarc.pl websitesearch.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblio.pl	29 Apr 2002 05:29:02 -0000	1.1
--- addbiblio.pl	14 Aug 2002 18:12:52 -0000	1.2
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** addbooks.pl	24 Jul 2002 16:24:20 -0000	1.10
--- addbooks.pl	14 Aug 2002 18:12:52 -0000	1.11
***************
*** 14,17 ****
--- 14,35 ----
  # Add info on biblioitems and items already entered as you enter new ones
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: addbookslccn.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbookslccn.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** addbookslccn.pl	24 Jul 2002 16:24:20 -0000	1.6
--- addbookslccn.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 14,17 ****
--- 14,35 ----
  # Add info on biblioitems and items already entered as you enter new ones
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** additem.pl	24 Jul 2002 16:24:20 -0000	1.5
--- additem.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: bulkmarcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/bulkmarcimport.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bulkmarcimport.pl	24 Jul 2002 16:24:20 -0000	1.6
--- bulkmarcimport.pl	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 12,15 ****
--- 12,33 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $file=$ARGV[0];
  

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isbnsearch.pl	24 Jul 2002 16:24:20 -0000	1.3
--- isbnsearch.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: keywordsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/keywordsearch.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** keywordsearch.pl	24 Jul 2002 16:24:20 -0000	1.4
--- keywordsearch.pl	14 Aug 2002 18:12:52 -0000	1.5
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marcimport.pl	24 Jul 2002 16:24:20 -0000	1.12
--- marcimport.pl	14 Aug 2002 18:12:52 -0000	1.13
***************
*** 10,13 ****
--- 10,31 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 988,991 ****
--- 1006,1012 ----
  #---------------
  # $Log$
+ # Revision 1.13  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.12  2002/07/24 16:24:20  tipaul
  # Now, the acqui.simple system...

Index: savebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/savebiblio.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** savebiblio.pl	24 Jul 2002 16:24:20 -0000	1.5
--- savebiblio.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: saveitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/saveitem.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** saveitem.pl	24 Jul 2002 16:24:20 -0000	1.5
--- saveitem.pl	14 Aug 2002 18:12:52 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/viewmarc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** viewmarc.pl	24 Jul 2002 16:24:20 -0000	1.3
--- viewmarc.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $starttime=gettime();
  

Index: websitesearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/websitesearch.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** websitesearch.pl	24 Jul 2002 16:24:20 -0000	1.3
--- websitesearch.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.11,1.12 circulation.pl,1.36,1.37 returns.pl,1.12,1.13 selectbranchprinter.pl,1.2,1.3
Message-ID: <E17f2db-0002Nj-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv8581/circ

Modified Files:
	branchtransfers.pl circulation.pl returns.pl 
	selectbranchprinter.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** branchtransfers.pl	23 Jul 2002 01:28:42 -0000	1.11
--- branchtransfers.pl	14 Aug 2002 18:12:53 -0000	1.12
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute branch transfers of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** circulation.pl	9 Aug 2002 04:14:56 -0000	1.36
--- circulation.pl	14 Aug 2002 18:12:53 -0000	1.37
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute issuing of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** returns.pl	14 Aug 2002 05:35:53 -0000	1.12
--- returns.pl	14 Aug 2002 18:12:53 -0000	1.13
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute returns of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** selectbranchprinter.pl	18 May 2002 05:37:28 -0000	1.2
--- selectbranchprinter.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI qw/:standard/;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/sec writeoff.pl,1.3,1.4
Message-ID: <E17f2dc-0002OX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/sec
In directory usw-pr-cvs1:/tmp/cvs-serv8581/sec

Modified Files:
	writeoff.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: writeoff.pl
===================================================================
RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** writeoff.pl	2 Apr 2001 22:51:26 -0000	1.3
--- writeoff.pl	14 Aug 2002 18:12:54 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #script to write off accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/html-template Search.pm,1.2,1.3 detail.pl,1.3,1.4 moredetail.pl,1.1,1.2 search.pl,1.16,1.17
Message-ID: <E17f2db-0002Nv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/html-template
In directory usw-pr-cvs1:/tmp/cvs-serv8581/html-template

Modified Files:
	Search.pm detail.pl moredetail.pl search.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/html-template/Search.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Search.pm	10 May 2002 22:34:36 -0000	1.2
--- Search.pm	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/detail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.pl	31 Jul 2002 09:17:34 -0000	1.3
--- detail.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/moredetail.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** moredetail.pl	15 May 2002 04:54:07 -0000	1.1
--- moredetail.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/html-template/search.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** search.pl	19 May 2002 21:27:12 -0000	1.16
--- search.pl	14 Aug 2002 18:12:53 -0000	1.17
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:55 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:55 -0700
Subject: [Koha-cvs] CVS: koha/maint catmaintain.pl,1.3,1.4 shiftbib.pl,1.1,1.2
Message-ID: <E17f2db-0002O1-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/maint
In directory usw-pr-cvs1:/tmp/cvs-serv8581/maint

Modified Files:
	catmaintain.pl shiftbib.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: catmaintain.pl
===================================================================
RCS file: /cvsroot/koha/koha/maint/catmaintain.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** catmaintain.pl	26 Feb 2002 09:31:15 -0000	1.3
--- catmaintain.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  # by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: shiftbib.pl
===================================================================
RCS file: /cvsroot/koha/koha/maint/shiftbib.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** shiftbib.pl	15 Mar 2001 10:11:33 -0000	1.1
--- shiftbib.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/telnet borrwraper.pl,1.1.1.1,1.2 doreturns.pl,1.1.1.1,1.2 issuewrapper.pl,1.1.1.1,1.2 returnswrapper.pl,1.1.1.1,1.2 startint.pl,1.1.1.1,1.2
Message-ID: <E17f2dc-0002Or-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/telnet
In directory usw-pr-cvs1:/tmp/cvs-serv8581/telnet

Modified Files:
	borrwraper.pl doreturns.pl issuewrapper.pl returnswrapper.pl 
	startint.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: borrwraper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/borrwraper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** borrwraper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- borrwraper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use DBI;
  use C4::Database;

Index: doreturns.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/doreturns.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** doreturns.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- doreturns.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use DBI;
  use C4::Database;

Index: issuewrapper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/issuewrapper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** issuewrapper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- issuewrapper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}");
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $done = "Issues";                                                                
  my $i=0;

Index: returnswrapper.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/returnswrapper.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** returnswrapper.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- returnswrapper.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  $done = "returns";                                                                
  my $i=0;

Index: startint.pl
===================================================================
RCS file: /cvsroot/koha/koha/telnet/startint.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** startint.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- startint.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use C4::Security;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/translator translator.pl,1.2,1.3
Message-ID: <E17f2dc-0002Ox-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/translator
In directory usw-pr-cvs1:/tmp/cvs-serv8581/translator

Modified Files:
	translator.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: translator.pl
===================================================================
RCS file: /cvsroot/koha/koha/translator/translator.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** translator.pl	27 Jun 2001 21:53:05 -0000	1.2
--- translator.pl	14 Aug 2002 18:12:54 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/marc File.pm,1.1,1.2 MARCdetail.pl,1.1,1.2 USMARC.pm,1.1,1.2 fill_usmarc.pl,1.2,1.3 viewmarc.pl,1.3,1.4
Message-ID: <E17f2dc-0002Om-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv8581/marc

Modified Files:
	File.pm MARCdetail.pl USMARC.pm fill_usmarc.pl viewmarc.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: File.pm
===================================================================
RCS file: /cvsroot/koha/koha/marc/File.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** File.pm	24 Jul 2002 15:52:53 -0000	1.1
--- File.pm	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package MARC::File;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  =head1 NAME
  

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/MARCdetail.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MARCdetail.pl	25 Jul 2002 09:55:51 -0000	1.1
--- MARCdetail.pl	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: USMARC.pm
===================================================================
RCS file: /cvsroot/koha/koha/marc/USMARC.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** USMARC.pm	24 Jul 2002 15:52:53 -0000	1.1
--- USMARC.pm	14 Aug 2002 18:12:53 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  package MARC::File::USMARC;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  =head1 NAME
  

Index: fill_usmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/fill_usmarc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fill_usmarc.pl	24 Jul 2002 15:52:53 -0000	1.2
--- fill_usmarc.pl	14 Aug 2002 18:12:53 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #---- this simple script fills the tables with US MARC
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: viewmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/marc/viewmarc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** viewmarc.pl	20 Jun 2002 17:33:17 -0000	1.3
--- viewmarc.pl	14 Aug 2002 18:12:53 -0000	1.4
***************
*** 7,10 ****
--- 7,28 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $starttime=gettime();
  




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/updater thesaurus_create.pl,1.1,1.2 updatedatabase2.pl,1.3,1.4
Message-ID: <E17f2dc-0002P9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory usw-pr-cvs1:/tmp/cvs-serv8581/updater

Modified Files:
	thesaurus_create.pl updatedatabase2.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: thesaurus_create.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/thesaurus_create.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_create.pl	14 May 2002 11:26:10 -0000	1.1
--- thesaurus_create.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  # This script generates and fill the thesaurus table

Index: updatedatabase2.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase2.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatedatabase2.pl	24 Jun 2002 15:00:13 -0000	1.3
--- updatedatabase2.pl	14 Aug 2002 18:12:54 -0000	1.4
***************
*** 14,17 ****
--- 14,35 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use C4::Catalogue;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:12:56 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:12:56 -0700
Subject: [Koha-cvs] CVS: koha/misc fines2.pl,1.5,1.6 fixborrower.pl,1.2,1.3 fixcatalog.pl,1.1.1.1,1.2 fixorders.pl,1.1.1.1,1.2 fixrefs.pl,1.1.1.1,1.2 makebaskets.pl,1.1.1.1,1.2 makeformats.pl,1.1.1.1,1.2 tidyaccounts.pl,1.1.1.1,1.2
Message-ID: <E17f2dc-0002Ob-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory usw-pr-cvs1:/tmp/cvs-serv8581/misc

Modified Files:
	fines2.pl fixborrower.pl fixcatalog.pl fixorders.pl fixrefs.pl 
	makebaskets.pl makeformats.pl tidyaccounts.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: fines2.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fines2.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fines2.pl	10 Apr 2002 00:02:59 -0000	1.5
--- fines2.pl	14 Aug 2002 18:12:54 -0000	1.6
***************
*** 9,12 ****
--- 9,30 ----
  #  This script is meant to be run nightly out of cron.
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use C4::Search;

Index: fixborrower.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixborrower.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fixborrower.pl	9 Apr 2002 22:08:15 -0000	1.2
--- fixborrower.pl	14 Aug 2002 18:12:54 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixcatalog.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixcatalog.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixcatalog.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixcatalog.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixorders.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixorders.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixorders.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use strict;

Index: fixrefs.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/fixrefs.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** fixrefs.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- fixrefs.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: makebaskets.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/makebaskets.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** makebaskets.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- makebaskets.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: makeformats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/makeformats.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** makeformats.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- makeformats.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: tidyaccounts.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/tidyaccounts.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** tidyaccounts.pl	19 Dec 2000 23:45:57 -0000	1.1.1.1
--- tidyaccounts.pl	14 Aug 2002 18:12:54 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:13:24 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:13:24 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts.pm,1.2,1.3 Accounts2.pm,1.11,1.12 Acquisitions.pm,1.22,1.23 Auth.pm,1.9,1.10 Biblio.pm,1.6,1.7 BookShelves.pm,1.3,1.4 Catalogue.pm,1.20,1.21 Circmain.pm,1.2,1.3 Circulation.pm,1.2,1.3 Database.pm,1.5,1.6 Format.pm,1.2,1.3 Groups.pm,1.2,1.3 Input.pm,1.3,1.4 InterfaceCDK.pm,1.2,1.3 Koha.pm,1.5,1.6 Maintainance.pm,1.5,1.6 Output.pm,1.14,1.15 Print.pm,1.7,1.8 Reserves.pm,1.1.1.1,1.2 Reserves2.pm,1.12,1.13 Scan.pm,1.2,1.3 Search.pm,1.32,1.33 Security.pm,1.2,1.3 SimpleMarc.pm,1.2,1.3 Stats.pm,1.6,1.7 Stock.pm,1.2,1.3 Z3950.pm,1.2,1.3 test.pl,1.3,1.4
Message-ID: <E17f2e4-0002Vy-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv8581/C4

Modified Files:
	Accounts.pm Accounts2.pm Acquisitions.pm Auth.pm Biblio.pm 
	BookShelves.pm Catalogue.pm Circmain.pm Circulation.pm 
	Database.pm Format.pm Groups.pm Input.pm InterfaceCDK.pm 
	Koha.pm Maintainance.pm Output.pm Print.pm Reserves.pm 
	Reserves2.pm Scan.pm Search.pm Security.pm SimpleMarc.pm 
	Stats.pm Stock.pm Z3950.pm test.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Accounts.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Accounts.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts; #assumes C4/Accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Accounts2.pm	2 Jul 2002 20:49:44 -0000	1.11
--- Accounts2.pm	14 Aug 2002 18:12:51 -0000	1.12
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts2; #assumes C4/Accounts2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Acquisitions.pm	22 Jul 2002 20:45:47 -0000	1.22
--- Acquisitions.pm	14 Aug 2002 18:12:51 -0000	1.23
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Acquisitions; #assumes C4/Acquisitions.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Auth.pm	11 Jul 2002 05:46:58 -0000	1.9
--- Auth.pm	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Auth;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Digest::MD5 qw(md5_base64);

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Biblio.pm	25 Jul 2002 13:40:31 -0000	1.6
--- Biblio.pm	14 Aug 2002 18:12:51 -0000	1.7
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  # $Log$
+ # Revision 1.7  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.6  2002/07/25 13:40:31  tipaul
  # pod documenting the API.
***************
*** 52,55 ****
--- 55,76 ----
  # in 1.4 version, the translations will be nicer, as we have NOTHING to do in code. Everything has to be done in Biblio.pm ;-)
  
+ 
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
  
  use strict;

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BookShelves.pm	2 Jul 2002 17:48:06 -0000	1.3
--- BookShelves.pm	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 6,9 ****
--- 6,27 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;
***************
*** 134,137 ****
--- 152,158 ----
  #
  # $Log$
+ # Revision 1.4  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.3  2002/07/02 17:48:06  tonnesen
  # Merged in updates from rel-1-2

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** Catalogue.pm	4 Jul 2002 15:53:02 -0000	1.20
--- Catalogue.pm	14 Aug 2002 18:12:51 -0000	1.21
***************
*** 10,13 ****
--- 10,31 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Circmain.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Circmain.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Circulation.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Circulation.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Database.pm	24 Jul 2002 16:11:37 -0000	1.5
--- Database.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Format.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Format.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Format; #assumes C4/Format
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Groups.pm	20 Jun 2002 18:04:47 -0000	1.2
--- Groups.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Input.pm	3 Jul 2002 03:18:50 -0000	1.3
--- Input.pm	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Input; #assumes C4/Input
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** InterfaceCDK.pm	20 Jun 2002 18:56:52 -0000	1.2
--- InterfaceCDK.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use strict;

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Koha.pm	20 Jun 2002 18:56:52 -0000	1.5
--- Koha.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Koha;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Maintainance.pm	20 Jun 2002 18:56:52 -0000	1.5
--- Maintainance.pm	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with marking up output
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Output.pm	24 Jul 2002 16:11:37 -0000	1.14
--- Output.pm	14 Aug 2002 18:12:51 -0000	1.15
***************
*** 5,8 ****
--- 5,26 ----
  #set the value of path to be where your html lives
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Print.pm	24 Jul 2002 03:16:21 -0000	1.7
--- Print.pm	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Print; #assumes C4/Print.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Reserves.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Reserves.pm	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Reserves2.pm	26 Jul 2002 01:08:48 -0000	1.12
--- Reserves2.pm	14 Aug 2002 18:12:51 -0000	1.13
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Reserves2; #assumes C4/Reserves2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Scan.pm	20 Jun 2002 18:04:48 -0000	1.2
--- Scan.pm	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Scan; #assumes C4/Scan.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Search.pm	31 Jul 2002 01:50:06 -0000	1.32
--- Search.pm	14 Aug 2002 18:12:51 -0000	1.33
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Search; #assumes C4/Search
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Security.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Security.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Security; #assumes C4/Security
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SimpleMarc.pm	2 Jul 2002 20:30:15 -0000	1.2
--- SimpleMarc.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 448,451 ****
--- 466,472 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.3  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.2  2002/07/02 20:30:15  tonnesen
  # Merged SimpleMarc.pm over from rel-1-2

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Stats.pm	20 Jun 2002 20:43:26 -0000	1.6
--- Stats.pm	14 Aug 2002 18:12:52 -0000	1.7
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stats; #assumes C4/Stats
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Stock.pm	20 Jun 2002 18:56:52 -0000	1.2
--- Stock.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stock; #assumes C4/Stock.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Z3950.pm	2 Jul 2002 20:31:33 -0000	1.2
--- Z3950.pm	14 Aug 2002 18:12:52 -0000	1.3
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 190,193 ****
--- 208,214 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.3  2002/08/14 18:12:52  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.2  2002/07/02 20:31:33  tonnesen
  # module added from rel-1-2 branch

Index: test.pl
===================================================================
RCS file: /cvsroot/koha/koha/C4/test.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** test.pl	10 Jun 2002 20:49:54 -0000	1.3
--- test.pl	14 Aug 2002 18:12:52 -0000	1.4
***************
*** 1,3 ****
--- 1,21 ----
  package C4::test;
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:52 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:52 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.11,1.1.2.12
Message-ID: <E17f2uy-00058T-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19575

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -r1.1.2.11 -r1.1.2.12
*** Install.pm	27 Jul 2002 07:00:14 -0000	1.1.2.11
--- Install.pm	14 Aug 2002 18:30:50 -0000	1.1.2.12
***************
*** 1,4 ****
--- 1,22 ----
  package Install; #assumes Install.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Borrissues.pm,1.1.1.1,1.1.1.1.2.1 Borrower.pm,1.1.1.1,1.1.1.1.2.1 Circ2.pm,1.21.2.3,1.21.2.4 Fines.pm,1.3,1.3.2.1 Issues.pm,1.1.1.1,1.1.1.1.2.1 Main.pm,1.2,1.2.2.1 Renewals.pm,1.1.1.1,1.1.1.1.2.1 Renewals2.pm,1.2.2.2,1.2.2.3 Returns.pm,1.1.1.1,1.1.1.1.2.1
Message-ID: <E17f2uz-00059K-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Borrissues.pm Borrower.pm Circ2.pm Fines.pm Issues.pm Main.pm 
	Renewals.pm Renewals2.pm Returns.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Borrissues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrissues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Borrissues.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Borrissues.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Borrower.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Borrower.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Borrower.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Borrower.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -C2 -r1.21.2.3 -r1.21.2.4
*** Circ2.pm	27 Jul 2002 05:30:12 -0000	1.21.2.3
--- Circ2.pm	14 Aug 2002 18:30:50 -0000	1.21.2.4
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** Fines.pm	17 Mar 2002 02:58:00 -0000	1.3
--- Fines.pm	14 Aug 2002 18:30:50 -0000	1.3.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Issues.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Issues.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** Main.pm	5 Jan 2001 17:39:25 -0000	1.2
--- Main.pm	14 Aug 2002 18:30:50 -0000	1.2.2.1
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Renewals.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Renewals.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 7/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** Renewals2.pm	24 Jun 2002 21:54:09 -0000	1.2.2.2
--- Renewals2.pm	14 Aug 2002 18:30:50 -0000	1.2.2.3
***************
*** 8,11 ****
--- 8,29 ----
  #need to update stats with renewals
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Returns.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Returns.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Returns.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- Returns.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.3,1.3.2.1 circulation.pl,1.23.2.2,1.23.2.3
Message-ID: <E17f2uz-00059S-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv19575/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** branchtransfers.pl	14 Mar 2002 01:51:16 -0000	1.3
--- branchtransfers.pl	14 Aug 2002 18:30:51 -0000	1.3.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #script to execute branch transfers of books
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -r1.23.2.2 -r1.23.2.3
*** circulation.pl	11 Jul 2002 18:05:29 -0000	1.23.2.2
--- circulation.pl	14 Aug 2002 18:30:51 -0000	1.23.2.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI qw/:standard/;
  use C4::Circulation::Circ2;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4/Interface AccountsCDK.pm,1.1.1.1,1.1.1.1.2.1 BorrowerCDK.pm,1.1.1.1,1.1.1.1.2.1 FlagsCDK.pm,1.1.1.1,1.1.1.1.2.1 RenewalsCDK.pm,1.1.1.1,1.1.1.1.2.1 ReserveentCDK.pm,1.1.1.1,1.1.1.1.2.1
Message-ID: <E17f2uz-00059N-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Interface
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4/Interface

Modified Files:
      Tag: rel-1-2
	AccountsCDK.pm BorrowerCDK.pm FlagsCDK.pm RenewalsCDK.pm 
	ReserveentCDK.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: AccountsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/AccountsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** AccountsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- AccountsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: BorrowerCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/BorrowerCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** BorrowerCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- BorrowerCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: FlagsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/FlagsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** FlagsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- FlagsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Interface::FlagsCDK; #asummes C4/Interface/FlagsCDK
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;

Index: RenewalsCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/RenewalsCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** RenewalsCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- RenewalsCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Cdk;

Index: ReserveentCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Interface/ReserveentCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** ReserveentCDK.pm	19 Dec 2000 23:45:56 -0000	1.1.1.1
--- ReserveentCDK.pm	14 Aug 2002 18:30:51 -0000	1.1.1.1.2.1
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use C4::InterfaceCDK;




From tonnesen at users.sourceforge.net  Wed Aug 14 20:30:53 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:30:53 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts.pm,1.1.1.1.2.1,1.1.1.1.2.2 Accounts2.pm,1.9.2.4,1.9.2.5 Acquisitions.pm,1.5.2.12,1.5.2.13 Auth.pm,1.9.2.7,1.9.2.8 Biblio.pm,1.1.2.4,1.1.2.5 BookShelves.pm,1.2.2.1,1.2.2.2 Catalogue.pm,1.11.2.1,1.11.2.2 Circmain.pm,1.1.1.1.2.2,1.1.1.1.2.3 Circulation.pm,1.1.1.1.2.1,1.1.1.1.2.2 Database.pm,1.2.2.6,1.2.2.7 Format.pm,1.1.1.1.2.2,1.1.1.1.2.3 Groups.pm,1.1.2.1,1.1.2.2 Input.pm,1.1.1.1.2.4,1.1.1.1.2.5 InterfaceCDK.pm,1.1.1.1.2.2,1.1.1.1.2.3 Koha.pm,1.4.2.4,1.4.2.5 Maintainance.pm,1.4.2.1,1.4.2.2 Output.pm,1.6.2.15,1.6.2.16 Print.pm,1.3.2.3,1.3.2.4 Reserves.pm,1.1.1.1,1.1.1.1.2.1 Reserves2.pm,1.5.2.5,1.5.2.6 Scan.pm,1.1.1.1.2.1,1.1.1.1.2.2 Search.pm,1.18.2.6,1.18.2.7 Security.pm,1.1.1.1.2.1,1.1.1.1.2.2 SimpleMarc.pm,1.1.2.4,1.1.2.5 Stats.pm,1.3.2.2,1.3.2.3 Stock.pm,1.1.1.1.2.1,1.1.1.1.2.2 Z3950.pm,1.1.2.5,1.1.2.6
Message-ID: <E17f2uz-00059m-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv19575/C4

Modified Files:
      Tag: rel-1-2
	Accounts.pm Accounts2.pm Acquisitions.pm Auth.pm Biblio.pm 
	BookShelves.pm Catalogue.pm Circmain.pm Circulation.pm 
	Database.pm Format.pm Groups.pm Input.pm InterfaceCDK.pm 
	Koha.pm Maintainance.pm Output.pm Print.pm Reserves.pm 
	Reserves2.pm Scan.pm Search.pm Security.pm SimpleMarc.pm 
	Stats.pm Stock.pm Z3950.pm 
Log Message:
Adding copyright statements to all .pl and .pm files in rel-1-2 branch


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Accounts.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Accounts.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts; #assumes C4/Accounts
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** Accounts2.pm	24 Jun 2002 16:15:00 -0000	1.9.2.4
--- Accounts2.pm	14 Aug 2002 18:30:50 -0000	1.9.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Accounts2; #assumes C4/Accounts2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -C2 -r1.5.2.12 -r1.5.2.13
*** Acquisitions.pm	24 Jun 2002 16:15:01 -0000	1.5.2.12
--- Acquisitions.pm	14 Aug 2002 18:30:50 -0000	1.5.2.13
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Acquisitions; #assumes C4/Acquisitions.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -C2 -r1.9.2.7 -r1.9.2.8
*** Auth.pm	27 Jul 2002 04:33:57 -0000	1.9.2.7
--- Auth.pm	14 Aug 2002 18:30:50 -0000	1.9.2.8
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Auth;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Digest::MD5 qw(md5_base64);

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** Biblio.pm	26 Jun 2002 22:13:49 -0000	1.1.2.4
--- Biblio.pm	14 Aug 2002 18:30:50 -0000	1.1.2.5
***************
*** 5,8 ****
--- 5,26 ----
  #-----------------
  # General requirements
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 982,985 ****
--- 1000,1006 ----
  #---------------------------------------
  # $Log$
+ # Revision 1.1.2.5  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.4  2002/06/26 22:13:49  tonnesen
  # Fix to allow non-numeric barcodes.

Index: BookShelves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** BookShelves.pm	26 Jun 2002 20:46:48 -0000	1.2.2.1
--- BookShelves.pm	14 Aug 2002 18:30:50 -0000	1.2.2.2
***************
*** 6,9 ****
--- 6,27 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;
***************
*** 134,137 ****
--- 152,158 ----
  #
  # $Log$
+ # Revision 1.2.2.2  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.2.2.1  2002/06/26 20:46:48  tonnesen
  # Inserting some changes I made locally a while ago.

Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** Catalogue.pm	25 Apr 2002 21:59:55 -0000	1.11.2.1
--- Catalogue.pm	14 Aug 2002 18:30:50 -0000	1.11.2.2
***************
*** 10,13 ****
--- 10,31 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** Circmain.pm	20 Jun 2002 18:33:56 -0000	1.1.1.1.2.2
--- Circmain.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Circulation.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Circulation.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with circulation 
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -C2 -r1.2.2.6 -r1.2.2.7
*** Database.pm	27 Jul 2002 04:41:30 -0000	1.2.2.6
--- Database.pm	14 Aug 2002 18:30:50 -0000	1.2.2.7
***************
*** 3,6 ****
--- 3,24 ----
  #requires DBI.pm to be installed
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** Format.pm	20 Jun 2002 18:33:56 -0000	1.1.1.1.2.2
--- Format.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Format; #assumes C4/Format
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Groups.pm	25 Apr 2002 21:59:55 -0000	1.1.2.1
--- Groups.pm	14 Aug 2002 18:30:50 -0000	1.1.2.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 3/11/99 by olwen at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** Input.pm	5 Jul 2002 04:45:13 -0000	1.1.1.1.2.4
--- Input.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Input; #assumes C4/Input
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** InterfaceCDK.pm	21 Jun 2002 18:26:28 -0000	1.1.1.1.2.2
--- InterfaceCDK.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.3
***************
*** 2,5 ****
--- 2,23 ----
  
  #uses Newt
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Format;
  use strict;

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** Koha.pm	12 Jul 2002 23:58:35 -0000	1.4.2.4
--- Koha.pm	14 Aug 2002 18:30:50 -0000	1.4.2.5
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Koha;
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** Maintainance.pm	25 Apr 2002 21:59:55 -0000	1.4.2.1
--- Maintainance.pm	14 Aug 2002 18:30:50 -0000	1.4.2.2
***************
*** 3,6 ****
--- 3,24 ----
  #package to deal with marking up output
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.6.2.15
retrieving revision 1.6.2.16
diff -C2 -r1.6.2.15 -r1.6.2.16
*** Output.pm	11 Jul 2002 21:06:19 -0000	1.6.2.15
--- Output.pm	14 Aug 2002 18:30:50 -0000	1.6.2.16
***************
*** 7,10 ****
--- 7,28 ----
  #set the value of path to be where your html lives
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** Print.pm	20 Jun 2002 20:42:35 -0000	1.3.2.3
--- Print.pm	14 Aug 2002 18:30:50 -0000	1.3.2.4
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Print; #assumes C4/Print.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** Reserves.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Reserves.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.1
***************
*** 4,7 ****
--- 4,25 ----
  #uses DBD:Pg
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** Reserves2.pm	11 Jul 2002 18:05:29 -0000	1.5.2.5
--- Reserves2.pm	14 Aug 2002 18:30:50 -0000	1.5.2.6
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Reserves2; #assumes C4/Reserves2
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Scan.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Scan.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Scan; #assumes C4/Scan.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -C2 -r1.18.2.6 -r1.18.2.7
*** Search.pm	11 Jul 2002 18:05:29 -0000	1.18.2.6
--- Search.pm	14 Aug 2002 18:30:50 -0000	1.18.2.7
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Search; #assumes C4/Search
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Security.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Security.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Security; #assumes C4/Security
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: SimpleMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SimpleMarc.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** SimpleMarc.pm	28 Jun 2002 14:36:47 -0000	1.1.2.4
--- SimpleMarc.pm	14 Aug 2002 18:30:50 -0000	1.1.2.5
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 448,451 ****
--- 466,472 ----
  #---------------------------------------------
  # $Log$
+ # Revision 1.1.2.5  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.4  2002/06/28 14:36:47  amillar
  # Fix broken logic on illustrator vs. add'l author

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** Stats.pm	18 May 2002 10:21:51 -0000	1.3.2.2
--- Stats.pm	14 Aug 2002 18:30:50 -0000	1.3.2.3
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stats; #assumes C4/Stats
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Stock.pm	25 Apr 2002 21:59:55 -0000	1.1.1.1.2.1
--- Stock.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.2
***************
*** 1,4 ****
--- 1,22 ----
  package C4::Stock; #assumes C4/Stock.pm
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  require Exporter;

Index: Z3950.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Z3950.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** Z3950.pm	29 Jun 2002 17:33:47 -0000	1.1.2.5
--- Z3950.pm	14 Aug 2002 18:30:50 -0000	1.1.2.6
***************
*** 11,14 ****
--- 11,32 ----
  # Licensed under the GPL
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  
***************
*** 190,193 ****
--- 208,214 ----
  #--------------------------------------
  # $Log$
+ # Revision 1.1.2.6  2002/08/14 18:30:50  tonnesen
+ # Adding copyright statements to all .pl and .pm files in rel-1-2 branch
+ #
  # Revision 1.1.2.5  2002/06/29 17:33:47  amillar
  # Allow DEFAULT as input to addz3950search.




From tonnesen at users.sourceforge.net  Wed Aug 14 20:13:24 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Wed, 14 Aug 2002 11:13:24 -0700
Subject: [Koha-cvs] CVS: koha addwebsite.pl,1.1,1.2 barcodes.pl,1.1,1.2 bookcount.pl,1.1,1.2 boraccount.pl,1.2,1.3 charges.pl,1.1.1.1,1.2 currency.pl,1.2,1.3 delbiblio.pl,1.4,1.5 deletebiblioitem.pl,1.1,1.2 deletemem.pl,1.2,1.3 deletewebsite.pl,1.1,1.2 delitem.pl,1.2,1.3 detail.pl,1.9,1.10 groups.pl,1.1,1.2 imemberentry.pl,1.1.1.1,1.2 insertdata.pl,1.7,1.8 insertidata.pl,1.1.1.1,1.2 insertjdata.pl,1.1.1.1,1.2 installer-lite.pl,1.1,1.2 installer.pl,1.7,1.8 jmemberentry.pl,1.1.1.1,1.2 loadmodules.pl,1.3,1.4 logout.pl,1.2,1.3 mancredit.pl,1.2,1.3 maninvoice.pl,1.2,1.3 member.pl,1.2,1.3 memberentry.pl,1.7,1.8 modbib.pl,1.5,1.6 modbibitem.pl,1.8,1.9 moditem.pl,1.2,1.3 modrequest.pl,1.1.1.1,1.2 modwebsites.pl,1.1,1.2 moredetail.pl,1.8,1.9 moremember.pl,1.13,1.14 newimember.pl,1.1.1.1,1.2 newjmember.pl,1.1.1.1,1.2 newmember.pl,1.1.1.1,1.2 orderbreakdown.pl,1.2,1.3 overdue.pl,1.1,1.2 pay.pl,1.3,1.4 placerequest.pl,1.1.1.1,1.2 readingrec.pl,1.2,1.3 renewscript.pl,1.2,1.3 reports.pl,1.1.1.1,1.2 request.pl,1.8,1.9 reservereport.pl,1.1.1.1,1.2 search.pl,1.9,1.10 shelves.pl,1.7,1.8 showbudget.pl,1.3,1.4 simpleredirect.pl,1.1.1.1,1.2 stats.pl,1.4,1.5 stats2.pl,1.1.1.1,1.2 subjectsearch.pl,1.2,1.3 testKoha.pl,1.5,1.6 thesaurus_popup.pl,1.1,1.2 tidyaccounts.pl,1.1.1.1,1.2 updatebibitem.pl,1.7,1.8 updatebiblio.pl,1.3,1.4 updatecharges.pl,1.1.1.1,1.2 updateitem.pl,1.3,1.4 updatewebsite.pl,1.1,1.2 userpage.pl,1.2,1.3
Message-ID: <E17f2e4-0002VU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv8581

Modified Files:
	addwebsite.pl barcodes.pl bookcount.pl boraccount.pl 
	charges.pl currency.pl delbiblio.pl deletebiblioitem.pl 
	deletemem.pl deletewebsite.pl delitem.pl detail.pl groups.pl 
	imemberentry.pl insertdata.pl insertidata.pl insertjdata.pl 
	installer-lite.pl installer.pl jmemberentry.pl loadmodules.pl 
	logout.pl mancredit.pl maninvoice.pl member.pl memberentry.pl 
	modbib.pl modbibitem.pl moditem.pl modrequest.pl 
	modwebsites.pl moredetail.pl moremember.pl newimember.pl 
	newjmember.pl newmember.pl orderbreakdown.pl overdue.pl pay.pl 
	placerequest.pl readingrec.pl renewscript.pl reports.pl 
	request.pl reservereport.pl search.pl shelves.pl showbudget.pl 
	simpleredirect.pl stats.pl stats2.pl subjectsearch.pl 
	testKoha.pl thesaurus_popup.pl tidyaccounts.pl 
	updatebibitem.pl updatebiblio.pl updatecharges.pl 
	updateitem.pl updatewebsite.pl userpage.pl 
Log Message:
Added copyright statement to all .pl and .pm files


Index: addwebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/addwebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addwebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- addwebsite.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: barcodes.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes.pl	29 May 2002 21:06:17 -0000	1.1
--- barcodes.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 6,9 ****
--- 6,27 ----
  # Variable Section #
  ####################
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  my $pretext='T ';
  my $startnumber=1000;

Index: bookcount.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookcount.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bookcount.pl	2 May 2002 00:08:53 -0000	1.1
--- bookcount.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/boraccount.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** boraccount.pl	2 May 2001 21:11:41 -0000	1.2
--- boraccount.pl	14 Aug 2002 18:12:50 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: charges.pl
===================================================================
RCS file: /cvsroot/koha/koha/charges.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** charges.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- charges.pl	14 Aug 2002 18:12:50 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/currency.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** currency.pl	20 Jun 2002 17:23:09 -0000	1.2
--- currency.pl	14 Aug 2002 18:12:50 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #script to display and update currency rates
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Acquisitions;

Index: delbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/delbiblio.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** delbiblio.pl	20 Jun 2002 17:45:18 -0000	1.4
--- delbiblio.pl	14 Aug 2002 18:12:51 -0000	1.5
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: deletebiblioitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletebiblioitem.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** deletebiblioitem.pl	14 May 2002 04:12:52 -0000	1.1
--- deletebiblioitem.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletemem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** deletemem.pl	11 Sep 2001 02:03:26 -0000	1.2
--- deletemem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: deletewebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletewebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** deletewebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- deletewebsite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: delitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/delitem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** delitem.pl	20 Jun 2002 17:23:09 -0000	1.2
--- delitem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  #by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** detail.pl	22 May 2002 18:35:25 -0000	1.9
--- detail.pl	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** groups.pl	2 May 2001 23:06:44 -0000	1.1
--- groups.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI qw/:standard/;
  use C4::Output;

Index: imemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/imemberentry.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** imemberentry.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- imemberentry.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: insertdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertdata.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** insertdata.pl	9 Apr 2002 00:04:39 -0000	1.7
--- insertdata.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: insertidata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertidata.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** insertidata.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- insertidata.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: insertjdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertjdata.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** insertjdata.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- insertjdata.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  # written 9/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: installer-lite.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer-lite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** installer-lite.pl	11 Jun 2002 11:24:36 -0000	1.1
--- installer-lite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl -w # please develop with -w
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use diagnostics;
  use strict; # please develop with the strict pragma

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** installer.pl	23 Jul 2002 06:06:42 -0000	1.7
--- installer.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 2,5 ****
--- 2,23 ----
  
  #use diagnostics;
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict; # please develop with the strict pragma
  

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** jmemberentry.pl	19 Dec 2000 23:45:51 -0000	1.1.1.1
--- jmemberentry.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: loadmodules.pl
===================================================================
RCS file: /cvsroot/koha/koha/loadmodules.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** loadmodules.pl	20 Jun 2002 17:23:09 -0000	1.3
--- loadmodules.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  #called as an include by the acquisitions index page
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: logout.pl
===================================================================
RCS file: /cvsroot/koha/koha/logout.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** logout.pl	5 Jul 2002 05:03:36 -0000	1.2
--- logout.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Database;

Index: mancredit.pl
===================================================================
RCS file: /cvsroot/koha/koha/mancredit.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mancredit.pl	9 May 2001 23:22:10 -0000	1.2
--- mancredit.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: maninvoice.pl
===================================================================
RCS file: /cvsroot/koha/koha/maninvoice.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** maninvoice.pl	9 May 2001 23:22:10 -0000	1.2
--- maninvoice.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to display borrowers account details
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	6 May 2002 04:12:48 -0000	1.2
--- member.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** memberentry.pl	4 Jul 2002 13:53:56 -0000	1.7
--- memberentry.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 4,7 ****
--- 4,25 ----
  #written 20/12/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: modbib.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbib.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** modbib.pl	28 Jun 2002 12:07:16 -0000	1.5
--- modbib.pl	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 5,8 ****
--- 5,26 ----
  # modified 11/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: modbibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbibitem.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** modbibitem.pl	20 Jun 2002 18:04:45 -0000	1.8
--- modbibitem.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 6,9 ****
--- 6,27 ----
  # modified 11/11/99 by chris at katipo.co.nz
  # modified 18/4/00 by chris at katipo.co.nz
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: moditem.pl
===================================================================
RCS file: /cvsroot/koha/koha/moditem.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** moditem.pl	20 Jun 2002 17:23:09 -0000	1.2
--- moditem.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  # modified 11/11/99 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: modrequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/modrequest.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** modrequest.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- modrequest.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 5,8 ****
--- 5,26 ----
  #last update 27/1/2000 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: modwebsites.pl
===================================================================
RCS file: /cvsroot/koha/koha/modwebsites.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modwebsites.pl	12 May 2002 15:37:53 -0000	1.1
--- modwebsites.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  

Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** moredetail.pl	31 Jul 2002 03:56:44 -0000	1.8
--- moredetail.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** moremember.pl	27 Jun 2002 21:16:20 -0000	1.13
--- moremember.pl	14 Aug 2002 18:12:51 -0000	1.14
***************
*** 11,14 ****
--- 11,32 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newimember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newimember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newimember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newimember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newjmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newjmember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newjmember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newjmember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** newmember.pl	19 Dec 2000 23:45:52 -0000	1.1.1.1
--- newmember.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 3,6 ****
--- 3,24 ----
  #script to print confirmation screen, then if accepted calls itself to insert data
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: orderbreakdown.pl
===================================================================
RCS file: /cvsroot/koha/koha/orderbreakdown.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** orderbreakdown.pl	20 Jun 2002 17:23:09 -0000	1.2
--- orderbreakdown.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written by chris at katipo.co.nz 31/01/2000
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: overdue.pl
===================================================================
RCS file: /cvsroot/koha/koha/overdue.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** overdue.pl	18 Mar 2001 22:06:39 -0000	1.1
--- overdue.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pay.pl	27 Mar 2002 00:02:40 -0000	1.3
--- pay.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 4,7 ****
--- 4,25 ----
  #part of the koha library system, script to facilitate paying off fines
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: placerequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/placerequest.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** placerequest.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- placerequest.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #writen 2/1/00 by chris at katipo.oc.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: readingrec.pl
===================================================================
RCS file: /cvsroot/koha/koha/readingrec.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** readingrec.pl	20 Jun 2001 03:36:01 -0000	1.2
--- readingrec.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 5,8 ****
--- 5,26 ----
  
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Output;

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** renewscript.pl	9 May 2001 23:23:52 -0000	1.2
--- renewscript.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #script to renew items from the web
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use C4::Circulation::Renewals2;

Index: reports.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** reports.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- reports.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** request.pl	9 Aug 2002 04:33:01 -0000	1.8
--- request.pl	14 Aug 2002 18:12:51 -0000	1.9
***************
*** 4,7 ****
--- 4,25 ----
  #writen 2/1/00 by chris at katipo.oc.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: reservereport.pl
===================================================================
RCS file: /cvsroot/koha/koha/reservereport.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** reservereport.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- reservereport.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** search.pl	15 May 2002 04:36:51 -0000	1.9
--- search.pl	14 Aug 2002 18:12:51 -0000	1.10
***************
*** 2,5 ****
--- 2,23 ----
  #script to provide intranet (librarian) advanced search facility
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;

Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/shelves.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** shelves.pl	5 Jul 2002 05:03:37 -0000	1.7
--- shelves.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 5,8 ****
--- 5,26 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Search;
***************
*** 170,173 ****
--- 188,194 ----
  #
  # $Log$
+ # Revision 1.8  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.7  2002/07/05 05:03:37  tonnesen
  # Minor changes to authentication routines.

Index: showbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/showbudget.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** showbudget.pl	20 Jun 2002 17:23:09 -0000	1.3
--- showbudget.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 5,8 ****
--- 5,26 ----
  #called as an include by the acquisitions index page
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Acquisitions;
  use C4::Biblio;

Index: simpleredirect.pl
===================================================================
RCS file: /cvsroot/koha/koha/simpleredirect.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** simpleredirect.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- simpleredirect.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #used by members section
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use CGI;
  use strict;

Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** stats.pl	2 Apr 2001 22:51:26 -0000	1.4
--- stats.pl	14 Aug 2002 18:12:51 -0000	1.5
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: stats2.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats2.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** stats2.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- stats2.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #script to display reports
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Stats;
  use strict;

Index: subjectsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/subjectsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subjectsearch.pl	9 Jul 2002 03:07:05 -0000	1.2
--- subjectsearch.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 4,7 ****
--- 4,25 ----
  #written 8/11/99
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  #use DBI;

Index: testKoha.pl
===================================================================
RCS file: /cvsroot/koha/koha/testKoha.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** testKoha.pl	20 Jun 2002 18:04:46 -0000	1.5
--- testKoha.pl	14 Aug 2002 18:12:51 -0000	1.6
***************
*** 3,6 ****
--- 3,24 ----
  # $Id$
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use Test::Harness;
***************
*** 24,27 ****
--- 42,48 ----
  
  # $Log$
+ # Revision 1.6  2002/08/14 18:12:51  tonnesen
+ # Added copyright statement to all .pl and .pm files
+ #
  # Revision 1.5  2002/06/20 18:04:46  tonnesen
  # Are we getting sick of merging yet?  Not me!

Index: thesaurus_popup.pl
===================================================================
RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_popup.pl	14 May 2002 11:26:10 -0000	1.1
--- thesaurus_popup.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  # build Subject field using bibliothesaurus table
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: tidyaccounts.pl
===================================================================
RCS file: /cvsroot/koha/koha/tidyaccounts.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** tidyaccounts.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- tidyaccounts.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 4,7 ****
--- 4,25 ----
  #
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Database;

Index: updatebibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebibitem.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** updatebibitem.pl	28 Jun 2002 12:53:02 -0000	1.7
--- updatebibitem.pl	14 Aug 2002 18:12:51 -0000	1.8
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatebiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatebiblio.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updatebiblio.pl	28 Jun 2002 12:19:50 -0000	1.3
--- updatebiblio.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatecharges.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatecharges.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** updatecharges.pl	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- updatecharges.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 6,9 ****
--- 6,27 ----
  # written 1/1/2000 by chris at katipo.co.nz
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use CGI;

Index: updateitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/updateitem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** updateitem.pl	20 Jun 2002 17:23:09 -0000	1.3
--- updateitem.pl	14 Aug 2002 18:12:51 -0000	1.4
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use C4::Database;
  use CGI;

Index: updatewebsite.pl
===================================================================
RCS file: /cvsroot/koha/koha/updatewebsite.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** updatewebsite.pl	12 May 2002 15:37:53 -0000	1.1
--- updatewebsite.pl	14 Aug 2002 18:12:51 -0000	1.2
***************
*** 1,4 ****
--- 1,22 ----
  #!/usr/bin/perl
  
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use strict;
  use C4::Acquisitions;

Index: userpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/userpage.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** userpage.pl	11 Jul 2002 06:40:06 -0000	1.2
--- userpage.pl	14 Aug 2002 18:12:51 -0000	1.3
***************
*** 1,3 ****
--- 1,21 ----
  #!/usr/bin/perl
+ 
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA  02111-1307 USA
+ 
  use HTML::Template;
  use strict;




From rangi at users.sourceforge.net  Thu Aug 15 02:46:28 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 17:46:28 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.4,1.21.2.5
Message-ID: <E17f8mS-0000S3-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv1318/C4/Circulation

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -C2 -r1.21.2.4 -r1.21.2.5
*** Circ2.pm	14 Aug 2002 18:30:50 -0000	1.21.2.4
--- Circ2.pm	15 Aug 2002 00:46:26 -0000	1.21.2.5
***************
*** 23,26 ****
--- 23,27 ----
  
  use strict;
+ # use warnings;
  require Exporter;
  use DBI;
***************
*** 33,36 ****
--- 34,38 ----
  #use C4::Scan;
[...1274 lines suppressed...]
! 		if (my $conrec = $consth->fetchrow_hashref) {
! 		    if ($resrec->{'constrainttype'} eq "o") {
! 			$resfound = 1;
! 		    }
! 		}
! 		$consth->finish;
! 	    }
! 	}
! 	if ($resfound) {
!             my $updquery = "update reserves set found = 'W', itemnumber = '$itemno'
!                   where borrowernumber = $brn and reservedate = $rdate and biblionumber = $bibno";
! 	    my $updsth = $dbh->prepare($updquery);
! 	    $updsth->execute;
! 	    $updsth->finish;
! 	}
      }
!     $sth->finish;
!     return ($resfound,$lastrec);
  }
  




From rangi at users.sourceforge.net  Thu Aug 15 02:46:28 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 17:46:28 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,NONE,1.13.2.1 selectbranchprinter.pl,NONE,1.3.2.1 branchtransfers.pl,1.3.2.1,1.3.2.2 circulation.pl,1.23.2.3,1.23.2.4
Message-ID: <E17f8mS-0000SD-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1318/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl 
Added Files:
      Tag: rel-1-2
	returns.pl selectbranchprinter.pl 
Log Message:
Merging branchtransfers and lots of circulation fixes into the rel-1-2 branch
Needs testing. 



--- NEW FILE ---
#!/usr/bin/perl

#written 11/3/2002 by Finlay
#script to execute returns of books


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
use C4::Print;
use C4::Reserves2;

my %env;
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";

my $query=new CGI;
my $branches = getbranches();
my $printers = getprinters(\%env);

my $branch = $query->param("branch");
my $printer = $query->param("printer");

($branch) || ($branch=$query->cookie('branch')) ;
($printer) || ($printer=$query->cookie('printer')) ;


#
# Some code to handle the error if there is no branch or printer setting.....
#


$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;

# Set up the item stack ....
my $ritext = '';
my %returneditems;
my %riduedate;
my %riborrowernumber;
foreach ($query->param) {
    (next) unless (/ri-(\d*)/);
    my $counter=$1;
    (next) if ($counter>20);
    my $barcode=$query->param("ri-$counter");
    my $duedate=$query->param("dd-$counter");
    my $borrowernumber=$query->param("bn-$counter");
    $counter++;
    # decode cuecat
    $barcode = cuecatbarcodedecode($barcode);
    $returneditems{$counter}=$barcode;
    $riduedate{$counter}=$duedate;
    $riborrowernumber{$counter}=$borrowernumber;
    $ritext.="<input type=hidden name=ri-$counter value=$barcode>\n";
    $ritext.="<input type=hidden name=dd-$counter value=$duedate>\n";
    $ritext.="<input type=hidden name=bn-$counter value=$borrowernumber>\n";
}

# Collect a few messages here...
my $messagetext='';
my $reservetext='';

############
# Deal with the requests....
if ($query->param('resbarcode')) {
    my $item = $query->param('itemnumber');
    my $borrnum = $query->param('borrowernumber');
    my $resbarcode = $query->param('resbarcode');
    my $tobranchcd = ReserveWaiting($item, $borrnum);
    my $branchname = $branches->{$tobranchcd}->{'branchname'};
    my ($borr) = getpatroninformation(\%env, $borrnum, 0);
    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
    my $slip = $query->param('resslip');
    printslip(\%env, $slip);
    if ($tobranchcd ne $branch) {
	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
	$reservetext .= <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
    Item: $iteminfo->{'title'} ($iteminfo->{'author'})<br>
 needs to be transfered to <b>$branchname</b> <br>
to be picked up by $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
    }
}


my $iteminformation;
my $borrower;
my $returned = 0;
my $messages;
my $barcode = $query->param('barcode');
# actually return book and prepare item table.....
if ($barcode) {
    # decode cuecat
    $barcode = cuecatbarcodedecode($barcode);
    ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
    $returneditems{0} = $barcode;
    $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
    if ($returned) {
	$riborrowernumber{0} = $borrower->{'borrowernumber'};
	$riduedate{0} = $iteminformation->{'date_due'};
	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
    } else {
	$riborrowernumber{0} = 0;
	$riduedate{0} = 0;
	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
    }
}

##################################################################################
# HTML code....
# title....
my $title = <<"EOF";
<FONT SIZE=6><em>Circulation: Returns</em></FONT><br>
<b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
<b>Printer:</b> $printers->{$printer}->{'printername'}<br>
<a href=selectbranchprinter.pl>Change Settings</a>
<input type=hidden name=branch value=$branch>
<input type=hidden name=printer value=$printer>
<p>
EOF

my $links = <<"EOF";
<table align="right"><tr><td>
<a href=circulation.pl>
<img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
&nbsp<a href=branchtransfers.pl>
<img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
</td></tr></table>
EOF


my $itemtable;
if ($iteminformation) {
    $itemtable = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Item Information</font></th></tr>
<tr><td>
Title: $iteminformation->{'title'}<br>
<!--Hlt decided they dont want these showing, uncoment the html to make it work

Author: $iteminformation->{'author'}<br>
Barcode: <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
&type=intra onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a><br>
Date Due: $iteminformation->{'date_due'}-->
</td></tr>
</table>
EOF
}

# Barcode entry box, with hidden inputs attached....
my $barcodeentrytext = << "EOF";
<form method=post action=/cgi-bin/koha/circ/returns.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
<font color=black><b>Enter Book Barcode</b></font></td></tr>
<tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
</table>
$ritext
</form>
EOF


if ($messages->{'ResFound'}) {
    my $res = $messages->{'ResFound'};
    my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
    my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
    my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
    my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
    my ($iteminfo) = getiteminformation(\%env, 0, $barcode);

    if ($res->{'ResFound'} eq "Waiting") {
	$reservetext = <<"EOF";
<font color='red' size='+2'>Item marked Waiting:</font><br>
    Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
is marked waiting at <b>$branchname</b> for $name ($number).
<center><form method=post action='returns.pl'>
$ritext
<input type=hidden name=barcode value=0>
<input type=submit value="OK">
</form></center>
EOF
    } 
    if ($res->{'ResFound'} eq "Reserved") {
	my @da = localtime(time());
	my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
	my $slip =  <<"EOF";
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Date: $todaysdate;

ITEM RESERVED: 
$iteminfo->{'title'} ($iteminfo->{'author'})
barcode: $iteminfo->{'barcode'}
itemtype: $iteminfo->{'itemtype'} 

COLLECT AT: $branchname

BORROWER:
$borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
card number: $borr->{'cardnumber'}
Phone: $borr->{'phone'}
$borr->{'streetaddress'}
$borr->{'suburb'}
$borr->{'town'}
$borr->{'emailaddress'}

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

EOF

	$reservetext = <<"EOF";
<font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
for $name ($number) to be collected at <b>$branchname</b>.
<table cellpadding=5 cellspacing=0>
<tr><td valign="top">Change status to waiting and print 
<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
<td valign="top">
<form method=post action='returns.pl'>
$ritext
<input type=hidden name=itemnumber value=$res->{'itemnumber'}>
<input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
<input type=hidden name=resbarcode value=$barcode>
<input type=hidden name=resslip value="$slip">
<input type=submit value="Print">
</form>
</td></tr>
</table>
EOF
    }
}
my $reservefoundtext;
if ($reservetext) {
    $reservefoundtext = <<"EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
<tr><td> $reservetext </td></tr></table>
EOF
}

# collect the messages and put into message table....
foreach my $code (keys %$messages) {
    warn $code;
    if ($code eq 'BadBarcode'){
	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
    }
    if ($code eq 'NotIssued'){
	my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
	$messagetext .= "<font color='red' size='+2'> Item not on issue. </font> <br>";
    }
    if ($code eq 'WasLost'){
	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
    }
    if ($code eq 'wthdrawm'){
	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
    }
    if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
	if ($messages->{'IsPermanent'} ne $branch) {
	    $messagetext .= "<font color='red' size='+2'> Please return to $branches->{$messages->{'IsPermanent'}}->{'branchname'} </font> <br>";
	}
    }
}
$messagetext = substr($messagetext, 0, -4);

my $messagetable;
if ($messagetext) {
    $messagetable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
<tr><td> $messagetext </td></tr></table>
EOF
}


# patrontable ....
my $borrowertable;
my $flaginfotable;
if ($borrower) {
    $borrowertable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black><b>Borrower Information</b></font></td></tr>
<tr><td colspan=2>
<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} 
onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a>
$borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
</td></tr>
EOF
    my $flags = $borrower->{'flags'};
    my $flaginfotext='';
    my $color = '';
    foreach my $flag (sort keys %$flags) {
	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
	if ($flags->{$flag}->{'noissues'}) {
	    $flag = "<font color=red>$flag</font>";
	}
	if ($flag eq 'CHARGES') {
	    $flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
<a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
EOF
	} elsif ($flag eq 'WAITING') {
	    my $itemswaiting='';
	    my $items = $flags->{$flag}->{'itemlist'};
	    foreach my $item (@$items) {
		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
		$itemswaiting .= <<"EOF";
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
$iteminformation->{'title'} 
($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>
EOF
            }
            $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
	} elsif ($flag eq 'ODUES') {
	    my $itemsoverdue = '';
	    my $items = $flags->{$flag}->{'itemlist'};
            foreach my $item (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$items) {
		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
                $itemsoverdue .=  <<"EOF";
<font color=red>$item->{'date_due'}</font>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
$iteminformation->{'title'}
<br>
EOF
	    }
	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
        } else {
	    $flaginfotext.= <<"EOF";
<tr><td valign=top>$flag</td>
<td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
EOF
	}
    }
    if ($flaginfotext) {
	$borrowertable .= << "EOF";
<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
<b>Flags</b></td></tr>
$flaginfotext 
EOF
    }
    $borrowertable .= "</table>";
}

# the returned items.....
my $returneditemstable = << "EOF";
<table border=1 cellpadding=5 cellspacing=0>
<tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage>
<font color=black>Returned Items</font></th></tr>
<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr>
EOF

my $color='';
#set up so only the lat 8 returned items display (make for faster loading pages)
my $count=0;
foreach (sort {$a <=> $b} keys %returneditems) {
    if ($count < 8) {
	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
	my $barcode = $returneditems{$_};
	my $duedate = $riduedate{$_};
	my $overduetext;
	if ($duedate) {
	    my @tempdate = split ( /-/ , $duedate ) ;
            my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
            my @datearr = localtime(time());
            my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
	    $overduetext = "$duedatenz";
	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
        } else {
            $overduetext = "Not on loan.";
	}
        my $borrowernumber = $riborrowernumber{$_};
        my $borrowerinfo;
        if ($borrowernumber) {
	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
            my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
        } else {
	    $borrowerinfo = "Not on loan.";
	}
	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
	$returneditemstable .= << "EOF";
<tr><td bgcolor=$color>$overduetext</td>
<td bgcolor=$color align=center>
<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td>
<td bgcolor=$color>$iteminformation->{'title'}</td>
<td bgcolor=$color>$iteminformation->{'author'}</td>
<td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td>
<td bgcolor=$color>
$borrowerinfo</td></tr>
EOF
    } else {
	last;
    }
    $count++;
}
$returneditemstable .= "</table>\n";


# actually print the page!
print $query->header();
print startpage();
print startmenu('circulation');

print <<"EOF";
$links
$title
<table cellpadding=5 cellspacing=0 width=100%>
EOF

if ($reservefoundtext) {
    print <<"EOF";
<tr>
<td colspan=2>$reservefoundtext</td>
</tr>
<tr>
<td colspan=2>$messagetable</td>
</tr>

EOF
} else {
    print <<"EOF";
<tr>
<td valign=top align=left>$barcodeentrytext</td>
<td valign=top align=left>$messagetable</td>
</tr>
EOF
}
if ($returned) {
    print <<"EOF";
<tr>
<td valign=top align=left>$itemtable</td>
<td valign=top align=left>$borrowertable</td>
<tr>
EOF
}
if (%returneditems) {
    print "<tr><td colspan=2>$returneditemstable</td></tr>";
}

print "</table>";

print endmenu('circulation');
print endpage();

sub cuecatbarcodedecode {
    my ($barcode) = @_;
    chomp($barcode);
    my @fields = split(/\./,$barcode);
    my @results = map(decode($_), @fields[1..$#fields]);
    if ($#results == 2){
  	return $results[2];
    } else {
	return $barcode;
    } 
} 


--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI qw/:standard/;
use C4::Circulation::Circ2;
use C4::Output;
use C4::Print;
use DBI;


# this is a reorganisation of circulationold.pl 
# dividing it up into three scripts......
# this will be the first one that chooses branch and printer settings....

#general design stuff...
my $headerbackgroundcolor='#99cc33';
my $circbackgroundcolor='#ffffcc';
my $circbackgroundcolor='white';
my $linecolor1='#ffffcc';
my $linecolor2='white';
my $backgroundimage="/images/background-mem.gif";

# try to get the branch and printer settings from the http....
my %env;
my $query=new CGI;
my $branches=getbranches(\%env);
my $printers=getprinters(\%env);
my $branch=$query->param('branch');
my $printer=$query->param('printer');

($branch) || ($branch=$query->cookie('branch'));
($printer) || ($printer=$query->cookie('printer'));

# is you force a selection....
my $oldbranch = $branch;
my $oldprinter = $printer;

$branch='';
$printer='';


$env{'branchcode'}=$branch;
$env{'printer'}=$printer;
$env{'queue'}=$printer;

# set up select options....
my $branchcount=0;
my $printercount=0;
my $branchoptions;
my $printeroptions;
foreach (keys %$branches) {
    (next) unless ($_);
    (next) unless ($branches->{$_}->{'IS'});
    $branchcount++;
    my $selected='';
    ($selected='selected') if ($_ eq $oldbranch);
    $branchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
}
foreach (keys %$printers) {
    (next) unless ($_);
    $printercount++;
    my $selected='';
    ($selected='selected') if ($_ eq $oldprinter);
    $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n";
}

# if there is only one....

if ($printercount==1) {
    ($printer)=keys %$printers;
}
if ($branchcount==1) {
    ($branch)=keys %$branches;
}

# set up printer and branch selection forms....
my ($printerform, $branchform);
if ($printercount>1) {
    $printerform=<<"EOF";
<select name=printer> $printeroptions </select>
EOF
} else {
    my ($printer) = keys %$printers;
} 

if ($branchcount>1) {
    $branchform=<<"EOF";
<select name=branch> $branchoptions </select>
EOF
} else {
    my ($branch) = keys %$branches;
} 



#############################################################################################
# Start writing page....
# set header with cookie....

print $query->header();

print startpage();
print startmenu('circulation');

print << "EOF";
<FONT SIZE=6><em>Circulation: Select Printer and Branch Settings</em></FONT><br>

<center>
<form method=post action=/cgi-bin/koha/circ/circulation.pl>
<table border=1 cellpadding=5 cellspacing=0>
<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
<font color=black><b>Please Set Branch and Printer</b></font></td></tr>
<tr><td>
$branchform
</td>
<td>
$printerform
</td></tr>
</table>
<input type="hidden" name="setcookies" value=1>
<input type="submit" value="Submit" type="changesettings">
</form>
</center>

EOF


print endmenu('circulation');
print endpage();


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** branchtransfers.pl	14 Aug 2002 18:30:51 -0000	1.3.2.1
--- branchtransfers.pl	15 Aug 2002 00:46:26 -0000	1.3.2.2
***************
*** 25,31 ****
  use CGI;
  use C4::Circulation::Circ2;
- use C4::Search;
  use C4::Output;
  
  
  my %env;
--- 25,33 ----
  use CGI;
  use C4::Circulation::Circ2;
  use C4::Output;
+ use C4::Reserves2;
  
+ ###############################################
+ # constants
  
  my %env;
***************
*** 37,60 ****
  my $backgroundimage="/images/background-mem.gif";
  
  my $query=new CGI;
- my $branches=getbranches(\%env);
  
- my $tobranchcd=$query->param('tobranchcd');
- my $frbranchcd='';
  
! $env{'tobranchcd'}=$tobranchcd;
  
  
  my $tobranchoptions;
! foreach (keys %$branches) {
!         (next) unless ($_);
!         (next) if (/^TR$/);
!         my $selected='';
!         ($selected='selected') if ($_ eq $tobranchcd);
!         $tobranchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n";
  }
  
  # collect the stack of books already transfered so they can printed...
- my @messages;
  my %transfereditems;
  my $ritext = '';
--- 39,75 ----
  my $backgroundimage="/images/background-mem.gif";
  
+ my $branches = getbranches();
+ my $printers = getprinters(\%env);
+ 
+ 
+ ###############################################
+ #  Getting state
+ 
  my $query=new CGI;
  
  
! my $branch = $query->param("branch");
! my $printer = $query->param("printer");
  
  
+ ($branch) || ($branch=$query->cookie('branch')) ;
+ ($printer) || ($printer=$query->cookie('printer')) ;
+ 
+ my $request=$query->param('request');
+ 
+ 
+ my $tobranchcd=$query->param('tobranchcd');
+ my $frbranchcd='';
+ 
+ # set up the branchselect options....
  my $tobranchoptions;
! foreach my $br (keys %$branches) {
!     (next) unless $branches->{$br}->{'CU'};
!     my $selected='';
!     ($selected='selected') if ($br eq $tobranchcd);
!     $tobranchoptions.="<option value=$br $selected>$branches->{$br}->{'branchname'}\n";
  }
  
  # collect the stack of books already transfered so they can printed...
  my %transfereditems;
  my $ritext = '';
***************
*** 76,112 ****
      }
  
- #if the barcode has been entered action that and write a message and onto the top of the stack...
- my $iteminformation;
  
! my $todaysdate;
! if (my $barcode=$query->param('barcode')) {
!     my $iteminformation = getiteminformation(\%env,0, $barcode);
!     my $fail=0;
!     if (not $iteminformation) {
! 	$fail=1;
! 	@messages = ("There is no book with barcode: $barcode ", @messages);
!     }
!     $frbranchcd = $iteminformation->{'holdingbranch'};
!     %env->{'frbranchcd'} = $frbranchcd;
!     if ($frbranchcd eq $tobranchcd) {
! 	$fail=1;
! 	@messages = ("You can't transfer the book to the branch it is already at!", @messages);
!     }
! # should add some more tests ... like is the book already out, maybe it cant be moved....
!     if (not $fail) {
! 	my ($transfered, $message) = transferbook(\%env, $iteminformation, $barcode);
! 	if (not $transfered) {@messages = ($message, @messages);}
! 	else {
! 	    $ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! 	    $ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! 	    $ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! 	    $transfereditems{0}=$barcode;
! 	    $frbranchcds{0}=$frbranchcd;
! 	    $tobranchcds{0}=$tobranchcd;
! 	    @messages = ("Book: $barcode has been transfered", @messages);
! 	}
      }
  }
  
  my $entrytext= << "EOF";
  <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
--- 91,151 ----
      }
  
  
! # Collect a few messages here...
! my $messagetext='';
! 
! ############
! # Deal with the requests....
! if ($request eq "KillWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve(0, $item, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! my $ignoreRs = 0;
! if ($request eq "SetWaiting") {
!     my $item = $query->param('itemnumber');
!     my $borrnum = $query->param('borrowernumber');
!     $tobranchcd = ReserveWaiting($item, $borrnum);
!     $ignoreRs = 1;
!     $messagetext .= "Item should now be waiting at branch: $branches->{$tobranchcd}->{'branchname'}<br>";
! }
! if ($request eq 'KillReserved'){
!     my $biblio = $query->param('biblionumber');
!     my $borrnum = $query->param('borrowernumber');
!     CancelReserve($biblio, 0, $borrnum);
!     $messagetext .= "Reserve Cancelled<br>";
! }
! 
! 
! 
! 
! # Warnings etc that get displayed at top of next page....
! my $messages;
! # if the barcode has been entered action that and write a message 
! # and put onto the top of the stack...
! my $iteminformation;
! my $barcode = $query->param('barcode');
! if ($barcode) {
!     my $transfered;
!     my $iteminformation;
!     ($transfered, $messages, $iteminformation) 
!                    = transferbook($tobranchcd, $barcode, $ignoreRs);
!     if ($transfered) {
! 	my $frbranchcd = $iteminformation->{'holdingbranch'};
! 	$ritext.="<input type=hidden name=bc-0 value=$barcode>\n";
! 	$ritext.="<input type=hidden name=fb-0 value=$frbranchcd>\n";
! 	$ritext.="<input type=hidden name=tb-0 value=$tobranchcd>\n";
! 	$transfereditems{0}=$barcode;
! 	$frbranchcds{0}=$frbranchcd;
! 	$tobranchcds{0}=$tobranchcd;
      }
  }
  
+ 
+ #################################################################################
+ # Html code....
+ # collect together the various elements...
+ 
  my $entrytext= << "EOF";
  <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
***************
*** 129,160 ****
  EOF
  
! my $messagetable;
! if (@messages) {
!     my $messagetext='';
!     foreach (@messages) {
! 	$messagetext.="$_<p>\n";
      }
      $messagetable = << "EOF";
! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Messages</font></th></tr>
  <tr><td> $messagetext </td></tr></table>
  EOF
  }
  
! 
  
  print $query->header;
  print startpage;
! print startmenu('circulation');
! print "<FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>";
! 
! 
! print $messagetable if (@messages);
  
  
! print $entrytext;
  
! if (%transfereditems) {
!     print << "EOF"; 
  <p>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>                                                                
--- 168,336 ----
  EOF
  
! 
! 
! #####################
! 
! my $reservefoundtext;
! if ($messages->{'ResFound'}) {
!     my $res = $messages->{'ResFound'};
!     my $reservetext;
!     my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!     my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
!     my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
!     my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
!     if ($res->{'ResFound'} eq "Waiting") {
! 	$reservetext = <<"EOF";
! <font color='red' size='+2'>Item marked Waiting:</font><br>
!     Item is marked waiting at $branchname for $name ($number).<br>
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillWaiting'>
! <input type=submit value="Cancel">
! </form>
! </td></tr>
! <tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
!     } 
!     if ($res->{'ResFound'} eq "Reserved") {
! 	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserved:</font> reserve found for $name ($number).
! <table border=1 cellpadding=5 cellspacing=0>
! <tr><td>Set reserve to waiting and transfer book to <b>$branchname </b>: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=itemnumber value=$res->{'itemnumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='SetWaiting'>
! <input type=submit value="Waiting">
! </form>
! </td></tr>
! <tr><td>Cancel reservation and then attempt transfer: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! $ritext
! <input type=hidden name=biblionumber value=$res->{'biblionumber'}>
! <input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=$barcode>
! <input type=hidden name=request value='KillReserved'>
! <input type=submit value="Cancel">
! </form>
! </td></tr><tr><td>Ignore and return to transfers: </td>
! <td>
! <form method=post action='branchtransfers.pl'>
! <input type=hidden name=tobranchcd value=$tobranchcd>
! <input type=hidden name=barcode value=0>
! $ritext
! <input type=submit value="Ignore">
! </form>
! </td></tr></table>
! EOF
      }
+     $reservefoundtext = <<"EOF";
+ <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
+ <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Reserve Found</font></th></tr>
+ <tr><td> $reservetext </td></tr></table>
+ EOF
+ }
+ 
+ #####################
+ 
+ foreach my $code (keys %$messages) {
+     if ($code eq 'BadBarcode'){
+ 	$messagetext .= "<font color='red' size='+2'> No Item with barcode: $messages->{'BadBarcode'} </font> <br>";
+     }
+     if ($code eq 'IsPermanent'){
+ 	my $braname = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
+ 	$messagetext .= "<font color='red' size='+2'> Please return item to home branch: $braname  </font> <br>";
+     }
+     if ($code eq 'DestinationEqualsHolding'){
+ 	$messagetext .= "<font color='red' size='+2'> Item is already at destination branch. </font> <br>";
+     }
+     if ($code eq 'WasReturned') {
+ 	my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
+ 
+ 	my $binfo = <<"EOF";
+ <a href=/cgi-bin/koha/moremember.pl?bornum=$borrowerinfo->{'borrowernumber'} 
+ onClick="openWindow(this,'Member', 480, 640)">$borrowerinfo->{'cardnumber'}</a>
+ $borrowerinfo->{'surname'}, $borrowerinfo->{'title'} $borrowerinfo->{'firstname'}
+ EOF
+ 	$messagetext .= "Item was on loan to $binfo and has been returned. <br>";
+     }
+     if ($code eq 'WasTransfered'){
+ # Put code here if you want to notify the user that item was transfered...
+     }
+ }
+ $messagetext = substr($messagetext, 0, -4);
+ 
+ my $messagetable;
+ if ($messagetext) {
      $messagetable = << "EOF";
! <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font>Messages</font></th></tr>
  <tr><td> $messagetext </td></tr></table>
+ <img src="/images/holder.gif" width=24 height=24>
  EOF
  }
  
! #######################################################################################
! # Make the page .....
  
  print $query->header;
  print startpage;
! #print startmenu('circulation');
! my @inp=startmenu('circulation');
! my $count=@inp;
! for (my $i=0;$i<$count;$i++){
!         $inp[$i]=~ s/document.forms\[0\].elements\[0\]/document\.forms\[0\]\.elements\[1\]/;
!     }
! print @inp;
  
+ #foreach my $key (%$messages) {
+ #    print $key." : ".$messages->{$key}."<br>";
+ #}
+ 
+ print <<"EOF";
+ <table align=right><tr><td>
+ <a href=circulation.pl>
+ <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Next Borrower"></a> &nbsp
+ <a href=returns.pl>
+ <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
+ </td></tr></table>
+ 
+ <FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>
+ <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
+ <b>Printer:</b> $printers->{$printer}->{'printername'}<br>
+ <a href=selectbranchprinter.pl>Change Settings</a>
+ <input type=hidden name=branch value=$branch>
+ <input type=hidden name=printer value=$printer>
+ <p>           
+ EOF
  
! if ($reservefoundtext) {
!     print $reservefoundtext;
! } else {
!     print $messagetable;
!     print $entrytext;
  
!     if (%transfereditems) {
! 	print << "EOF";
  <p>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>                                                                
***************
*** 162,173 ****
  <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  EOF
!     my $color='';
!     foreach (keys %transfereditems) {
! 	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 	my $barcode=$transfereditems{$_};
! 	my $frbcd=$frbranchcds{$_};
! 	my $tobcd=$tobranchcds{$_};
! 	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! 	print << "EOF";
  <tr><td bgcolor=$color align=center>
  <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
--- 338,349 ----
  <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  EOF
!         my $color='';
! 	foreach (sort keys %transfereditems) {
! 	    ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 	    my $barcode=$transfereditems{$_};
! 	    my $frbcd=$frbranchcds{$_};
! 	    my $tobcd=$tobranchcds{$_};
! 	    my ($iteminformation) = getiteminformation(\%env, 0, $barcode);
! 	    print << "EOF";
  <tr><td bgcolor=$color align=center>
  <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}
***************
*** 180,188 ****
  </tr>\n
  EOF
! }
!     print "</table>\n";
  }
  
  print endmenu('circulation');
  print endpage;
  
--- 356,366 ----
  </tr>\n
  EOF
!         }
! 	print "</table>\n";
!     }
  }
  
  print endmenu('circulation');
  print endpage;
+ 
  

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -r1.23.2.3 -r1.23.2.4
*** circulation.pl	14 Aug 2002 18:30:51 -0000	1.23.2.3
--- circulation.pl	15 Aug 2002 00:46:26 -0000	1.23.2.4
***************
*** 1,4 ****
--- 1,7 ----
  #!/usr/bin/perl
  
+ #written 8/5/2002 by Finlay
+ #script to execute issuing of books
+ 
  
  # Copyright 2000-2002 Katipo Communications
***************
*** 19,24 ****
[...1514 lines suppressed...]
+     foreach (sort keys %$borrowerissues) {
+ 	$issues[$i]=$borrowerissues->{$_};
+ 	my $dd=$issues[$i]->{'date_due'};
+ 	#convert to nz style dates
+ 	#this should be set with some kinda config variable
+ 	my @tempdate=split(/-/,$dd);
+ 	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ 	$i++;
+     }
+     foreach (sort keys %$borroweriss2) {
+ 	$issues[$i]=$borroweriss2->{$_};
+ 	my $dd=$issues[$i]->{'date_due'};
+ 	#convert to nz style dates
+ 	#this should be set with some kinda config variable
+ 	my @tempdate=split(/-/,$dd);
+ 	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
+ 	$i++;
+     }
+     remoteprint($env,\@issues,$borrower);
  }




From rangi at users.sourceforge.net  Thu Aug 15 04:02:43 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 19:02:43 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.33,1.34
Message-ID: <E17f9yF-0001qE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv6628/C4

Modified Files:
	Search.pm 
Log Message:
Fix for last borrower for the moredetail.pl page
sCVS: 


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Search.pm	14 Aug 2002 18:12:51 -0000	1.33
--- Search.pm	15 Aug 2002 02:02:40 -0000	1.34
***************
*** 123,127 ****
      }
    }
!   if ($env->{itemcount}) {
      foreach my $data (@results){
        my ($counts) = itemcount2($env, $data->{'biblionumber'}, 'intra');
--- 123,127 ----
      }
    }
!   if ($env->{itemcount} eq '1') {
      foreach my $data (@results){
        my ($counts) = itemcount2($env, $data->{'biblionumber'}, 'intra');
***************
*** 337,340 ****
--- 337,341 ----
          $sth->finish;                                             
  	$data2->{'dewey'}=$dewey;
+ 	
  	$res2[$i]=$data2;
  #	$res2[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data2->{'copyrightdate'}\t$dewey";
***************
*** 561,565 ****
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	 }
! 	 
  
  	 $query.=" group by biblio.biblionumber";
--- 562,568 ----
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	 }
! 	 if ($search->{'date-before'} ne ''){
! 	    $query.= " and (copyrightdate like '%$search->{'date-before'}%')";
! 	   }
  
  	 $query.=" group by biblio.biblionumber";
***************
*** 608,611 ****
--- 611,617 ----
  	    $query.= " and (abstract like '%$search->{'abstract'}%')";
  	   }
+ 	   if ($search->{'date-before'} ne ''){
+ 	    $query.= " and (copyrightdate like '%$search->{'date-before'}%')";
+ 	   }
  	  } elsif ($search->{'class'} ne ''){
  	     $query="select * from biblioitems,biblio where biblio.biblionumber=biblioitems.biblionumber";
***************
*** 636,639 ****
--- 642,648 ----
  	  } elsif ($search->{'abstract'} ne ''){
  	    $query.= "Select * from biblio where abstract like '%$search->{'abstract'}%'";
+ 	  
+ 	  } elsif ($search->{'date-before'} ne ''){
+ 	    $query.= "Select * from biblio where copyrightdate like '%$search->{'date-before'}%'";
  	  }
            $query .=" group by biblio.biblionumber";	 
***************
*** 716,720 ****
  my $limit= $num+$offset;
  while (my $data=$sth->fetchrow_hashref){
!   my $query="select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'}";
    	    if ($search->{'class'} ne ''){
  	      my @temp=split(/\|/,$search->{'class'});
--- 725,729 ----
  my $limit= $num+$offset;
  while (my $data=$sth->fetchrow_hashref){
!   my $query="select dewey,subclass,publishercode from biblioitems where biblionumber=$data->{'biblionumber'}";
    	    if ($search->{'class'} ne ''){
  	      my @temp=split(/\|/,$search->{'class'});
***************
*** 735,739 ****
  	    $query.= " and (publishercode like '%$search->{'publisher'}%')";
  	    }
! #print STDERR "$query\n";
    my $sti=$dbh->prepare($query);
    $sti->execute;
--- 744,748 ----
  	    $query.= " and (publishercode like '%$search->{'publisher'}%')";
  	    }
! 
    my $sti=$dbh->prepare($query);
    $sti->execute;
***************
*** 741,751 ****
    my $subclass;
    my $true=0;
!   if (($dewey, $subclass) = $sti->fetchrow || $type eq 'subject'){
      $true=1;
    }
    $dewey=~s/\.*0*$//;
    ($dewey == 0) && ($dewey='');
    ($dewey) && ($dewey.=" $subclass");
    $data->{'dewey'}=$dewey;
    $sti->finish;
    if ($true == 1){
--- 750,767 ----
    my $subclass;
    my $true=0;
!   my $publishercode;
!   my $bibitemdata;
!   if ($bibitemdata = $sti->fetchrow_hashref() || $type eq 'subject'){
      $true=1;
+     $dewey=$bibitemdata->{'dewey'};
+     $subclass=$bibitemdata->{'subclass'};
+     $publishercode=$bibitemdata->{'publishercode'};
    }
+   print STDERR "$dewey $subclass $publishercode\n";
    $dewey=~s/\.*0*$//;
    ($dewey == 0) && ($dewey='');
    ($dewey) && ($dewey.=" $subclass");
    $data->{'dewey'}=$dewey;
+   $data->{'publishercode'}=$publishercode;
    $sti->finish;
    if ($true == 1){
***************
*** 968,972 ****
      $sth->execute;
      while (my $dat = $sth->fetchrow_hashref){
!         $data->{'subject'} .= " | $dat->{'subject'}";
      } # while
  
--- 984,988 ----
      $sth->execute;
      while (my $dat = $sth->fetchrow_hashref){
!         $data->{'subject'} .= " , $dat->{'subject'}";
      } # while
  
***************
*** 1086,1090 ****
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! order by date_due desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
--- 1102,1107 ----
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! and returndate is not NULL
! order by returndate desc,timestamp desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
***************
*** 1385,1389 ****
      $sth2->execute;         
      if (my $data2=$sth2->fetchrow_hashref){         
!        $counts{'notavailable'}++;         
      } else {         
         $counts{$data->{'branchname'}}++;
--- 1402,1406 ----
      $sth2->execute;         
      if (my $data2=$sth2->fetchrow_hashref){         
!        $counts{'not available'}++;         
      } else {         
         $counts{$data->{'branchname'}}++;




From rangi at users.sourceforge.net  Thu Aug 15 04:05:01 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Wed, 14 Aug 2002 19:05:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.7,1.18.2.8
Message-ID: <E17fA0T-00029t-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7951/C4

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
Fix for itemissues, fetching the right dates for last borrowers for use on
the moredetail.pl page


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -C2 -r1.18.2.7 -r1.18.2.8
*** Search.pm	14 Aug 2002 18:30:50 -0000	1.18.2.7
--- Search.pm	15 Aug 2002 02:04:59 -0000	1.18.2.8
***************
*** 1120,1124 ****
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! order by date_due desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;
--- 1120,1125 ----
  where itemnumber = '$data->{'itemnumber'}'
  and issues.borrowernumber = borrowers.borrowernumber 
! and returndate is not NULL
! order by returndate desc, timestamp desc";
          $sth2 = $dbh->prepare($query2)
            || die $dbh->errstr;




From finlayt at users.sourceforge.net  Thu Aug 15 05:13:46 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:13:46 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.37,1.38
Message-ID: <E17fB50-0003gH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv13754/circ

Modified Files:
	circulation.pl 
Log Message:

changed the color to red and size to +2 for the Issuing Question....


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.pl	14 Aug 2002 18:12:53 -0000	1.37
--- circulation.pl	15 Aug 2002 03:13:44 -0000	1.38
***************
*** 246,250 ****
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
! <font color=black><b>Issuing Question</b></font></th></tr>
  <tr><td><table border=0 cellpadding=10><tr><td> 
  Attempting to issue $iteminformation->{'title'} 
--- 246,250 ----
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
! <font size=+2 color=red><b>Issuing Question</b></font></th></tr>
  <tr><td><table border=0 cellpadding=10><tr><td> 
  Attempting to issue $iteminformation->{'title'} 




From finlayt at users.sourceforge.net  Thu Aug 15 05:27:30 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:27:30 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.32,1.33
Message-ID: <E17fBII-0005ES-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19837/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

Added some red color here into the message that appears when a waiting book is attempted to be issued.


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Circ2.pm	14 Aug 2002 18:12:52 -0000	1.32
--- Circ2.pm	15 Aug 2002 03:27:28 -0000	1.33
***************
*** 328,335 ****
  	my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date);
  	if ($amount > 5 && $patroninformation->{'categorycode'} ne 'L' &&
!                          $patroninformation->{'categorycode'} ne 'W' &&
!                          $patroninformation->{'categorycode'} ne 'I' && 
!                          $patroninformation->{'categorycode'} ne 'B' &&
!                          $patroninformation->{'categorycode'} ne 'P') {
  	    $rejected = sprintf "Patron owes \$%.02f.", $amount;
  	    last SWITCH;
--- 328,335 ----
  	my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date);
  	if ($amount > 5 && $patroninformation->{'categorycode'} ne 'L' &&
!                            $patroninformation->{'categorycode'} ne 'W' &&
!                            $patroninformation->{'categorycode'} ne 'I' && 
!                            $patroninformation->{'categorycode'} ne 'B' &&
!                            $patroninformation->{'categorycode'} ne 'P') {
  	    $rejected = sprintf "Patron owes \$%.02f.", $amount;
  	    last SWITCH;
***************
*** 408,412 ****
  		if ($responses->{2} eq '') {
  		    $questionnumber=2;
! 		    $question="Waiting for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) at $branchname \nAllow issue?";
  		    $defaultanswer='N';
  		    last SWITCH;
--- 408,412 ----
  		if ($responses->{2} eq '') {
  		    $questionnumber=2;
! 		    $question="<font color=red>Waiting</font> for $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}) at $branchname \nAllow issue?";
  		    $defaultanswer='N';
  		    last SWITCH;




From finlayt at users.sourceforge.net  Thu Aug 15 05:31:04 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 14 Aug 2002 20:31:04 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.13,1.14
Message-ID: <E17fBLk-0005ds-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv21129/C4

Modified Files:
	Reserves2.pm 
Log Message:

Fixed a really terrible bug! Took out the fixpriorities call in FillReserve. This is not necesary because the priorities are fixed up when the item is set to waiting in ReserveWaiting.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Reserves2.pm	14 Aug 2002 18:12:51 -0000	1.13
--- Reserves2.pm	15 Aug 2002 03:31:02 -0000	1.14
***************
*** 66,70 ****
    }
    $query.=" order by priority";
-   warn $query;
    my $sth=$dbh->prepare($query);
    $sth->execute;
--- 66,69 ----
***************
*** 124,133 ****
  	    }
  	}
- 	warn "highest = $highest";
  	$highest->{'itemnumber'} = $item;
- 	foreach my $key (keys %$highest) {
- 	    warn "$key : $highest->{$key}\n";
- 	}
- 
  	return ("Reserved", $highest);
      } else {
--- 123,127 ----
***************
*** 203,208 ****
      $sth->finish;
      $dbh->disconnect;
- # now fix the priority on the others....
-     fixpriority($res->{'priority'}, $biblio);
  }
  
--- 197,200 ----
***************
*** 337,341 ****
      my $nextacctno = &getnextacctno($env,$borrnum,$dbh);   
      my $updquery = "insert into accountlines       
!     (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)                                              
  						          values
      ($borrnum,$nextacctno,now(),$fee,'Reserve Charge - $title','Res',$fee)";          
--- 329,333 ----
      my $nextacctno = &getnextacctno($env,$borrnum,$dbh);   
      my $updquery = "insert into accountlines       
!     (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
  						          values
      ($borrnum,$nextacctno,now(),$fee,'Reserve Charge - $title','Res',$fee)";          




From finlayt at users.sourceforge.net  Fri Aug 16 00:26:36 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 15 Aug 2002 15:26:36 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.13,1.14
Message-ID: <E17fT4e-0004vP-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv18824/circ

Modified Files:
	returns.pl 
Log Message:

Changed the wording of the reserves print slip slightly.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** returns.pl	14 Aug 2002 18:12:53 -0000	1.13
--- returns.pl	15 Aug 2002 22:26:34 -0000	1.14
***************
*** 230,234 ****
  
  BORROWER:
! $borr->{'title'} $borr->{'surname'}, $borr->{'firstname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}
--- 230,234 ----
  
  BORROWER:
! $borr->{'title'} $borr->{'firstname'} $borr->{'surname'}
  card number: $borr->{'cardnumber'}
  Phone: $borr->{'phone'}




From tonnesen at users.sourceforge.net  Fri Aug 16 22:42:34 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:42:34 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.21.2.5,1.21.2.6
Message-ID: <E17fnvW-0005ol-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv22304

Modified Files:
      Tag: rel-1-2
	Circ2.pm 
Log Message:
Added missing $accessflagshash chunk to getpatroninformation


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -C2 -r1.21.2.5 -r1.21.2.6
*** Circ2.pm	15 Aug 2002 00:46:26 -0000	1.21.2.5
--- Circ2.pm	16 Aug 2002 20:42:32 -0000	1.21.2.6
***************
*** 138,141 ****
--- 138,150 ----
      my $borrower = $sth->fetchrow_hashref;
      my $flags = patronflags($env, $borrower, $dbh);
+     my $accessflagshash;
+ 
+     $sth=$dbh->prepare("select bit,flag from userflags");
+     $sth->execute;
+     while (my ($bit, $flag) = $sth->fetchrow) {
+ 	if ($flags & 2**$bit) {
+ 	    $accessflagshash->{$flag}=1;
+ 	}
+     }
      $sth->finish;
      $dbh->disconnect;




From tonnesen at users.sourceforge.net  Fri Aug 16 22:44:44 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:44:44 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.23.2.4,1.23.2.5 returns.pl,1.13.2.1,1.13.2.2
Message-ID: <E17fnxc-000616-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv23048

Modified Files:
      Tag: rel-1-2
	circulation.pl returns.pl 
Log Message:
Fixed '_' character between issues, returns, and transfers buttons.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -C2 -r1.23.2.4 -r1.23.2.5
*** circulation.pl	15 Aug 2002 00:46:26 -0000	1.23.2.4
--- circulation.pl	16 Aug 2002 20:44:42 -0000	1.23.2.5
***************
*** 201,207 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 201,205 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
***************
*** 218,224 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 216,220 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** returns.pl	15 Aug 2002 00:46:26 -0000	1.13.2.1
--- returns.pl	16 Aug 2002 20:44:42 -0000	1.13.2.2
***************
*** 157,162 ****
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF
--- 157,161 ----
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF




From tonnesen at users.sourceforge.net  Fri Aug 16 22:46:42 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:46:42 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.14,1.15 circulation.pl,1.38,1.39
Message-ID: <E17fnzW-00069u-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv23614

Modified Files:
	returns.pl circulation.pl 
Log Message:
Removed '_' between issues, returns, and transfers graphics


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** returns.pl	15 Aug 2002 22:26:34 -0000	1.14
--- returns.pl	16 Aug 2002 20:46:40 -0000	1.15
***************
*** 157,162 ****
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF
--- 157,161 ----
  <a href=circulation.pl>
  <img src="/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Issues"></a>
  </td></tr></table>
  EOF

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** circulation.pl	15 Aug 2002 03:13:44 -0000	1.38
--- circulation.pl	16 Aug 2002 20:46:40 -0000	1.39
***************
*** 192,198 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 192,196 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
***************
*** 209,215 ****
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers">
! </a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
--- 207,211 ----
  <a href=returns.pl>
  <img src="/images/button-returns.gif" width="110" height="42" border="0" alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl><img src="/images/button-transfers.gif" width="127" height="42" border="0" alt="Transfers"></a>
  </td></tr></table>
  <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>




From tonnesen at users.sourceforge.net  Fri Aug 16 22:53:25 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 13:53:25 -0700
Subject: [Koha-cvs] CVS: koha buildrelease,1.1.2.19,1.1.2.20
Message-ID: <E17fo61-0006kK-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv25854

Modified Files:
      Tag: rel-1-2
	buildrelease 
Log Message:
Set all .pl scripts in intranet-cgi executable


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -C2 -r1.1.2.19 -r1.1.2.20
*** buildrelease	26 Jul 2002 13:46:50 -0000	1.1.2.19
--- buildrelease	16 Aug 2002 20:53:23 -0000	1.1.2.20
***************
*** 266,269 ****
--- 266,271 ----
  system("rm -rf $rootdir/intranet-cgi/t");
  
+ # Set all .pl scripts executable
+ system("find $rootdir/intranet-cgi -name '*.pl' -exec chmod a+x \\{\\} \\;"); 
  # Copy all CVS files to intranet-html and opac-html
  system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");




From tonnesen at users.sourceforge.net  Fri Aug 16 23:01:22 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 14:01:22 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.12,1.1.2.13
Message-ID: <E17foDi-0007UG-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28633

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
Added 'IS' and 'CU' flags for default MAIN branch.


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -r1.1.2.12 -r1.1.2.13
*** Install.pm	14 Aug 2002 18:30:50 -0000	1.1.2.12
--- Install.pm	16 Aug 2002 21:01:20 -0000	1.1.2.13
***************
*** 1123,1126 ****
--- 1123,1128 ----
  	    system("gzip -9 sampledata-1.2");
  	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
+ 	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
+ 	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  	    system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
  	    showmessage(getmessage('SampleDataInstalled'), 'PressEnter');




From tonnesen at users.sourceforge.net  Fri Aug 16 23:02:11 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 16 Aug 2002 14:02:11 -0700
Subject: [Koha-cvs] CVS: koha Install.pm,1.1.2.13,1.1.2.14
Message-ID: <E17foEV-0007Ze-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28934

Modified Files:
      Tag: rel-1-2
	Install.pm 
Log Message:
branchrelations fix needed to be done in two places...


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/Attic/Install.pm,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -r1.1.2.13 -r1.1.2.14
*** Install.pm	16 Aug 2002 21:01:20 -0000	1.1.2.13
--- Install.pm	16 Aug 2002 21:02:09 -0000	1.1.2.14
***************
*** 1147,1150 ****
--- 1147,1152 ----
  
  		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
+ 		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
+ 		system("$mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='Library Printer';




From rangi at users.sourceforge.net  Sat Aug 17 00:50:07 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Fri, 16 Aug 2002 15:50:07 -0700
Subject: [Koha-cvs] CVS: koha/C4 Print.pm,1.3.2.4,1.3.2.5
Message-ID: <E17fpux-0007AZ-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv27379/C4

Modified Files:
      Tag: rel-1-2
	Print.pm 
Log Message:
Merging across print.pm fixes bug 80
missing printslip routine


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** Print.pm	14 Aug 2002 18:30:50 -0000	1.3.2.4
--- Print.pm	16 Aug 2002 22:50:05 -0000	1.3.2.5
***************
*** 29,33 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve);
  
  sub remoteprint {
--- 29,34 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&remoteprint &printreserve &printslip);
! 
  
  sub remoteprint {
***************
*** 73,102 ****
  
  sub printreserve {
!   my($env,$resrec,$rbordata,$itemdata)=@_;
    my $file=time;
!   my $queue = $env->{'queue'};
!   #if ($queue eq "") {
      open (PRINTER,">/tmp/kohares");
!   #} else {
!   #  open (PRINTER, "| lpr -P $queue") or die "Couldn't write to queue:$!\n";
!   #}  
!   print PRINTER "Collect at $resrec->{'branchcode'}\r\n\r\n";
!   print PRINTER "$rbordata->{'surname'}; $rbordata->{'firstname'}\r\n";
!   print PRINTER "$rbordata->{'cardnumber'}\r\n";
!   print PRINTER "Phone: $rbordata->{'phone'}\r\n";
!   print PRINTER "$rbordata->{'streetaddress'}\r\n";
!   print PRINTER "$rbordata->{'suburb'}\r\n";
!   print PRINTER "$rbordata->{'town'}\r\n";   
!   print PRINTER "$rbordata->{'emailaddress'}\r\n\r\n";
!   print PRINTER "$itemdata->{'barcode'}\r\n";
!   print PRINTER "$itemdata->{'title'}\r\n";
!   print PRINTER "$itemdata->{'author'}";
!   print PRINTER "\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
!   if ($env->{'printtype'} eq "docket"){ 
!     #print chr(27).char(105);
!   }  
    close PRINTER;
-   #system("lpr /tmp/$file"); 
  }
  END { }       # module clean-up code here (global destructor)
    
--- 74,128 ----
  
  sub printreserve {
!   my($env, $branchname, $bordata, $itemdata)=@_;
    my $file=time;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
!     open (PRINTER,">>/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   my @da = localtime(time());
!   my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
! 
! #(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
!   my $slip = <<"EOF";
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Date: $todaysdate;
! 
! ITEM RESERVED: 
! $itemdata->{'title'} ($itemdata->{'author'})
! barcode: $itemdata->{'barcode'}
! 
! COLLECT AT: $branchname
! 
! BORROWER:
! $bordata->{'surname'}, $bordata->{'firstname'}
! card number: $bordata->{'cardnumber'}
! Phone: $bordata->{'phone'}
! $bordata->{'streetaddress'}
! $bordata->{'suburb'}
! $bordata->{'town'}
! $bordata->{'emailaddress'}
! 
! 
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! EOF
!     print PRINTER $slip;
!   close PRINTER;
!   return $slip;
! }
! 
! sub printslip {
!   my($env, $slip)=@_;
!   my $printer = $env->{'printer'};
!   if ($printer eq "" || $printer eq 'nulllp') {
      open (PRINTER,">/tmp/kohares");
!   } else {
!     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
!   }
!   print PRINTER $slip;
    close PRINTER;
  }
+ 
  END { }       # module clean-up code here (global destructor)
    




From finlayt at users.sourceforge.net  Mon Aug 19 07:37:17 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 22:37:17 -0700
Subject: [Koha-cvs] CVS: koha detail.pl,1.10,1.11
Message-ID: <E17gfE5-0005KW-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20254

Modified Files:
	detail.pl 
Log Message:

added a Boolean: $norequests whhich is set on the template detail.tmpl so that the "requests" button only apears if it is actually possible to make a request. This is set by checking against the "notforloan" field on the itemtypes table.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** detail.pl	14 Aug 2002 18:12:51 -0000	1.10
--- detail.pl	19 Aug 2002 05:37:15 -0000	1.11
***************
*** 46,57 ****
     $value=~s/\s*$//g;
     $configfile{$variable}=$value;
-  }
  }
  
  my $biblionumber=$query->param('bib');
  my $type='intra';
  
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
  my $dat=bibdata($biblionumber);
  my ($authorcount, $addauthor)= &addauthor($biblionumber);
--- 46,67 ----
     $value=~s/\s*$//g;
     $configfile{$variable}=$value;
  }
+ }	
  
  my $biblionumber=$query->param('bib');
  my $type='intra';
  
+ 
  # change back when ive fixed request.pl
  my @items = ItemInfo(undef, $biblionumber, $type);
+ my $norequests = 1;
+ foreach my $itm (@items) {
+      $norequests = 0 unless $itm->{'notforloan'};
+ }
+ 
+ warn "Biblionumber: $biblionumber";
+ warn "Norequests: $norequests"; 
+ 
+ 
  my $dat=bibdata($biblionumber);
  my ($authorcount, $addauthor)= &addauthor($biblionumber);
***************
*** 101,104 ****
--- 111,115 ----
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
+ $template->param(norequests => $norequests);
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray);




From finlayt at users.sourceforge.net  Mon Aug 19 07:39:03 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 22:39:03 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue detail.tmpl,1.4.4.3,1.4.4.4
Message-ID: <E17gfFn-0005Pq-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv20654

Modified Files:
      Tag: rel-1-2
	detail.tmpl 
Log Message:

Added an if loop to check the "norequests" variable so as to decide whether to put the Requests button. See detail.pl



Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/detail.tmpl,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -C2 -r1.4.4.3 -r1.4.4.4
*** detail.tmpl	31 Jul 2002 04:59:13 -0000	1.4.4.3
--- detail.tmpl	19 Aug 2002 05:39:01 -0000	1.4.4.4
***************
*** 1,4 ****
  <TMPL_INCLUDE NAME="cat-top.inc">
- <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <TMPL_IF NAME="loggedinuser">
--- 1,3 ----
***************
*** 9,15 ****
  
  
! 
  <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
  src="/images/requests.gif" align="right" border="0"></a>
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
  <TMPL_VAR NAME="class"></em></font><p>
--- 8,18 ----
  
  
! <TMPL_IF NAME="norequests">
! <TMPL_ELSE>
  <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
  src="/images/requests.gif" align="right" border="0"></a>
+ </TMPL_IF>
+ <TMPL_LOOP NAME="BIBLIO_RESULTS">
+ 
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
  <TMPL_VAR NAME="class"></em></font><p>
***************
*** 20,23 ****
--- 23,29 ----
  <td bgcolor="#cccc99" background="/images/background-mem.gif">
  <b>BIBLIO RECORD</b>
+ 
+ 
+ 
  
  <TMPL_VAR NAME="biblionumber">




From rangi at users.sourceforge.net  Mon Aug 19 08:20:50 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 18 Aug 2002 23:20:50 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.8,1.18.2.9
Message-ID: <E17gfuE-0007bY-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv29203/C4

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
Fix for item search


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
diff -C2 -r1.18.2.8 -r1.18.2.9
*** Search.pm	15 Aug 2002 02:04:59 -0000	1.18.2.8
--- Search.pm	19 Aug 2002 06:20:48 -0000	1.18.2.9
***************
*** 106,112 ****
  #  }
    my ($count, at results);
! #  print STDERR "Doing a search \n";
    if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''){
!         print STDERR "Doing a precise search\n";
      ($count, at results)=CatSearch($env,'precise',$search,$num,$offset);
  
--- 106,112 ----
  #  }
    my ($count, at results);
! #  print STDERR "Doing a search $search->{'itemnumber'} $search->{'isbn'}\n";
    if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''){
! #        print STDERR "Doing a precise search $search->{'itemnumber'}\n";
      ($count, at results)=CatSearch($env,'precise',$search,$num,$offset);
  
***************
*** 663,669 ****
    if ($type eq 'precise'){
        
!       if ($search->{'item'} ne ''){
          $query="select * from items,biblio ";
!         my $search2=uc $search->{'item'};
          $query=$query." where 
          items.biblionumber=biblio.biblionumber 
--- 663,669 ----
    if ($type eq 'precise'){
        
!       if ($search->{'itemnumber'} ne ''){
          $query="select * from items,biblio ";
!         my $search2=uc $search->{'itemnumber'};
          $query=$query." where 
          items.biblionumber=biblio.biblionumber 
***************
*** 697,701 ****
        }
    }
! #print $query;
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){   
--- 697,701 ----
        }
    }
! #print STDERR $query;
  if ($type ne 'precise' && $type ne 'subject'){
    if ($search->{'author'} ne ''){   




From rangi at users.sourceforge.net  Mon Aug 19 08:21:45 2002
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 18 Aug 2002 23:21:45 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/catalogue index.html,1.6.4.1,1.6.4.2
Message-ID: <E17gfv7-0007fM-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv29454/intranet-html/catalogue

Modified Files:
      Tag: rel-1-2
	index.html 
Log Message:
Fix for item search


Index: index.html
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/catalogue/index.html,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -r1.6.4.1 -r1.6.4.2
*** index.html	11 Jul 2002 18:00:18 -0000	1.6.4.1
--- index.html	19 Aug 2002 06:21:43 -0000	1.6.4.2
***************
*** 17,21 ****
  
  <TR VALIGN=TOP>
! <TD>Item Number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="item"></td><td> <b> &nbsp; &nbsp; OR</b></TD></TR>
  <!-- <TR VALIGN=TOP>
  <TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
--- 17,21 ----
  
  <TR VALIGN=TOP>
! <TD>Item Number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td><td> <b> &nbsp; &nbsp; OR</b></TD></TR>
  <!-- <TR VALIGN=TOP>
  <TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>




From finlayt at users.sourceforge.net  Mon Aug 19 08:29:38 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:29:38 -0700
Subject: [Koha-cvs] CVS: koha detail.pl,1.11,1.12
Message-ID: <E17gg2k-00086A-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv30794

Modified Files:
	detail.pl 
Log Message:

fixed up the CheckReserves.pm routine so that it does not put Referece items into "waiting" status if there is a reserve. Also fixed a bug in detail.pl.


Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** detail.pl	19 Aug 2002 05:37:15 -0000	1.11
--- detail.pl	19 Aug 2002 06:29:36 -0000	1.12
***************
*** 60,63 ****
--- 60,64 ----
  }
  
+ 
  warn "Biblionumber: $biblionumber";
  warn "Norequests: $norequests"; 
***************
*** 70,73 ****
--- 71,75 ----
  
  $dat->{'count'}=@items;
+ $dat->{'norequests'} = $norequests;
  
  $dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 111,115 ****
  $template->param(BIBLIO_RESULTS => $resultsarray);
  $template->param(ITEM_RESULTS => $itemsarray);
- $template->param(norequests => $norequests);
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray);
--- 113,116 ----




From finlayt at users.sourceforge.net  Mon Aug 19 08:29:38 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:29:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.14,1.15
Message-ID: <E17gg2k-00086F-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv30794/C4

Modified Files:
	Reserves2.pm 
Log Message:

fixed up the CheckReserves.pm routine so that it does not put Referece items into "waiting" status if there is a reserve. Also fixed a bug in detail.pl.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Reserves2.pm	15 Aug 2002 03:31:02 -0000	1.14
--- Reserves2.pm	19 Aug 2002 06:29:36 -0000	1.15
***************
*** 103,111 ****
      my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("select biblionumber, biblioitemnumber from items where itemnumber=$qitem");
      $sth->execute;
!     my ($biblio, $bibitem) = $sth->fetchrow_array;
      $sth->finish;
      $dbh->disconnect;
  # get the reserves...
      my ($count, @reserves) = Findgroupreserve($bibitem, $biblio);
--- 103,118 ----
      my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
!                              FROM items, biblioitems, itemtypes 
!                             WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
!                               AND biblioitems.itemtype = itemtypes.itemtype
!                               AND itemnumber=$qitem");
      $sth->execute;
!     my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;
      $sth->finish;
      $dbh->disconnect;
+ # if item is not for loan it cannot be reserved either.....
+ warn "Not for loan: $notforloan";
+     return (0, 0) if ($notforloan);
  # get the reserves...
      my ($count, @reserves) = Findgroupreserve($bibitem, $biblio);




From finlayt at users.sourceforge.net  Mon Aug 19 08:30:28 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Sun, 18 Aug 2002 23:30:28 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue detail.tmpl,1.4.4.4,1.4.4.5
Message-ID: <E17gg3Y-0008BX-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv31392

Modified Files:
      Tag: rel-1-2
	detail.tmpl 
Log Message:

little bug fix



Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/detail.tmpl,v
retrieving revision 1.4.4.4
retrieving revision 1.4.4.5
diff -C2 -r1.4.4.4 -r1.4.4.5
*** detail.tmpl	19 Aug 2002 05:39:01 -0000	1.4.4.4
--- detail.tmpl	19 Aug 2002 06:30:26 -0000	1.4.4.5
***************
*** 1,3 ****
--- 1,4 ----
  <TMPL_INCLUDE NAME="cat-top.inc">
+ <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <TMPL_IF NAME="loggedinuser">
***************
*** 13,17 ****
  src="/images/requests.gif" align="right" border="0"></a>
  </TMPL_IF>
- <TMPL_LOOP NAME="BIBLIO_RESULTS">
  
  <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
--- 14,17 ----




From dragon28 at users.sourceforge.net  Mon Aug 19 09:44:03 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Mon, 19 Aug 2002 00:44:03 -0700
Subject: [Koha-cvs] CVS: koha-html/intranet-html/includes/templates/default/catalogue searchresults.tmpl,1.4.4.2,1.4.4.3
Message-ID: <E17ghCl-00041K-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv15416/koha-html/intranet-html/includes/templates/default/catalogue

Modified Files:
      Tag: rel-1-2
	searchresults.tmpl 
Log Message:
fix for prev and next icons

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha-html/intranet-html/includes/templates/default/catalogue/searchresults.tmpl,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -C2 -r1.4.4.2 -r1.4.4.3
*** searchresults.tmpl	25 Jul 2002 04:06:24 -0000	1.4.4.2
--- searchresults.tmpl	19 Aug 2002 07:44:01 -0000	1.4.4.3
***************
*** 29,33 ****
      <!-- Row of numbers corresponding to search result pages -->
      <TMPL_IF NAME=displayprev>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
--- 29,33 ----
      <!-- Row of numbers corresponding to search result pages -->
      <TMPL_IF NAME=displayprev>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
***************
*** 37,45 ****
  	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
  	<TMPL_ELSE>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
  	</TMPL_IF>
      </TMPL_LOOP>
      <TMPL_IF NAME=displaynext>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_VAR NAME=FORMELEMENTS>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
--- 37,45 ----
  	    <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
  	<TMPL_ELSE>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
  	</TMPL_IF>
      </TMPL_LOOP>
      <TMPL_IF NAME=displaynext>
! 	<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/next.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>




From dragon28 at users.sourceforge.net  Tue Aug 20 11:18:16 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:18:16 -0700
Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.1.2.4,1.1.2.5
Message-ID: <E17h59U-0005Tl-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21038/koha/admin

Modified Files:
      Tag: rel-1-2
	branches.pl 
Log Message:
fixed image alt tag

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** branches.pl	25 Jun 2002 09:22:43 -0000	1.1.2.4
--- branches.pl	20 Aug 2002 09:18:13 -0000	1.1.2.5
***************
*** 274,278 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 274,278 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add branch\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:26:12 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:26:12 -0700
Subject: [Koha-cvs] CVS: koha/admin currency.pl,1.1.2.2,1.1.2.3
Message-ID: <E17h5HA-00060Z-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23072/koha/admin

Modified Files:
      Tag: rel-1-2
	currency.pl 
Log Message:
fixed image alt tag

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** currency.pl	24 Jun 2002 18:38:36 -0000	1.1.2.2
--- currency.pl	20 Aug 2002 09:26:10 -0000	1.1.2.3
***************
*** 248,252 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 248,252 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add currency\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:28:28 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:28:28 -0700
Subject: [Koha-cvs] CVS: koha/admin printers.pl,1.1.2.3,1.1.2.4
Message-ID: <E17h5JM-000697-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv23603/koha/admin

Modified Files:
      Tag: rel-1-2
	printers.pl 
Log Message:
fixed image alt tag

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** printers.pl	25 Jun 2002 11:00:49 -0000	1.1.2.3
--- printers.pl	20 Aug 2002 09:28:26 -0000	1.1.2.4
***************
*** 239,243 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 239,243 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add printer\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:30:27 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:30:27 -0700
Subject: [Koha-cvs] CVS: koha/admin stopwords.pl,1.1.2.3,1.1.2.4
Message-ID: <E17h5LH-0006HL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24112/koha/admin

Modified Files:
      Tag: rel-1-2
	stopwords.pl 
Log Message:
fixed image alt tag

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** stopwords.pl	25 Jun 2002 10:52:37 -0000	1.1.2.3
--- stopwords.pl	20 Aug 2002 09:30:25 -0000	1.1.2.4
***************
*** 228,232 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 228,232 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add stopword\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From dragon28 at users.sourceforge.net  Tue Aug 20 11:33:00 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Tue, 20 Aug 2002 02:33:00 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.1.2.2,1.1.2.3
Message-ID: <E17h5Nk-0006SS-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24792/koha/admin

Modified Files:
      Tag: rel-1-2
	systempreferences.pl 
Log Message:
fixed image alt tag

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** systempreferences.pl	24 Jun 2002 18:38:36 -0000	1.1.2.2
--- systempreferences.pl	20 Aug 2002 09:32:58 -0000	1.1.2.3
***************
*** 239,243 ****
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT
--- 239,243 ----
  		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
! 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add parameter\" BORDER=0 ></a><br>";
  	print "</form>";
  } #---- END $OP eq DEFAULT




From finlayt at users.sourceforge.net  Wed Aug 21 00:40:14 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 15:40:14 -0700
Subject: [Koha-cvs] CVS: koha/C4 Print.pm,1.8,1.9
Message-ID: <E17hHfa-0005uL-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv22265/C4

Modified Files:
	Print.pm 
Log Message:

removed the printreserve routine. It has been replaced by printslip.


Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Print.pm	14 Aug 2002 18:12:51 -0000	1.8
--- Print.pm	20 Aug 2002 22:40:12 -0000	1.9
***************
*** 72,114 ****
  }
  
- sub printreserve {
-   my($env, $branchname, $bordata, $itemdata)=@_;
-   my $file=time;
-   my $printer = $env->{'printer'};
-   if ($printer eq "" || $printer eq 'nulllp') {
-     open (PRINTER,">>/tmp/kohares");
-   } else {
-     open (PRINTER, "| lpr -P $printer") or die "Couldn't write to queue:$!\n";
-   }
-   my @da = localtime(time());
-   my $todaysdate = "$da[2]:$da[1]  $da[3]/$da[4]/$da[5]";
- 
- #(1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
-   my $slip = <<"EOF";
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Date: $todaysdate;
- 
- ITEM RESERVED: 
- $itemdata->{'title'} ($itemdata->{'author'})
- barcode: $itemdata->{'barcode'}
- 
- COLLECT AT: $branchname
- 
- BORROWER:
- $bordata->{'surname'}, $bordata->{'firstname'}
- card number: $bordata->{'cardnumber'}
- Phone: $bordata->{'phone'}
- $bordata->{'streetaddress'}
- $bordata->{'suburb'}
- $bordata->{'town'}
- $bordata->{'emailaddress'}
- 
- 
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- EOF
-     print PRINTER $slip;
-   close PRINTER;
-   return $slip;
- }
  
  sub printslip {
--- 72,75 ----




From finlayt at users.sourceforge.net  Wed Aug 21 03:31:20 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 18:31:20 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.15,1.16
Message-ID: <E17hKLA-00012J-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv3804/C4

Modified Files:
	Reserves2.pm 
Log Message:

Fixed a bug in the reordering priorities in FillReserve and andother different bug in CheckReserves.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Reserves2.pm	19 Aug 2002 06:29:36 -0000	1.15
--- Reserves2.pm	21 Aug 2002 01:31:16 -0000	1.16
***************
*** 99,103 ****
  sub CheckReserves {
      my ($item) = @_;
!     warn "In CheckReserves";
      my $dbh=C4Connect;
      my $qitem=$dbh->quote($item);
--- 99,103 ----
  sub CheckReserves {
      my ($item) = @_;
!     warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
      my $qitem=$dbh->quote($item);
***************
*** 113,117 ****
      $dbh->disconnect;
  # if item is not for loan it cannot be reserved either.....
- warn "Not for loan: $notforloan";
      return (0, 0) if ($notforloan);
  # get the reserves...
--- 113,116 ----
***************
*** 130,133 ****
--- 129,134 ----
  	    }
  	}
+     }
+     if ($highest) {
  	$highest->{'itemnumber'} = $item;
  	return ("Reserved", $highest);
***************
*** 159,163 ****
  	my $q_biblio = $dbh->quote($biblio);
  	$borr = $dbh->quote($borr);
! # fix up the priorities on the other records....
  	my $query = "SELECT priority FROM reserves 
                                      WHERE biblionumber   = $q_biblio 
--- 160,164 ----
  	my $q_biblio = $dbh->quote($biblio);
  	$borr = $dbh->quote($borr);
! # get the prioritiy on this record....
  	my $query = "SELECT priority FROM reserves 
                                      WHERE biblionumber   = $q_biblio 
***************
*** 190,197 ****
      my ($res) = @_;
      my $dbh=C4Connect;
! # removing a waiting reserve record....
      my $biblio = $res->{'biblionumber'}; my $qbiblio = $dbh->quote($biblio);
      my $borr = $res->{'borrowernumber'}; $borr = $dbh->quote($borr);
      my $resdate = $res->{'reservedate'}; $resdate = $dbh->quote($resdate);
  # update the database...
      my $query = "UPDATE reserves SET found            = 'F', 
--- 191,207 ----
      my ($res) = @_;
      my $dbh=C4Connect;
! # fillinf a reserve record....
      my $biblio = $res->{'biblionumber'}; my $qbiblio = $dbh->quote($biblio);
      my $borr = $res->{'borrowernumber'}; $borr = $dbh->quote($borr);
      my $resdate = $res->{'reservedate'}; $resdate = $dbh->quote($resdate);
+ # get the prioritiy on this record....
+     my $query = "SELECT priority FROM reserves 
+                                 WHERE biblionumber   = $qbiblio 
+                                   AND borrowernumber = $borr
+                                   AND reservedate    = $resdate)";
+     my $sth=$dbh->prepare($query);
+     $sth->execute;
+     my ($priority) = $sth->fetchrow_array;
+     $sth->finish;
  # update the database...
      my $query = "UPDATE reserves SET found            = 'F', 
***************
*** 203,206 ****
--- 213,220 ----
      $sth->execute;
      $sth->finish;
+ # now fix the priority on the others (if the priority wasnt already sorted!)....
+     unless ($priority == 0) {
+ 	fixpriority($priority, $biblio);
+     }
      $dbh->disconnect;
  }




From finlayt at users.sourceforge.net  Wed Aug 21 03:40:49 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 18:40:49 -0700
Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.39,1.40
Message-ID: <E17hKUL-0001VB-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv5667/circ

Modified Files:
	circulation.pl 
Log Message:

Fixed a little bug so that flags get recalculated after an item is issued.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** circulation.pl	16 Aug 2002 20:46:40 -0000	1.39
--- circulation.pl	21 Aug 2002 01:40:47 -0000	1.40
***************
*** 102,106 ****
  
  
! # get the currently issued books......
  my $borrower;
  my $flags;
--- 102,106 ----
  
  
! # get the borrower information.....
  my $borrower;
  my $flags;
***************
*** 121,125 ****
  
  
! # if the barcode is set
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
--- 121,125 ----
  
  
! 
  my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
  
***************
*** 128,132 ****
  my $day=$query->param('day');
  
! 
  if ($barcode) {
      $barcode = cuecatbarcodedecode($barcode);
--- 128,132 ----
  my $day=$query->param('day');
  
! # if the barcode is set
  if ($barcode) {
      $barcode = cuecatbarcodedecode($barcode);
***************
*** 140,143 ****
--- 140,148 ----
                       = issuebook(\%env, $borrower, $barcode, \%responses, $date);
      }
+ }
+ 
+ # reload the borrower info for the sake of reseting the flags.....
+ if ($borrowernumber) {
+     ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
  }
  




From finlayt at users.sourceforge.net  Wed Aug 21 04:42:56 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:42:56 -0700
Subject: [Koha-cvs] CVS: koha fixBranches.pl,NONE,1.1
Message-ID: <E17hLSS-0005AH-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv19714

Added Files:
	fixBranches.pl 
Log Message:

A little script for performing changes to the branch fields on items. This script runs over the database.


--- NEW FILE ---
#!/usr/bin/perl

# script to fix all the branch settings in the items table of the koha database.

use strict;
use DBI;
use C4::Database;

# This script makes the following substitutions.
# on homebranch field:
my $home_default = 'C';
my %home = ( 'F'  => 'FP' ,
	     'FM' => 'FP' ,
	     'M'  => 'C'  ,
	     'P'  => 'C'  ,
	     'S'  => 'SP' ,
	     'T'  => 'C'  ,
	     'TR' => 'C'  ,
	     'I'  => 'C'  ,
	     'D'  => 'C'  ,
	     'L'  => 'LP' ,
	     'FP' => 'FP' ,
	     'SP' => 'SP' ,
	     'LP' => 'LP' ,
	     'C'  => 'C' );

# on holdingbranch field:
my $hold_default = 'L';
my %hold = ( 'F'  => 'F' ,
	     'FM' => 'FM' ,
	     'M'  => 'M'  ,
	     'P'  => 'P'  ,
	     'S'  => 'S' ,
	     'T'  => 'T'  ,
	     'TR' => 'TR'  ,
	     'I'  => 'I'  ,
	     'D'  => 'D'  ,
	     'L'  => 'L' ,
	     'FP' => 'F' ,
	     'C'  => 'L' ,
	     'SP' => 'S' ,
	     'LP' => 'L' );


# do the substitutions.....
my $dbh = &C4Connect;           

my $sth = $dbh->prepare("SELECT barcode, holdingbranch, homebranch FROM items");
$sth->execute();

my $today = localtime(time());
print "Output from fixBranches.pl   $today \n\n";

while (my $item = $sth->fetchrow_hashref) {
    my $oldhold = $item->{'holdingbranch'};
    my $newhold = $hold{$oldhold} ? $hold{$oldhold} : $hold_default ;
    if ($oldhold ne $newhold) {
	my $uth = $dbh->prepare("UPDATE items SET holdingbranch = ? WHERE barcode = ?");
	$uth->execute($newhold, $item->{'barcode'});
	print "$item->{'barcode'} : Holding branch setting changed from $oldhold -> $newhold \n";
	$uth->finish;
    }
    my $oldhome = $item->{'homebranch'};
    my $newhome = $home{$oldhome} ? $home{$oldhome} : $home_default ;
    if ($oldhome ne $newhome) {
	my $uth = $dbh->prepare("UPDATE items SET homebranch = ? WHERE barcode = ?");
	$uth->execute($newhome, $item->{'barcode'});
	print "$item->{'barcode'} : Home branch setting changed from $oldhome -> $newhome \n";
	$uth->finish;
    }
}

print "\nFinished output from fixbranches.pl\n";

$dbh->disconnect;




From finlayt at users.sourceforge.net  Wed Aug 21 04:45:32 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:45:32 -0700
Subject: [Koha-cvs] CVS: koha placerequest.pl,1.2,1.3 request.pl,1.9,1.10
Message-ID: <E17hLUy-0005IV-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20314

Modified Files:
	placerequest.pl request.pl 
Log Message:

minor changes to comments etc....


Index: placerequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/placerequest.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** placerequest.pl	14 Aug 2002 18:12:51 -0000	1.2
--- placerequest.pl	21 Aug 2002 02:45:30 -0000	1.3
***************
*** 43,57 ****
  my $bornum=borrdata($borrower,'');
  if ($type eq 'str8' && $bornum ne ''){
! my $count=@bibitems;
! @bibitems=sort @bibitems;
! my $i2=1;
! my @realbi;
! $realbi[0]=$bibitems[0];
  for (my $i=1;$i<$count;$i++){
!   my $i3=$i2-1;
!   if ($realbi[$i3] ne $bibitems[$i]){
!     $realbi[$i2]=$bibitems[$i];
!     $i2++;
!   }
  }
  #print $input->dump;
--- 43,57 ----
  my $bornum=borrdata($borrower,'');
  if ($type eq 'str8' && $bornum ne ''){
!     my $count=@bibitems;
!     @bibitems=sort @bibitems;
!     my $i2=1;
!     my @realbi;
!     $realbi[0]=$bibitems[0];
  for (my $i=1;$i<$count;$i++){
!     my $i3=$i2-1;
!     if ($realbi[$i3] ne $bibitems[$i]){
! 	$realbi[$i2]=$bibitems[$i];
! 	$i2++;
!     }
  }
  #print $input->dump;

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** request.pl	14 Aug 2002 18:12:51 -0000	1.9
--- request.pl	21 Aug 2002 02:45:30 -0000	1.10
***************
*** 71,75 ****
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     if ($data[$i]->{'renewalsallowed'}){
  	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
  	if ($data[$i]->{'dewey'} == 0){
--- 71,75 ----
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     unless ($data[$i]->{'notforloan'}){
  	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
  	if ($data[$i]->{'dewey'} == 0){




From finlayt at users.sourceforge.net  Wed Aug 21 04:45:32 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 19:45:32 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.33,1.34
Message-ID: <E17hLUy-0005Ic-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv20314/C4/Circulation

Modified Files:
	Circ2.pm 
Log Message:

minor changes to comments etc....


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Circ2.pm	15 Aug 2002 03:27:28 -0000	1.33
--- Circ2.pm	21 Aug 2002 02:45:30 -0000	1.34
***************
*** 205,208 ****
--- 205,209 ----
  	my $itemtype=$sth->fetchrow_hashref;
  	$iteminformation->{'loanlength'}=$itemtype->{'loanlength'};
+ 	$iteminformation->{'notforloan'}=$itemtype->{'notforloan'};
  	$sth->finish;
      }
***************
*** 340,344 ****
  	}
  	if ($iteminformation->{'notforloan'} == 1) {
! 	    $rejected="Item not for loan.";
  	    last SWITCH;
  	}
--- 341,345 ----
  	}
  	if ($iteminformation->{'notforloan'} == 1) {
! 	    $rejected="Reference item: not for loan.";
  	    last SWITCH;
  	}
***************
*** 349,356 ****
  	if ($iteminformation->{'restricted'} == 1) {
  	    $rejected="Restricted item.";
- 	    last SWITCH;
- 	}
- 	if ($iteminformation->{'itemtype'} eq 'REF') {
- 	    $rejected="Reference item:  Not for loan.";
  	    last SWITCH;
  	}
--- 350,353 ----




From finlayt at users.sourceforge.net  Wed Aug 21 05:54:41 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 20:54:41 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.15,1.16
Message-ID: <E17hMZt-00013P-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv3858/circ

Modified Files:
	returns.pl 
Log Message:

Fixed up some of the messaging stuff.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** returns.pl	16 Aug 2002 20:46:40 -0000	1.15
--- returns.pl	21 Aug 2002 03:54:39 -0000	1.16
***************
*** 91,94 ****
--- 91,95 ----
      my $borrnum = $query->param('borrowernumber');
      my $resbarcode = $query->param('resbarcode');
+ # set to waiting....
      my $tobranchcd = ReserveWaiting($item, $borrnum);
      my $branchname = $branches->{$tobranchcd}->{'branchname'};
***************
*** 125,140 ****
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
-     $returneditems{0} = $barcode;
      $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
!     } else {
! 	$riborrowernumber{0} = 0;
  	$riduedate{0} = 0;
  	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
! 	$ritext.= "<input type=hidden name=bn-0 value=0>\n";
      }
  }
--- 126,147 ----
      $barcode = cuecatbarcodedecode($barcode);
      ($returned, $messages, $iteminformation, $borrower) = returnbook($barcode, $branch);
      $ritext.= "<input type=hidden name=ri-0 value=$barcode>\n";
      if ($returned) {
+ 	$returneditems{0} = $barcode;
  	$riborrowernumber{0} = $borrower->{'borrowernumber'};
  	$riduedate{0} = $iteminformation->{'date_due'};
  	$ritext.= "<input type=hidden name=dd-0 value=$iteminformation->{'date_due'}>\n";
  	$ritext.= "<input type=hidden name=bn-0 value=$borrower->{'borrowernumber'}>\n";
!     } elsif (! $messages->{'BadBarcode'}) {
! 	$returneditems{0} = $barcode;
  	$riduedate{0} = 0;
  	$ritext.= "<input type=hidden name=dd-0 value=0>\n";
! 	if ($messages->{'wthdrawn'}) {
! 	    $ritext.= "<input type=hidden name=bn-0 value='Item Cancelled'>\n";
! 	    $riborrowernumber{0} = 'Item Cancelled';
! 	} else {
! 	    $ritext.= "<input type=hidden name=bn-0 value='&nbsp;'>\n";
! 	    $riborrowernumber{0} = '&nbsp;';
! 	}
      }
  }
***************
*** 283,288 ****
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
!     if ($code eq 'wthdrawm'){
! 	$messagetext .= "<font color='red' size='+2'> Item Cancelled. </font> <br>";
      }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
--- 290,296 ----
  	$messagetext .= "<font color='red' size='+2'> Item was lost, now found. </font> <br>";
      }
!     if ($code eq 'wthdrawn'){
! 	$messagetext = "<font color='red' size='+2'> Item Cancelled. </font> <br>";
! 	last;
      }
      if (($code eq 'IsPermanent') && (not $messages->{'ResFound'})) {
***************
*** 394,397 ****
--- 402,406 ----
  	my $duedate = $riduedate{$_};
  	my $overduetext;
+         my $borrowerinfo;
  	if ($duedate) {
  	    my @tempdate = split ( /-/ , $duedate ) ;
***************
*** 402,415 ****
  	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
  	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
          } else {
!             $overduetext = "Not on loan.";
! 	}
!         my $borrowernumber = $riborrowernumber{$_};
!         my $borrowerinfo;
!         if ($borrowernumber) {
! 	    my ($borrower) = getpatroninformation(\%env,$borrowernumber,0);
!             my $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
!         } else {
! 	    $borrowerinfo = "Not on loan.";
  	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
--- 411,419 ----
  	    ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate);
  	    ($duedatenz) || ($overduetext = "<img src=/images/blackdot.gif>");
+ 	    my ($borrower) = getpatroninformation(\%env, $riborrowernumber{$_}, 0);
+             $borrowerinfo = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}";
          } else {
!             $overduetext = "Not on Issue.";
! 	    $borrowerinfo = $riborrowernumber{$_};
  	}
  	my ($iteminformation) = getiteminformation(\%env, 0, $barcode);;
***************
*** 437,443 ****
--- 441,456 ----
  print startmenu('circulation');
  
+ 
+ #debug
+ #    foreach my $key (keys %$messages) {
+ #	print "$key : $messages->{$key}<br>";
+ #    }
+ 
+ 
  print <<"EOF";
  $links
  $title
+ 
+ 
  <table cellpadding=5 cellspacing=0 width=100%>
  EOF




From finlayt at users.sourceforge.net  Wed Aug 21 06:29:06 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:29:06 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.16,1.17
Message-ID: <E17hN7C-0002li-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv10493/circ

Modified Files:
	returns.pl 
Log Message:

turned of the branchtransfer when an item is set to "waiting".



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** returns.pl	21 Aug 2002 03:54:39 -0000	1.16
--- returns.pl	21 Aug 2002 04:29:03 -0000	1.17
***************
*** 100,104 ****
      printslip(\%env, $slip);
      if ($tobranchcd ne $branch) {
! 	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
  	$reservetext .= <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>
--- 100,104 ----
      printslip(\%env, $slip);
      if ($tobranchcd ne $branch) {
! #	my ($transfered, $messages, $iteminfo) = transferbook($tobranchcd, $resbarcode, 1);
  	$reservetext .= <<"EOF";
  <font color='red' size='+2'>Item marked Waiting:</font><br>




From finlayt at users.sourceforge.net  Wed Aug 21 06:31:27 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:31:27 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.10,1.11
Message-ID: <E17hN9T-0002st-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv10938

Modified Files:
	request.pl 
Log Message:

Changed the display of lost, long overdue, reference, and cancelled items.



Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** request.pl	21 Aug 2002 02:45:30 -0000	1.10
--- request.pl	21 Aug 2002 04:31:25 -0000	1.11
***************
*** 71,88 ****
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     unless ($data[$i]->{'notforloan'}){
! 	my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
! 	if ($data[$i]->{'dewey'} == 0){
! 	    $data[$i]->{'dewey'}="";
! 	}
! 	$data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
! 	$data[$i]->{'dewey'}=~ s/\.0000$//;
! 	$data[$i]->{'dewey'}=~ s/00$//;
! 	my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
! 	$bibitemrows .= <<"EOF";
  <tr VALIGN=TOP>
! <TD><input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}>
! <input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>
! </td>
  <TD>$data[$i]->{'description'}</td>
  <TD>$class</td>
--- 71,97 ----
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
!     my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
! 	$data[$i]->{'dewey'}="";
!     }
!     $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
!     $data[$i]->{'dewey'}=~ s/\.0000$//;
!     $data[$i]->{'dewey'}=~ s/00$//;
!     my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
!     my $select;
!     if ($data[$i]->{'notforloan'}) {
! 	$select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
! 	$select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
! 	$select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
! 	$select = "Item Cancelled";
!     } else {
! 	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
!     }
!     $bibitemrows .= <<"EOF";
  <tr VALIGN=TOP>
! <TD>$select</td>
  <TD>$data[$i]->{'description'}</td>
  <TD>$class</td>
***************
*** 94,99 ****
  </tr>
  EOF
-     }
  }
  
  
--- 103,108 ----
  </tr>
  EOF
  }
+ 
  
  




From finlayt at users.sourceforge.net  Wed Aug 21 06:35:15 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Tue, 20 Aug 2002 21:35:15 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.17,1.18
Message-ID: <E17hND9-000339-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv11617/circ

Modified Files:
	returns.pl 
Log Message:

fixed bug caused by last commit



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** returns.pl	21 Aug 2002 04:29:03 -0000	1.17
--- returns.pl	21 Aug 2002 04:35:13 -0000	1.18
***************
*** 92,95 ****
--- 92,96 ----
      my $resbarcode = $query->param('resbarcode');
  # set to waiting....
+     my $iteminfo = getiteminformation(\%env, $item);
      my $tobranchcd = ReserveWaiting($item, $borrnum);
      my $branchname = $branches->{$tobranchcd}->{'branchname'};




From finlayt at users.sourceforge.net  Thu Aug 22 04:32:01 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 19:32:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.34,1.35
Message-ID: <E17hhlR-00025z-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv7872/C4

Modified Files:
	Search.pm 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items can be reserved.


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** Search.pm	15 Aug 2002 02:02:40 -0000	1.34
--- Search.pm	22 Aug 2002 02:31:58 -0000	1.35
***************
*** 1438,1457 ****
      my ($bibnum) = @_;
      my $dbh   = C4Connect;
!     my $query = "Select * from biblioitems, itemtypes, items
! where biblioitems.biblionumber = '$bibnum'
! and biblioitems.itemtype = itemtypes.itemtype
! and biblioitems.biblioitemnumber = items.biblioitemnumber
! group by items.biblioitemnumber";
      my $sth   = $dbh->prepare($query);
      my $count = 0;
      my @results;
! 
!     $sth->execute;
! 
      while (my $data = $sth->fetchrow_hashref) {
          $results[$count] = $data;
          $count++;
!     } # while
!     
      $sth->finish;
      $dbh->disconnect;
--- 1438,1455 ----
      my ($bibnum) = @_;
      my $dbh   = C4Connect;
!     my $query = "SELECT biblioitems.*, itemtypes.*, MIN(items.itemlost) as itemlost
!                           FROM biblioitems, itemtypes, items
!                          WHERE biblioitems.biblionumber     = ?
!                            AND biblioitems.itemtype         = itemtypes.itemtype
!                            AND biblioitems.biblioitemnumber = items.biblioitemnumber
!                       GROUP BY items.biblioitemnumber";
      my $sth   = $dbh->prepare($query);
      my $count = 0;
      my @results;
!     $sth->execute($bibnum);
      while (my $data = $sth->fetchrow_hashref) {
          $results[$count] = $data;
          $count++;
!     } # while    
      $sth->finish;
      $dbh->disconnect;
***************
*** 1459,1484 ****
  } # sub bibitems
  
- 
  sub barcodes{
!   #called from request.pl
!   my ($biblioitemnumber)=@_;
!   my $dbh=C4Connect;
!   my $query="Select barcode from items where
!    biblioitemnumber='$biblioitemnumber'
!    and ((itemlost <> 1 and itemlost <> 2) or itemlost is NULL) and
!    (wthdrawn <> 1 or wthdrawn is NULL)";
! 
!   my $sth=$dbh->prepare($query);
!   $sth->execute;
!   my @barcodes;
!   my $i=0;
!   while (my $data=$sth->fetchrow_hashref){
!     $barcodes[$i]=$data->{'barcode'};
!     $i++;
!   }
!   $sth->finish;
!   $dbh->disconnect;
!   return(@barcodes);
!   
  }
  
--- 1457,1478 ----
  } # sub bibitems
  
  sub barcodes{
!     #called from request.pl
!     my ($biblioitemnumber)=@_;
!     my $dbh=C4Connect;
!     my $query="SELECT barcode, itemlost FROM items
!                            WHERE biblioitemnumber = ?
!                              AND (wthdrawn <> 1 OR wthdrawn IS NULL)";
!     my $sth=$dbh->prepare($query);
!     $sth->execute($biblioitemnumber);
!     my @barcodes;
!     my $i=0;
!     while (my $data=$sth->fetchrow_hashref){
! 	$barcodes[$i]=$data;
! 	$i++;
!     }
!     $sth->finish;
!     $dbh->disconnect;
!     return(@barcodes);
  }
  




From finlayt at users.sourceforge.net  Thu Aug 22 04:32:01 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 19:32:01 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.11,1.12
Message-ID: <E17hhlR-000260-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv7872

Modified Files:
	request.pl 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items can be reserved.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** request.pl	21 Aug 2002 04:31:25 -0000	1.11
--- request.pl	22 Aug 2002 02:31:58 -0000	1.12
***************
*** 70,78 ****
  my ($count2, at data) = bibitems($bib);
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
! 	$data[$i]->{'dewey'}="";
      }
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 70,88 ----
  my ($count2, at data) = bibitems($bib);
  my $bibitemrows = "";
+ 
+ 
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     my $barcodestext = "";
!     foreach my $num (@barcodes) {
! 	my $message = $num->{'itemlost'} == 1 ? "(lost)" :
! 	    $num->{'itemlost'} == 2 ? "(long overdue)" : "";
! 	$barcodestext .= "$num->{'barcode'} $message <br>";
      }
+     $barcodestext = substr($barcodestext, 0, -4);
+ 
+     $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
+ 
+     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
***************
*** 80,91 ****
      my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if ($data[$i]->{'notforloan'}) {
! 	$select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
! 	$select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
! 	$select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
! 	$select = "Item Cancelled";
      } else {
  	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
--- 90,97 ----
      my $class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1)
! 	|| ($data[$i]->{'itemlost'} == 2))  {
! 	$select = "Cannot be reserved.";
      } else {
  	$select = " <input type=checkbox name=reqbib value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem value=$data[$i]->{'biblioitemnumber'}>";
***************
*** 97,104 ****
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
- <td>$data[$i]->{'isbn'}</td>
- <td>$dat->{'copyrightdate'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>@barcodes</td>
  </tr>
  EOF
--- 103,108 ----
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>$barcodestext</td>
  </tr>
  EOF
***************
*** 139,146 ****
  	$rank = "<select name=rank-request>$prioropt<option value=del>Del</select>";
  	$pickup = "<select name=pickup>$bropt</select>";
-         $change = "<select name=itemtype>
-                    <option value=next>Next Available
-                    <option value=change>Change Selection
-                    <option value=nc >No Change</select>";
      }
      $existingreserves .= <<"EOF";
--- 143,146 ----
***************
*** 156,160 ****
  <TD>$pickup</td>
  <TD>$type</td>
- <TD>$change</td>
  </tr>
  EOF
--- 156,159 ----
***************
*** 254,259 ****
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Classification</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Volume</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>ISBN</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copyright</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pubdate</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copies</b></TD>
--- 253,256 ----
***************
*** 284,288 ****
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pickup</b></TD>
  <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Request</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Change To</b></TD>
  </TR>
  $existingreserves
--- 281,284 ----




From finlayt at users.sourceforge.net  Thu Aug 22 05:06:35 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 20:06:35 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.5,1.6
Message-ID: <E17hiIt-0004fg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17818/admin

Modified Files:
	systempreferences.pl 
Log Message:

Fixed bug by cleaning out crud.


Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** systempreferences.pl	14 Aug 2002 18:12:53 -0000	1.5
--- systempreferences.pl	22 Aug 2002 03:06:33 -0000	1.6
***************
*** 220,226 ****
  	print mkheadr(2,'System preferences admin');
  	print mkformnotable("$script_name", at inputs);
! 	print <<printend
! printend
! 	;
  	if  ($searchfield ne '') {
  		print "You Searched for <b>$searchfield<b><p>";
--- 220,224 ----
  	print mkheadr(2,'System preferences admin');
  	print mkformnotable("$script_name", at inputs);
! 
  	if  ($searchfield ne '') {
  		print "You Searched for <b>$searchfield<b><p>";




From finlayt at users.sourceforge.net  Thu Aug 22 06:20:35 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 21:20:35 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.18,1.19
Message-ID: <E17hjSV-0000To-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv1672/circ

Modified Files:
	returns.pl 
Log Message:

added another link on the "Reserve Found" flag.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** returns.pl	21 Aug 2002 04:35:13 -0000	1.18
--- returns.pl	22 Aug 2002 04:20:33 -0000	1.19
***************
*** 250,254 ****
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
--- 250,254 ----
  
  	$reservetext = <<"EOF";
! <font color='red' size='+2'>Reserve found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <a href=/cgi-bin/koha/detail.pl?bib=$iteminfo->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a> <br>
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>




From finlayt at users.sourceforge.net  Thu Aug 22 06:45:09 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 21 Aug 2002 21:45:09 -0700
Subject: [Koha-cvs] CVS: koha request.pl,1.12,1.13
Message-ID: <E17hjqH-0001co-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv6110

Modified Files:
	request.pl 
Log Message:

another little tinker. long overdues are now requestable.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** request.pl	22 Aug 2002 02:31:58 -0000	1.12
--- request.pl	22 Aug 2002 04:45:07 -0000	1.13
***************
*** 84,88 ****
      $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
  
-     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 84,87 ----
***************
*** 91,96 ****
      my $select;
      if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1)
! 	|| ($data[$i]->{'itemlost'} == 2))  {
  	$select = "Cannot be reserved.";
      } else {
--- 90,94 ----
      my $select;
      if (($data[$i]->{'notforloan'}) 
! 	|| ($data[$i]->{'itemlost'} == 1))  {
  	$select = "Cannot be reserved.";
      } else {




From finlayt at users.sourceforge.net  Fri Aug 23 03:56:06 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Thu, 22 Aug 2002 18:56:06 -0700
Subject: [Koha-cvs] CVS: koha/acqui finishreceive.pl,1.1.1.1.2.1,1.1.1.1.2.2
Message-ID: <E17i3gE-0005Mv-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv20498/acqui

Modified Files:
      Tag: rel-1-2
	finishreceive.pl 
Log Message:

merged in the version 1.5 from the main branch



Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** finishreceive.pl	14 Jun 2002 21:20:27 -0000	1.1.1.1.2.1
--- finishreceive.pl	23 Aug 2002 01:56:04 -0000	1.1.1.1.2.2
***************
*** 15,19 ****
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblio=$input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
--- 15,19 ----
  my $user=$input->remote_user;
  #print $input->dump;
! my $biblionumber = $input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
***************
*** 22,26 ****
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
- my $id=$input->param('id');
  my $bibitemno=$input->param('biblioitemnum');
  my $data=bibitemdata($bibitemno);
--- 22,25 ----
***************
*** 39,48 ****
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $series=$input->param('Series');
! my $bookseller=$input->param('bookseller');
! $id=$bookseller;
! my $title=$input->param('title');
! my $author=$input->param('author');
! my $copyright=$input->param('copyright');
  
  if ($quantrec != 0){
--- 38,50 ----
  my $itemtype=$input->param('format');
  my $isbn=$input->param('ISBN');
! my $bookseller = $input->param('bookseller');
! my $id         = $bookseller;
! my $biblio = {
!     biblionumber  => $biblionumber,
!     title         => $input->param('title')?$input->param('title'):"",
!     author        => $input->param('author')?$input->param('author'):"",
!     copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
!     series        => $input->param('Series')?$input->param('Series'):""
! }; # my $biblio
  
  if ($quantrec != 0){
***************
*** 61,72 ****
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class);
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio,$title,$author,$copyright,$series);
!   modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
!   #print $notes;
    my $barcode=$input->param('barcode');
    my @barcodes;
--- 63,92 ----
  #  print "$bibitemno";
    $class="Periodical";
!   $bibitemno = &newbiblioitem({
!       biblionumber   => $biblionumber,
!       itemtype       => $itemtype?$itemtype:"",
!       isbn           => $isbn?$isbn:"",
!       volumeddesc    => $volinf?$volinf:"",
!       classification => $class?$class:"" });
  #  print "here $bibitemno";
  }
  if ($quantity != 0){
!   receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
!   modbiblio($biblio);
!   &modbibitem({
!       biblioitemnumber => $bibitemno,
!       itemtype         => $itemtype?$itemtype:"",
!       isbn             => $isbn?$isbn:"",
!       publisher        => $publisher?$publisher:"",
!       publicationyear  => $pubdate?$pubdate:"",
!       class            => $class?$class:"",
!       dewey            => $dewey?$dewey:"",
!       subclass         => $subclass?$subclass:"",
!       illus            => $illus?$illus:"",
!       pages            => $pages?$pages:"",
!       volumeddesc      => $volinf?$volinf:"",
!       notes            => $notes?$notes:"",
!       size             => $size?$size:"" });
! 
    my $barcode=$input->param('barcode');
    my @barcodes;
***************
*** 81,85 ****
    #  print $barcode;
    }
!   my ($error)=makeitems($quantrec,$bibitemno,$biblio,$replacement,$cost,$bookseller,$branch,$loan, at barcodes);
    if ($error eq ''){
      if ($itemtype ne 'PER'){
--- 101,113 ----
    #  print $barcode;
    }
!   my ($error) = newitems({ biblioitemnumber => $bibitemno,
! 	                   biblionumber     => $biblionumber,
! 	                   replacementprice => $replacement,
! 	                   price            => $cost,
! 	                   booksellerid     => $bookseller,
! 	                   homebranch       => $branch,
! 	                   loan             => $loan },
! 			 @barcodes);
! 
    if ($error eq ''){
      if ($itemtype ne 'PER'){
***************
*** 94,98 ****
  } else {
    print $input->header;
!   delorder($biblio,$ordnum);
         print $input->redirect("/acquisitions/");
  }
--- 122,126 ----
  } else {
    print $input->header;
!   delorder($biblionumber,$ordnum);
         print $input->redirect("/acquisitions/");
  }




From tonnesen at users.sourceforge.net  Mon Aug 26 19:08:58 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Mon, 26 Aug 2002 10:08:58 -0700
Subject: [Koha-cvs] CVS: koha admin-home.pl,1.1.2.1,1.1.2.2 catalogue-home.pl,1.1.2.1,1.1.2.2 groups.pl,1.1,1.1.2.1 members-home.pl,1.1.2.2,1.1.2.3 reports-home.pl,1.1.2.1,1.1.2.2
Message-ID: <E17jNMI-0008TU-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv32358

Modified Files:
      Tag: rel-1-2
	admin-home.pl catalogue-home.pl groups.pl members-home.pl 
	reports-home.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/admin-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** admin-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- admin-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,21 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/admin/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/admin/index.html";
  while (<H>) {
      print $_;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/catalogue-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** catalogue-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- catalogue-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 17,25 ****
  
  my $classlist='';
! open C, "/usr/local/koha/intranet/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "/usr/local/koha/intranet/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;
--- 21,29 ----
  
  my $classlist='';
! open C, "$intranetdir/htdocs/includes/cat-class-list.inc";
  while (<C>) {
      $classlist.=$_;
  }
! open H, "$intranetdir/htdocs/catalogue/index.html";
  while (<H>) {
      s/<!-- CLASSLIST -->/$classlist/;

Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** groups.pl	2 May 2001 23:06:44 -0000	1.1
--- groups.pl	26 Aug 2002 17:08:56 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,18 ----
  use C4::Print;
  use DBI;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
+ 
  
  my $input=new CGI;
***************
*** 214,218 ****
      $output= "<head><title>Overdue list for $groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img src=/usr/local/koha/librarian/htdocs/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';
--- 219,223 ----
      $output= "<head><title>Overdue list for $groups->{$group}</title></head><body><center>\n";
      my $members=groupmembers($env, $group);
!     ($type eq 'overdues') && ($output.="<img src=/images/overdues.jpg><br>\n");
      $output.= "<table border=1 cellspacing=5 cellpadding=10>\n";
      my $typetext='';

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/members-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** members-home.pl	27 Jul 2002 04:33:57 -0000	1.1.2.2
--- members-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.3
***************
*** 5,9 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
  
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  my $query = new CGI;
  my $flagsrequired;
***************
*** 18,22 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/members/index.html";
  while (<H>) {
      print $_;
--- 21,25 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/members/index.html";
  while (<H>) {
      print $_;

Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/Attic/reports-home.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** reports-home.pl	11 Jul 2002 18:05:28 -0000	1.1.2.1
--- reports-home.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,12 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Database;
+ 
+ my $configfile=configfile();
+ my $intranetdir=$configfile->{'intranetdir'};
  
  my $query = new CGI;
***************
*** 16,20 ****
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "/usr/local/koha/intranet/htdocs/reports/index.html";
  while (<H>) {
      print $_;
--- 20,24 ----
  print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
! open H, "$intranetdir/htdocs/reports/index.html";
  while (<H>) {
      print $_;




From tonnesen at users.sourceforge.net  Mon Aug 26 19:08:58 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Mon, 26 Aug 2002 10:08:58 -0700
Subject: [Koha-cvs] CVS: koha/admin templates.pl,1.1.2.1,1.1.2.2
Message-ID: <E17jNMI-0008TT-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32358/admin

Modified Files:
      Tag: rel-1-2
	templates.pl 
Log Message:
Removed hard coded directories (as reported by Ville Huhtala).


Index: templates.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/Attic/templates.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** templates.pl	11 Jul 2002 18:05:29 -0000	1.1.2.1
--- templates.pl	26 Aug 2002 17:08:56 -0000	1.1.2.2
***************
*** 15,18 ****
--- 15,22 ----
  
  
+ my $configfile=configfile();
+ my $includes=$configfile->{'includes'};
+ 
+ 
  my $dbh=C4Connect();
  
***************
*** 34,38 ****
  
  my $templateoptions='';
! opendir D, "/usr/local/koha/intranet/htdocs/includes/templates";
  my @dirlist=readdir D;
  foreach (@dirlist) {
--- 38,42 ----
  
  my $templateoptions='';
! opendir D, "$includes/templates";
  my @dirlist=readdir D;
  foreach (@dirlist) {




From finlayt at users.sourceforge.net  Tue Aug 27 00:34:31 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Mon, 26 Aug 2002 15:34:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 Reserves2.pm,1.16,1.17
Message-ID: <E17jSRL-0004qn-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv18350/C4

Modified Files:
	Reserves2.pm 
Log Message:

rewrote CheckReserves so that it can be called with a barcode as well as on itemnumber.


Index: Reserves2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Reserves2.pm	21 Aug 2002 01:31:16 -0000	1.16
--- Reserves2.pm	26 Aug 2002 22:34:29 -0000	1.17
***************
*** 98,111 ****
  
  sub CheckReserves {
!     my ($item) = @_;
!     warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
!     my $qitem=$dbh->quote($item);
  # get the biblionumber...
!     my $sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
                               FROM items, biblioitems, itemtypes 
                              WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
                                AND biblioitems.itemtype = itemtypes.itemtype
                                AND itemnumber=$qitem");
      $sth->execute;
      my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;
--- 98,122 ----
  
  sub CheckReserves {
!     my ($item, $barcode) = @_;
! #    warn "In CheckReserves: itemnumber = $item";
      my $dbh=C4Connect;
!     my $sth;
!     if ($item) {
! 	my $qitem=$dbh->quote($item);
  # get the biblionumber...
! 	$sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
                               FROM items, biblioitems, itemtypes 
                              WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
                                AND biblioitems.itemtype = itemtypes.itemtype
                                AND itemnumber=$qitem");
+     } else {
+ 	my $qbc=$dbh->quote($barcode);
+ # get the biblionumber...
+ 	$sth=$dbh->prepare("SELECT items.biblionumber, items.biblioitemnumber, itemtypes.notforloan
+                              FROM items, biblioitems, itemtypes 
+                             WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
+                               AND biblioitems.itemtype = itemtypes.itemtype
+                               AND barcode=$qbc");
+     }
      $sth->execute;
      my ($biblio, $bibitem, $notforloan) = $sth->fetchrow_array;




From dragon28 at users.sourceforge.net  Tue Aug 27 07:10:29 2002
From: dragon28 at users.sourceforge.net (Mike Mylonas)
Date: Mon, 26 Aug 2002 22:10:29 -0700
Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.1.2.5,1.1.2.6
Message-ID: <E17jYcX-0003Dm-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12369/koha/admin

Modified Files:
      Tag: rel-1-2
	branches.pl 
Log Message:
small tidy up of branch table output

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** branches.pl	20 Aug 2002 09:18:13 -0000	1.1.2.5
--- branches.pl	27 Aug 2002 05:10:27 -0000	1.1.2.6
***************
*** 257,261 ****
  	  	}
  		print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
! 		$results->[$i]{'branchaddress1'}.$results->[$i]{'branchaddress2'}.$results->[$i]{'branchaddress3'},
  		$results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchemail'},,$results->[$i]{'issuing'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),
--- 257,261 ----
  	  	}
  		print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
! 		$results->[$i]{'branchaddress1'}." ".$results->[$i]{'branchaddress2'}." ".$results->[$i]{'branchaddress3'},
  		$results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchemail'},,$results->[$i]{'issuing'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),




From finlayt at users.sourceforge.net  Thu Aug 29 02:00:47 2002
From: finlayt at users.sourceforge.net (Finlay Thompson)
Date: Wed, 28 Aug 2002 17:00:47 -0700
Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.19,1.20
Message-ID: <E17kCjv-0006Gz-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv24047/circ

Modified Files:
	returns.pl 
Log Message:

Fixed bug in flags display



Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** returns.pl	22 Aug 2002 04:20:33 -0000	1.19
--- returns.pl	29 Aug 2002 00:00:45 -0000	1.20
***************
*** 329,341 ****
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $flag = "<font color=red>$flag</font>";
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
--- 329,344 ----
      my $flags = $borrower->{'flags'};
      my $flaginfotext='';
+     my $displayflag = '';
      my $color = '';
      foreach my $flag (sort keys %$flags) {
  	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  	if ($flags->{$flag}->{'noissues'}) {
! 	    $displayflag = "<font color=red>$flag</font>";
! 	} else {
! 	    $displayflag = $flag;
  	}
  	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
  <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
***************
*** 354,358 ****
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
--- 357,361 ----
  EOF
              }
!             $flaginfotext.="<tr><td valign=top>$displayflag</td><td>$itemswaiting</td></tr>\n";
  	} elsif ($flag eq 'ODUES') {
  	    my $itemsoverdue = '';
***************
*** 368,375 ****
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$flag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$flag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF
--- 371,378 ----
  EOF
  	    }
! 	    $flaginfotext .= "<tr><td valign=top>$displayflag</td><td>$itemsoverdue</td></tr>\n";
          } else {
  	    $flaginfotext.= <<"EOF";
! <tr><td valign=top>$displayflag</td>
  <td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>
  EOF




From tonnesen at users.sourceforge.net  Fri Aug 30 18:30:12 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 30 Aug 2002 09:30:12 -0700
Subject: [Koha-cvs] CVS: koha koha.upgrade,1.1.2.17,1.1.2.18
Message-ID: <E17koey-0000a9-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv2060

Modified Files:
      Tag: rel-1-2
	koha.upgrade 
Log Message:
Was checking for 'RC' in installed version


Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -r1.1.2.17 -r1.1.2.18
*** koha.upgrade	27 Jul 2002 05:38:53 -0000	1.1.2.17
--- koha.upgrade	30 Aug 2002 16:30:10 -0000	1.1.2.18
***************
*** 19,25 ****
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! my $newversion=`cat koha.version`;
! chomp $newversion;
! if ($::kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
--- 19,25 ----
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
***************
*** 31,35 ****
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 31,35 ----
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $::newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 359,363 ****
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
--- 359,363 ----
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$::newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
***************
*** 376,380 ****
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$newversion\n";
  }
  unless (defined($kc->{'includes'})) {
--- 376,380 ----
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$::newversion\n";
  }
  unless (defined($kc->{'includes'})) {




From tonnesen at users.sourceforge.net  Fri Aug 30 19:26:16 2002
From: tonnesen at users.sourceforge.net (Steve Tonnesen)
Date: Fri, 30 Aug 2002 10:26:16 -0700
Subject: [Koha-cvs] CVS: koha/marc marcschema.sql,1.15,1.16
Message-ID: <E17kpXE-0005cA-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/marc
In directory usw-pr-cvs1:/tmp/cvs-serv21498

Modified Files:
	marcschema.sql 
Log Message:
Added bibliothesaurus table


Index: marcschema.sql
===================================================================
RCS file: /cvsroot/koha/koha/marc/marcschema.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** marcschema.sql	24 Jul 2002 15:52:53 -0000	1.15
--- marcschema.sql	30 Aug 2002 17:26:14 -0000	1.16
***************
*** 2,5 ****
--- 2,8 ----
  #  
  #  $Log$
+ #  Revision 1.16  2002/08/30 17:26:14  tonnesen
+ #  Added bibliothesaurus table
+ #
  #  Revision 1.15  2002/07/24 15:52:53  tipaul
  #  1st scripts for MARC-DB.
***************
*** 124,126 ****
--- 127,141 ----
  		KEY sndx_word (sndx_word)
  		) TYPE=MyISAM;
+ 
+ 
+ CREATE TABLE bibliothesaurus ( 
+    code bigint(20) NOT NULL auto_increment, 
+    freelib char(255) NOT NULL default '', 
+    stdlib char(255) NOT NULL default '', 
+    type char(80) NOT NULL default '', 
+    PRIMARY KEY  (code), 
+    KEY freelib (freelib), 
+    KEY stdlib (stdlib), 
+    KEY type (type) 
+  ) TYPE=MyISAM;