[Koha-cvs] CVS: koha/C4 Output.pm,1.6.2.11,1.6.2.12

[Paul POULAIN]

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

Modified Files:
      Tag: rel-1-2
        Output.pm 
Log Message:
merging 1.2 and main branches. Mostly spaces and typo diffs


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -C2 -r1.6.2.11 -r1.6.2.12
*** Output.pm   28 Jun 2002 03:42:11 -0000      1.6.2.11
--- Output.pm   3 Jul 2002 12:41:34 -0000       1.6.2.12
***************
*** 18,29 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(
!       &startpage &endpage 
!       &mktablehdr &mktableft &mktablerow &mklink
!       &startmenu &endmenu &mkheadr 
!       &center &endcenter 
!       &mkform &mkform2 &bold
!       &gotopage &mkformnotable &mkform3
!       &getkeytableselectoptions
  );
  %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
--- 18,28 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&startpage &endpage 
!            &mktablehdr &mktableft &mktablerow &mklink
!            &startmenu &endmenu &mkheadr 
!            &center &endcenter 
!            &mkform &mkform2 &bold
!            &gotopage &mkformnotable &mkform3
!            &getkeytableselectoptions
  );
  %EXPORT_TAGS = ( );     # eg: TAG => [ qw!name1 name2! ],
***************
*** 57,83 ****
  open (KC, "/etc/koha.conf");
  while (<KC>) {
!  chomp;
!  (next) if (/^\s*#/);
!  if (/(.*)\s*=\s*(.*)/) {
!    my $variable=$1;
!    my $value=$2;
!    # Clean up white space at beginning and end
!    $variable=~s/^\s*//g;
!    $variable=~s/\s*$//g;
!    $value=~s/^\s*//g;
!    $value=~s/\s*$//g;
!    $configfile{$variable}=$value;
!  }
! }
  my $path=$configfile{'includes'};
  ($path) || ($path="/usr/local/www/hdl/htdocs/includes");
  
- 
- # here's a file-private function as a closure,
- # callable as &$priv_func;  it cannot be prototyped.
- my $priv_func = sub {
- # stuff goes here.
-   };
-    
  # make all your functions, whether exported or not;
   
--- 56,77 ----
  open (KC, "/etc/koha.conf");
  while (<KC>) {
!     chomp;
!     (next) if (/^\s*#/);
!     if (/(.*)\s*=\s*(.*)/) {
!         my $variable=$1;
!         my $value=$2;
! 
!         $variable =~ s/^\s*//g;
!         $variable =~ s/\s*$//g;
!         $value    =~ s/^\s*//g;
!         $value    =~ s/\s*$//g;
!         $configfile{$variable}=$value;
!     } # if
! } # while
! close(KC);
! 
  my $path=$configfile{'includes'};
  ($path) || ($path="/usr/local/www/hdl/htdocs/includes");
  
  # make all your functions, whether exported or not;
   
***************
*** 104,108 ****
      open (FILE,"$path/members-top.inc") || die;
    } elsif ($type eq 'acquisitions'){
!     open (FILE,"$path/acquisitions-top.inc")|| die;
    } elsif ($type eq 'report'){
      open (FILE,"$path/reports-top.inc") || die;
--- 98,102 ----
      open (FILE,"$path/members-top.inc") || die;
    } elsif ($type eq 'acquisitions'){
!     open (FILE,"$path/acquisitions-top.inc") || die;
    } elsif ($type eq 'report'){
      open (FILE,"$path/reports-top.inc") || die;
***************
*** 120,126 ****
  
  
! sub endmenu{
!   my ($type)address@hidden;
!   if ($type eq 'issue'){
      open (FILE,"$path/issues-bottom.inc") || die;
    } elsif ($type eq 'opac') {
--- 114,120 ----
  
  
! sub endmenu {
!   my ($type) = @_;
!   if ($type eq 'issue') {
      open (FILE,"$path/issues-bottom.inc") || die;
    } elsif ($type eq 'opac') {
***************
*** 225,238 ****
  }
  
! sub mkform3{
!   my ($action,%inputs)address@hidden;
!   my $string="<form action=$action method=post>\n";
!   $string=$string.mktablehdr();
    my $key;
!   my @keys=sort keys %inputs;
!   my @order;  
!   my address@hidden;
!   my $i2=0;
!   while ( $i2<$count) {
      my $value=$inputs{$keys[$i2]};
      my @data=split('\t',$value);
--- 219,232 ----
  }
  
! sub mkform3 {
!   my ($action, %inputs) = @_;
!   my $string = "<form action=\"$action\" method=\"post\">\n";
!   $string   .= mktablehdr();
    my $key;
!   my @keys = sort(keys(%inputs));
!   my @order;
!   my $count = @keys;
!   my $i2 = 0;
!   while ($i2 < $count) {
      my $value=$inputs{$keys[$i2]};
      my @data=split('\t',$value);
***************
*** 370,374 ****
  =cut
  
- 
  sub endpage() {
    return("</body></html>\n");
--- 364,367 ----
***************
*** 386,391 ****
  =cut
  
! 
! sub mklink($$)  {
    my ($url,$text)address@hidden;
    my $string="<a href=\"$url\">$text</a>";
--- 379,383 ----
  =cut
  
! sub mklink($$) {
    my ($url,$text)address@hidden;
    my $string="<a href=\"$url\">$text</a>";
***************
*** 417,421 ****
  =cut
  
- 
  sub mkheadr {
      # FIXME
--- 409,412 ----
***************
*** 426,436 ****
    my $string;
    if ($type eq '1'){
!       $string="<br>";
!   } elsif ($type eq '3') {
!       $string="<p>";
!   } else {
!       $string="";
    }
!   return ("<FONT SIZE=6><em>$text</em></FONT>$string");
  }
  
--- 417,429 ----
    my $string;
    if ($type eq '1'){
!     $string="<FONT SIZE=6><em>$text</em></FONT><br>";
!   }
!   if ($type eq '2'){
!     $string="<FONT SIZE=6><em>$text</em></FONT><br>";
    }
!   if ($type eq '3'){
!     $string="<FONT SIZE=6><em>$text</em></FONT><p>";
!   }
!   return ($string);
  }