koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha MARCdetail.pl,1.9,1.10 admin-home.pl,1.6,1.7 boracc

From: Ambrose Li
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.9,1.10 admin-home.pl,1.6,1.7 boraccount.pl,1.7,1.8 catalogue-home.pl,1.5,1.6 detail.pl,1.17,1.18 jmemberentry.pl,1.6,1.7 mainpage.pl,1.6,1.7 mancredit.pl,1.8,1.9 maninvoice.pl,1.6,1.7 member.pl,1.9,1.10 memberentry.pl,1.20,1.21 members-home.pl,1.4,1.5 moremember.pl,1.23,1.24 newmember.pl,1.6,1.7 readingrec.pl,1.6,1.7 reports-home.pl,1.4,1.5 search.pl,1.25,1.26 shelves.pl,1.9,1.10 thesaurus_popup.pl,1.9,1.10 userpage.pl,1.8,1.9
Date: Sat, 01 Feb 2003 23:18:39 -0800 
Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv1397

Modified Files:
        MARCdetail.pl admin-home.pl boraccount.pl catalogue-home.pl 
        detail.pl jmemberentry.pl mainpage.pl mancredit.pl 
        maninvoice.pl member.pl memberentry.pl members-home.pl 
        moremember.pl newmember.pl readingrec.pl reports-home.pl 
        search.pl shelves.pl thesaurus_popup.pl userpage.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: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** MARCdetail.pl       2 Feb 2003 04:57:47 -0000       1.9
--- MARCdetail.pl       2 Feb 2003 07:18:37 -0000       1.10
***************
*** 51,54 ****
--- 51,55 ----
  use C4::Context;
  use C4::Output;
+ use C4::Interface::CGI::Output;
  use CGI;
  use C4::Search;
***************
*** 161,167 ****
                                                biblionumber => $biblionumber,
                                                bibid => $bibid);
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
  
--- 162,165 ----
                                                biblionumber => $biblionumber,
                                                bibid => $bibid);
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin-home.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** admin-home.pl       19 Jan 2003 06:15:44 -0000      1.6
--- admin-home.pl       2 Feb 2003 07:18:37 -0000       1.7
***************
*** 5,9 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use C4::Database;
  use HTML::Template;
--- 5,9 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Database;
  use HTML::Template;
***************
*** 20,25 ****
  $template->param(loggeninuser => $loggedinuser);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 20,22 ----
  $template->param(loggeninuser => $loggedinuser);
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/boraccount.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** boraccount.pl       25 Jan 2003 20:05:47 -0000      1.7
--- boraccount.pl       2 Feb 2003 07:18:37 -0000       1.8
***************
*** 27,31 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use C4::Search;
--- 27,31 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use CGI;
  use C4::Search;
***************
*** 80,85 ****
                        accounts        => address@hidden );
  
! print $input->header(
!    -type => guesstype($template->output),
!    -cookie => $cookie
! ),$template->output;
--- 80,82 ----
                        accounts        => address@hidden );
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** catalogue-home.pl   19 Jan 2003 06:15:44 -0000      1.5
--- catalogue-home.pl   2 Feb 2003 07:18:37 -0000       1.6
***************
*** 5,9 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use C4::Database;
  use HTML::Template;
--- 5,9 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Database;
  use HTML::Template;
***************
*** 28,33 ****
                                                type => 'intranet',);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 28,30 ----
                                                type => 'intranet',);
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** detail.pl   19 Nov 2002 12:31:34 -0000      1.17
--- detail.pl   2 Feb 2003 07:18:37 -0000       1.18
***************
*** 94,97 ****
  $template->param(SITE_RESULTS => $sitearray);
  $template->param(loggedinuser => $loggedinuser);
! print $query->header(-cookie => $cookie), $template->output;
  
--- 94,97 ----
  $template->param(SITE_RESULTS => $sitearray);
  $template->param(loggedinuser => $loggedinuser);
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** jmemberentry.pl     13 Dec 2002 10:21:58 -0000      1.6
--- jmemberentry.pl     2 Feb 2003 07:18:37 -0000       1.7
***************
*** 95,97 ****
                        cmemloop        => address@hidden );
  
! print $input->header(-cookie => $cookie),$template->output;
--- 95,97 ----
                        cmemloop        => address@hidden );
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mainpage.pl 19 Jan 2003 06:15:44 -0000      1.6
--- mainpage.pl 2 Feb 2003 07:18:37 -0000       1.7
***************
*** 5,9 ****
  use C4::Database;
  use C4::Output;  # contains gettemplate
! use C4::Charset;
  use CGI;
  use C4::Auth;
--- 5,9 ----
  use C4::Database;
  use C4::Output;  # contains gettemplate
! use C4::Interface::CGI::Output;
  use CGI;
  use C4::Auth;
***************
*** 19,24 ****
                             });
  
! print  $query->header(
!    -type => guesstype($template->output),
!    -cookie => $cookie
! ), $template->output;
--- 19,21 ----
                             });
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: mancredit.pl
===================================================================
RCS file: /cvsroot/koha/koha/mancredit.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** mancredit.pl        25 Jan 2003 20:18:45 -0000      1.8
--- mancredit.pl        2 Feb 2003 07:18:37 -0000       1.9
***************
*** 25,29 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use HTML::Template;
--- 25,29 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use CGI;
  use HTML::Template;

Index: maninvoice.pl
===================================================================
RCS file: /cvsroot/koha/koha/maninvoice.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** maninvoice.pl       25 Jan 2003 20:15:11 -0000      1.6
--- maninvoice.pl       2 Feb 2003 07:18:37 -0000       1.7
***************
*** 25,29 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use C4::Search;
--- 25,29 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use CGI;
  use C4::Search;

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/member.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** member.pl   25 Jan 2003 19:23:37 -0000      1.9
--- member.pl   2 Feb 2003 07:18:37 -0000       1.10
***************
*** 27,31 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use C4::Search;
--- 27,31 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use CGI;
  use C4::Search;
***************
*** 79,84 ****
                        resultsloop     => address@hidden );
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 79,81 ----
                        resultsloop     => address@hidden );
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** memberentry.pl      25 Jan 2003 19:31:09 -0000      1.20
--- memberentry.pl      2 Feb 2003 07:18:37 -0000       1.21
***************
*** 28,32 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use C4::Search;
--- 28,32 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use CGI;
  use C4::Search;
***************
*** 243,250 ****
                        dateofbirth     => $data->{'dateofbirth'});
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
  
  
--- 243,247 ----
                        dateofbirth     => $data->{'dateofbirth'});
  
! output_html_with_http_headers $input, $cookie, $template->output;
  
  

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members-home.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** members-home.pl     25 Jan 2003 19:16:33 -0000      1.4
--- members-home.pl     2 Feb 2003 07:18:37 -0000       1.5
***************
*** 5,9 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use C4::Context;
  use HTML::Template;
--- 5,9 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Context;
  use HTML::Template;
***************
*** 19,24 ****
                             });
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 19,21 ----
                             });
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** moremember.pl       25 Jan 2003 19:49:57 -0000      1.23
--- moremember.pl       2 Feb 2003 07:18:37 -0000       1.24
***************
*** 35,39 ****
  use C4::Context;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use C4::Search;
--- 35,40 ----
  use C4::Context;
  use C4::Output;
! use C4::Interface::CGI::Output;
! use C4::Interface::CGI::Template;
  use CGI;
  use C4::Search;
***************
*** 70,73 ****
--- 71,76 ----
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  
+ $data->{&expand_sex_into_predicate($data->{'sex'})} = 1;
+ 
  if ($data->{'categorycode'} eq 'C'){
      my $data2=borrdata('',$data->{'guarantor'});
***************
*** 204,209 ****
                 reserveloop     => address@hidden);
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 207,209 ----
                 reserveloop     => address@hidden);
  
! output_html_with_http_headers $input, $cookie, $template->output;

Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newmember.pl        22 Jan 2003 03:47:05 -0000      1.6
--- newmember.pl        2 Feb 2003 07:18:37 -0000       1.7
***************
*** 39,43 ****
  use C4::Auth;
  use C4::Input;
! use C4::Charset;
  use CGI;
  use Date::Manip;
--- 39,43 ----
  use C4::Auth;
  use C4::Input;
! use C4::Interface::CGI::Output;
  use CGI;
  use Date::Manip;
***************
*** 181,188 ****
  }
  
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
  
  
--- 181,185 ----
  }
  
! output_html_with_http_headers $input, $cookie, $template->output;
  
  

Index: readingrec.pl
===================================================================
RCS file: /cvsroot/koha/koha/readingrec.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** readingrec.pl       2 Feb 2003 04:57:47 -0000       1.6
--- readingrec.pl       2 Feb 2003 07:18:37 -0000       1.7
***************
*** 26,30 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use CGI;
  use C4::Search;
--- 26,30 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use CGI;
  use C4::Search;
***************
*** 74,81 ****
                                                limit => $limit,
                                                loop_reading => address@hidden);
! print $input->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
  
  
--- 74,78 ----
                                                limit => $limit,
                                                loop_reading => address@hidden);
! output_html_with_http_headers $input, $cookie, $template->output;
  
  

Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports-home.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** reports-home.pl     26 Jan 2003 04:23:34 -0000      1.4
--- reports-home.pl     2 Feb 2003 07:18:37 -0000       1.5
***************
*** 5,9 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  use C4::Context;
  use HTML::Template;
--- 5,9 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  use C4::Context;
  use HTML::Template;
***************
*** 18,23 ****
                                debug => 1,
                                });
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;
--- 18,20 ----
                                debug => 1,
                                });
! output_html_with_http_headers $query, $cookie, $template->output;

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** search.pl   20 Jan 2003 07:39:27 -0000      1.25
--- search.pl   2 Feb 2003 07:18:37 -0000       1.26
***************
*** 27,31 ****
  use C4::Auth;
  use C4::Output;
! use C4::Charset;
  
  my $query=new CGI;
--- 27,31 ----
  use C4::Auth;
  use C4::Output;
! use C4::Interface::CGI::Output;
  
  my $query=new CGI;
***************
*** 201,207 ****
  
  # Print the page
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
  
--- 201,204 ----
  
  # Print the page
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/shelves.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** shelves.pl  19 Dec 2002 18:55:40 -0000      1.9
--- shelves.pl  2 Feb 2003 07:18:37 -0000       1.10
***************
*** 84,88 ****
  }
  
! print $query->header(-cookie => $cookie), $template->output;
  
  
--- 84,88 ----
  }
  
! output_html_with_http_headers $query, $cookie, $template->output;
  
  
***************
*** 152,155 ****
--- 152,169 ----
  #
  # $Log$
+ # Revision 1.10  2003/02/02 07:18:37  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.9  2002/12/19 18:55:40  hdl
  # Templating reservereport et shelves.

Index: thesaurus_popup.pl
===================================================================
RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** thesaurus_popup.pl  28 Jan 2003 14:57:33 -0000      1.9
--- thesaurus_popup.pl  2 Feb 2003 07:18:37 -0000       1.10
***************
*** 94,98 ****
                                                index => $index
                                                );
! print $input->header(-cookie => $cookie),$template->output;
  
  
--- 94,98 ----
                                                index => $index
                                                );
! output_html_with_http_headers $input, $cookie, $template->output;
  
  

Index: userpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/userpage.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** userpage.pl 10 Dec 2002 17:35:29 -0000      1.8
--- userpage.pl 2 Feb 2003 07:18:37 -0000       1.9
***************
*** 39,41 ****
  warn "userloggedin : $loggedinuser (".$query->param('userid')." et 
".$query->param('password');
  
! print $query->header(-cookie => $cookie), $template->output;
--- 39,41 ----
  warn "userloggedin : $loggedinuser (".$query->param('userid')." et 
".$query->param('password');
  
! output_html_with_http_headers $query, $cookie, $template->output;
reply via email to
[Prev in Thread] Current Thread [Next in Thread]