[Koha-cvs] CVS: koha/admin aqbookfund.pl,1.11,1.12 aqbudget.pl,1.10,1.11 authorised_values.pl,1.5,1.6 branches.pl,1.11,1.12 checkmarc.pl,1.2,1.3 koha2marclinks.pl,1.6,1.7 marc_subfields_structure.pl,1.9,1.10 marctagstructure.pl,1.12,1.13 systempreferences.pl,1.10,1.11 thesaurus.pl,1.6,1.7

[Ambrose Li]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv1397/admin

Modified Files:
        aqbookfund.pl aqbudget.pl authorised_values.pl branches.pl 
        checkmarc.pl koha2marclinks.pl marc_subfields_structure.pl 
        marctagstructure.pl systempreferences.pl thesaurus.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: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** aqbookfund.pl       2 Feb 2003 04:58:08 -0000       1.11
--- aqbookfund.pl       2 Feb 2003 07:18:38 -0000       1.12
***************
*** 43,47 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use C4::Search;
  use HTML::Template;
--- 43,47 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Search;
  use HTML::Template;
***************
*** 207,212 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 207,209 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** aqbudget.pl 2 Feb 2003 04:58:08 -0000       1.10
--- aqbudget.pl 2 Feb 2003 07:18:38 -0000       1.11
***************
*** 43,47 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use C4::Search;
  use HTML::Template;
--- 43,47 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Search;
  use HTML::Template;
***************
*** 228,234 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
  
--- 228,231 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;
  

Index: authorised_values.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** authorised_values.pl        2 Feb 2003 04:58:08 -0000       1.5
--- authorised_values.pl        2 Feb 2003 07:18:38 -0000       1.6
***************
*** 23,27 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use C4::Search;
  use HTML::Template;
--- 23,27 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Search;
  use HTML::Template;
***************
*** 190,195 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 190,192 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** branches.pl 26 Jan 2003 04:23:34 -0000      1.11
--- branches.pl 2 Feb 2003 07:18:38 -0000       1.12
***************
*** 27,31 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use HTML::Template;
  
--- 27,31 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use HTML::Template;
  
***************
*** 378,383 ****
  }
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 378,380 ----
  }
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** checkmarc.pl        21 Jan 2003 14:01:52 -0000      1.2
--- checkmarc.pl        2 Feb 2003 07:18:38 -0000       1.3
***************
*** 21,25 ****
  use strict;
  use C4::Output;
! use C4::Charset;
  use C4::Auth;
  use CGI;
--- 21,25 ----
  use strict;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Auth;
  use CGI;
***************
*** 122,127 ****
  
  $template->param(total => $total);
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 122,124 ----
  
  $template->param(total => $total);
! output_html_with_http_headers $input, $cookie, $template->output;

Index: koha2marclinks.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** koha2marclinks.pl   20 Jan 2003 13:48:50 -0000      1.6
--- koha2marclinks.pl   2 Feb 2003 07:18:38 -0000       1.7
***************
*** 21,25 ****
  use strict;
  use C4::Output;
! use C4::Charset;
  use C4::Auth;
  use CGI;
--- 21,25 ----
  use strict;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Auth;
  use CGI;
***************
*** 136,141 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 136,138 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** marc_subfields_structure.pl 19 Jan 2003 06:15:44 -0000      1.9
--- marc_subfields_structure.pl 2 Feb 2003 07:18:38 -0000       1.10
***************
*** 21,25 ****
  use strict;
  use C4::Output;
! use C4::Charset;
  use C4::Auth;
  use CGI;
--- 21,25 ----
  use strict;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Auth;
  use CGI;
***************
*** 348,353 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 348,350 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marctagstructure.pl 20 Jan 2003 07:39:28 -0000      1.12
--- marctagstructure.pl 2 Feb 2003 07:18:38 -0000       1.13
***************
*** 24,28 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use C4::Search;
  use C4::Context;
--- 24,28 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Search;
  use C4::Context;
***************
*** 198,203 ****
  
  $template->param(loggeninuser => $loggedinuser);
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 198,200 ----
  
  $template->param(loggeninuser => $loggedinuser);
! output_html_with_http_headers $input, $cookie, $template->output;

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** systempreferences.pl        19 Jan 2003 06:15:44 -0000      1.10
--- systempreferences.pl        2 Feb 2003 07:18:38 -0000       1.11
***************
*** 43,47 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use C4::Search;
  use HTML::Template;
--- 43,47 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Search;
  use HTML::Template;
***************
*** 186,191 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 186,188 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: thesaurus.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** thesaurus.pl        20 Jan 2003 07:39:28 -0000      1.6
--- thesaurus.pl        2 Feb 2003 07:18:38 -0000       1.7
***************
*** 21,25 ****
  use CGI;
  use C4::Auth;
! use C4::Charset;
  use C4::Context;
  use C4::Output;
--- 21,25 ----
  use CGI;
  use C4::Auth;
! use C4::Interface::CGI::Output;
  use C4::Context;
  use C4::Output;
***************
*** 257,262 ****
  } #---- END $OP eq DEFAULT
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 257,259 ----
  } #---- END $OP eq DEFAULT
  
! output_html_with_http_headers $input, $cookie, $template->output;