[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.16,1.17 addbooks.pl,1.17,1.18 additem.pl,1.12,1.13 isbnsearch.pl,1.9,1.10 marcimport.pl,1.29,1.30

[Ambrose Li]

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

Modified Files:
        addbiblio.pl addbooks.pl additem.pl isbnsearch.pl 
        marcimport.pl 
Log Message:
Moved C4/Charset.pm to C4/Interface/CGI/Output.pm

Create output_html_with_http_headers function to contain the "print $query
->header(-type => guesstype...),..." call. This is in preparation for
non-HTML output (e.g., text/xml) and charset conversion before output in
the future.

Created C4/Interface/CGI/Template.pm to hold convenience functions specific
to the CGI interface using HTML::Template

Modified moremembers.pl to make the "sex" field localizable for languages
where M and F doesn't make sense


Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** addbiblio.pl        26 Jan 2003 23:21:49 -0000      1.16
--- addbiblio.pl        2 Feb 2003 07:18:38 -0000       1.17
***************
*** 24,28 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use C4::Biblio;
  use C4::Context;
--- 24,28 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Biblio;
  use C4::Context;
***************
*** 307,312 ****
                                                        oldbiblioitemnumber => 
$oldbiblioitemnumber);
  }
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 307,309 ----
                                                        oldbiblioitemnumber => 
$oldbiblioitemnumber);
  }
! output_html_with_http_headers $input, $cookie, $template->output;

Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** addbooks.pl 19 Jan 2003 06:15:44 -0000      1.17
--- addbooks.pl 2 Feb 2003 07:18:38 -0000       1.18
***************
*** 40,44 ****
  use C4::Biblio;
  use C4::Output;
! use C4::Charset;
  use HTML::Template;
  
--- 40,44 ----
  use C4::Biblio;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use HTML::Template;
  
***************
*** 55,60 ****
                             debug => 1,
                             });
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 55,57 ----
                             debug => 1,
                             });
! output_html_with_http_headers $query, $cookie, $template->output;

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** additem.pl  26 Jan 2003 23:21:49 -0000      1.12
--- additem.pl  2 Feb 2003 07:18:38 -0000       1.13
***************
*** 24,28 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use C4::Biblio;
  use C4::Context;
--- 24,28 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Biblio;
  use C4::Context;
***************
*** 252,257 ****
                                                op => $nextop,
                                                opisadd => ($nextop eq 
"saveitem")?0:1);
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 252,254 ----
                                                op => $nextop,
                                                opisadd => ($nextop eq 
"saveitem")?0:1);
! output_html_with_http_headers $input, $cookie, $template->output;

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** isbnsearch.pl       28 Jan 2003 15:00:30 -0000      1.9
--- isbnsearch.pl       2 Feb 2003 07:18:38 -0000       1.10
***************
*** 26,30 ****
  use C4::Search;
  use C4::Output;
! use C4::Charset;
  use HTML::Template;
  
--- 26,30 ----
  use C4::Search;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use HTML::Template;
  

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** marcimport.pl       28 Jan 2003 15:28:31 -0000      1.29
--- marcimport.pl       2 Feb 2003 07:18:38 -0000       1.30
***************
*** 37,41 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use C4::Input;
  use C4::Biblio;
--- 37,41 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Input;
  use C4::Biblio;
***************
*** 151,158 ****
  }
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
  my $menu;
  my $file;
--- 151,155 ----
  }
  
! output_html_with_http_headers $input, $cookie, $template->output;
  my $menu;
  my $file;
***************
*** 810,813 ****
--- 807,824 ----
  # log cleared, as marcimport is (almost) rewritten from scratch.
  # $Log$
+ # Revision 1.30  2003/02/02 07:18:38  acli
+ # Moved C4/Charset.pm to C4/Interface/CGI/Output.pm
+ #
+ # Create output_html_with_http_headers function to contain the "print $query
+ # ->header(-type => guesstype...),..." call. This is in preparation for
+ # non-HTML output (e.g., text/xml) and charset conversion before output in
+ # the future.
+ #
+ # Created C4/Interface/CGI/Template.pm to hold convenience functions specific
+ # to the CGI interface using HTML::Template
+ #
+ # Modified moremembers.pl to make the "sex" field localizable for languages
+ # where M and F doesn't make sense
+ #
  # Revision 1.29  2003/01/28 15:28:31  tipaul
  # removing use MARC::Charset