From acli at users.sourceforge.net Sun Feb 2 01:13:12 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 16:13:12 -0800 Subject: [Koha-cvs] CVS: koha/search.marc search.pl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv14921/search.marc Modified Files: search.pl Log Message: Handle non-latin1 charsets Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.marc/search.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** search.pl 28 Jan 2003 14:56:39 -0000 1.1 --- search.pl 2 Feb 2003 00:13:10 -0000 1.2 *************** *** 27,30 **** --- 27,31 ---- use C4::Auth; use C4::Output; + use C4::Charset; use C4::Biblio; use C4::SearchMarc; *************** *** 108,110 **** } # Print the page ! print $query->header(-cookie => $cookie), $template->output; --- 109,114 ---- } # Print the page ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members imemberentry.tmpl,NONE,1.1 jmemberentry.tmpl,NONE,1.1 member.tmpl,NONE,1.1 memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1 pay.tmpl,NONE,1.1 readingrec.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv4979/members Added Files: imemberentry.tmpl jmemberentry.tmpl member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: Incomplete translation --- NEW FILE ---
Add New Institution
Member# , Card Number*
 
INSTITUTION DETAILS
Institution Name
 
INSTITUTION ADDRESS
Postal Address* Town* Area
 
CONTACT DETAILS
Contact Name*
Phone (day) Fax Email
 
Notes
 
LIBRARY USE
 
Notes

 

--- NEW FILE ---
Add New Junior Member
">
PARENT OR GUARDIAN
Title Given Names* Surname* Membership No.
 
CHILD
Member# , Card Number* size=20 value="">
value="">
size=20 value=""> size=20 value=""> size=10 value=""> F M* size=20 value="">
Given Names* Surname* Date of Birth
(dd/mm/yy)*		   School
Notes
 
--- NEW FILE --- 尋找讀者
您找的是「」

圖書證編號 姓 名 類別 地址 OD/Issues 罰款 備註


個入 機構
--- NEW FILE --- <TMPL_VAR NAME=header>
讀者編號 #, 圖書證號碼*
個人資料 * checked>女 checked>男     出生日期 (年/月/日)
Title Initials 名* 姓* Prefered Name
 
 
族裔 族裔備註    讀者類別*
 
讀者地址
Postal Address* 市* 區
 
住址 (如與上列不同) 市
 
聯絡方法
Phone (Home) Phone (day) 傳真 電郵
 
ALTERNATE CONTACT DETAILS
姓名* 電話 關係*
 
備註
 
館方專用
備註
 
FLAGS
>是 >否
--- NEW FILE ---

Logged in as: [登出]

登入 Koha

 尋找讀者

1
尋找讀者
續借書籍、登記新讀者、或給現有的讀者更新或刪除記錄，統統都由這個搜尋開始。
在上列空格內輸入讀者姓名、姓名的一部分、或圖書證編號，再按回車鍵即可。

2
瀏覽讀者記錄
A || B || C || D || E || F || G || H || I || J || K || L || M || N || O || P || Q || R || S || T || U || V || W || X || Y || Z

--- NEW FILE ---

讀者資料


(, )

圖書證編號：
Postal Address: ,
住址：,
Phone (Home):
Phone (Daytime):
傳真：
電郵：">
Textmessaging:

讀者編號：
Membership:
區別：
費用：$30/year, Paid
Joined: , Expires:
Joining Branch:

族裔：,
出生日期：
姓別：

Alternative Contact:
Phone:
Relationship:
備註：

Guarantees:">
 Guarantor: ">
no guarantor

General Notes:

">

罰款、手續費等
&bib=&bi=">  
> >

">
借出項目
書名 何時到期 類別 Charge 續借
&bib=&bi="> ">On Request - no renewals " value=y>Y " value=n>N

"> ">
預約項目
書名 預約日期 取消預約
">

">

--- NEW FILE --- Pay Fines for

">
FINES & CHARGES AMOUNT OWING
" value="no" checked>Unpaid " value="yes">Pay " value="wo">Writeoff " value=""> " value=""> " value=""> " value=""> " value=""> " value="">
Total Due

 

--- NEW FILE ---
&limit=full">所有項目
&order=title&limit=">書名 &order=author&limit=">作者 &limit=">日期 Volume
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/reports reports-home.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/reports In directory sc8-pr-cvs1:/tmp/cvs-serv4979/reports Added Files: reports-home.tmpl Log Message: Incomplete translation --- NEW FILE --- Reports
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc result.tmpl,NONE,1.1 search.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv4979/search.marc Added Files: result.tmpl search.tmpl Log Message: Incomplete translation --- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" >
Biblio# Author Title
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" >
Search
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" align=center valign=center> 0  
From acli at users.sourceforge.net Sun Feb 2 05:56:48 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/marcimport AcceptBiblioitem.tmpl,NONE,1.1 AcceptItemCopy.tmpl,NONE,1.1 AcceptMarcUpload.tmpl,NONE,1.1 ListFileRecords.tmpl,NONE,1.1 mainmenu.tmpl,NONE,1.1 marcimportdetail.tmpl,NONE,1.1 uploadmarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv4979/marcimport Added Files: AcceptBiblioitem.tmpl AcceptItemCopy.tmpl AcceptMarcUpload.tmpl ListFileRecords.tmpl mainmenu.tmpl marcimportdetail.tmpl uploadmarc.tmpl Log Message: Incomplete translation --- NEW FILE ---
New Record | New File
Record already in database
is already in the database with biblionumber and biblioitemnumber

Record entered into database
has been entered into the database with biblionumber and biblioitemnumber
Add a New Item for
"> "> ">
BARCODE"> Home Branch:
Replacement Price:
Notes

--- NEW FILE ---

Barcode '' has already been assigned.

Error :

Item added with barcode

Main Menu

--- NEW FILE ---

>Main Menu

Select a set of MARC records

\n

Upload a set of MARC records
Upload a set of MARC records:
?menu=" enctype="multipart/form-data">
Name this set of MARC records:
--- NEW FILE ---

Main Menu

Select a New File

! + + + + From acli at users.sourceforge.net Sun Feb 2 06:02:38 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 21:02:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/parameters admin-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv6497/default/es/parameters Modified Files: admin-home.tmpl Log Message: Wrong *-top.inc included Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/admin-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** admin-home.tmpl 2 Dec 2002 08:51:42 -0000 1.1 --- admin-home.tmpl 2 Feb 2003 05:02:35 -0000 1.2 *************** *** 1,3 **** !
Koha admin page


--- 1,3 ---- !
Koha admin page


From acli at users.sourceforge.net Sun Feb 2 06:02:38 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 21:02:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters admin-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv6497/default/pl/parameters Modified Files: admin-home.tmpl Log Message: Wrong *-top.inc included Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/admin-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** admin-home.tmpl 10 Jan 2003 14:49:37 -0000 1.1 --- admin-home.tmpl 2 Feb 2003 05:02:35 -0000 1.2 *************** *** 1,4 **** !

Zalogowany jako: [Wyloguj]

--- 1,4 ---- !

Zalogowany jako: [Wyloguj]

From acli at users.sourceforge.net Sun Feb 2 08:10:25 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:10:25 -0800 Subject: [Koha-cvs] CVS: koha/C4/Interface/CGI - New directory Message-ID: Update of /cvsroot/koha/koha/C4/Interface/CGI In directory sc8-pr-cvs1:/tmp/cvs-serv629/CGI Log Message: Directory /cvsroot/koha/koha/C4/Interface/CGI added to the repository From acli at users.sourceforge.net Sun Feb 2 08:18:39 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:39 -0800 Subject: [Koha-cvs] CVS: koha/C4/Interface/CGI Output.pm,NONE,1.1 Template.pm,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/C4/Interface/CGI In directory sc8-pr-cvs1:/tmp/cvs-serv1397/C4/Interface/CGI Added Files: Output.pm Template.pm 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 --- NEW FILE --- package C4::Interface::CGI::Output; # $Id: Output.pm,v 1.1 2003/02/02 07:18:37 acli Exp $ #package to work around problems in HTTP headers # Note: This is just a utility module; it should not be instantiated. # Copyright 2003 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License 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; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; =head1 NAME C4::CGI::Output - Convenience functions for handling outputting HTML pages =head1 SYNOPSIS use C4::CGI::Output; print $query->header(-type => C4::CGI::Output::gettype($output)), $output; =head1 DESCRIPTION The functions in this module peek into a piece of HTML and return strings related to the (guessed) charset. =head1 FUNCTIONS =over 2 =cut @ISA = qw(Exporter); @EXPORT = qw( &guesscharset &guesstype &output_html_with_http_headers ); =item guesscharset &guesscharset($output) "Guesses" the charset from the some HTML that would be output. C<$output> is the HTML page to be output. If it contains a META tag with a Content-Type, the tag will be scanned for a language code. This code is returned if it is found; undef is returned otherwise. This function only does sloppy guessing; it will be confused by unexpected things like SGML comments. What it basically does is to grab something that looks like a META tag and scan it. =cut sub guesscharset ($) { my($html) = @_; my $charset = undef; local($`, $&, $', $1, $2, $3); # FIXME... These regular expressions will miss a lot of valid tags! if ($html =~ //is) { $charset = $3; } elsif ($html =~ //is) { $charset = $2; } return $charset; } # guess sub guesstype ($) { my($html) = @_; my $charset = guesscharset($html); return defined $charset? "text/html; charset=$charset": "text/html"; } =item output_html_with_http_headers &output_html_with_http_headers($query, $cookie, $html) Outputs the HTML page $html with the appropriate HTTP headers, with the authentication cookie $cookie and a Content-Type that corresponds to the HTML page $html. =cut sub output_html_with_http_headers ($$$) { my($query, $cookie, $html) = @_; print $query->header( -type => guesstype($html), -cookie => $cookie, ), $html; } #--------------------------------- END { } # module clean-up code here (global destructor) 1; __END__ =back =head1 AUTHOR Koha Developement team =cut --- NEW FILE --- package C4::Interface::CGI::Template; # $Id: Template.pm,v 1.1 2003/02/02 07:18:37 acli Exp $ # convenience package for HTML templating # Note: This is just a utility module; it should not be instantiated. # Copyright 2003 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License 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; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; =head1 NAME C4::Members - Convenience functions for using HTML::Template =head1 SYNOPSIS use C4::Interface::HTML::Template; =head1 DESCRIPTION The functions in this module peek into a piece of HTML and return strings related to the (guessed) charset. =head1 FUNCTIONS =over 2 =cut @ISA = qw(Exporter); @EXPORT = qw( &expand_sex_into_predicate ); =item expand_sex_into_predicate $data{&expand_sex_into_predicate($data{sex})} = 1; Converts a single 'M' or 'F' into 'sex_M_p' or 'sex_F_p' respectively. In some languages, 'M' and 'F' are not appropriate. However, with HTML::Template, there is no way to localize 'M' or 'F' unless these are converted into variables that TMPL_IF can understand. This function provides this conversion. =cut sub expand_sex_into_predicate ($) { my($sex) = @_; return "sex_${sex}_p"; } # expand_sex_into_predicate #--------------------------------- END { } # module clean-up code here (global destructor) 1; __END__ =back =head1 AUTHOR Koha Developement team =cut From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/acqui newbasket2.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv1397/acqui Modified Files: newbasket2.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: newbasket2.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** newbasket2.pl 28 Jan 2003 15:01:42 -0000 1.9 --- newbasket2.pl 2 Feb 2003 07:18:37 -0000 1.10 *************** *** 29,33 **** use HTML::Template; use C4::Auth; ! use C4::Charset; my $env; --- 29,33 ---- use HTML::Template; use C4::Auth; ! use C4::Interface::CGI::Output; my $env; *************** *** 247,252 **** loopresult =>\@loopresult); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 247,249 ---- loopresult =>\@loopresult); ! output_html_with_http_headers $input, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:39 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:39 -0800 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 Message-ID: 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 => \@accountrows ); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 80,82 ---- accounts => \@accountrows ); ! 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 => \@cmemdata ); ! print $input->header(-cookie => $cookie),$template->output; --- 95,97 ---- cmemloop => \@cmemdata ); ! 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 => \@resultsdata ); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 79,81 ---- resultsloop => \@resultsdata ); ! 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 => \@reservedata); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 207,209 ---- reserveloop => \@reservedata); ! 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 => \@loop_reading); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 74,78 ---- limit => $limit, loop_reading => \@loop_reading); ! 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; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/t Charset.t,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/t In directory sc8-pr-cvs1:/tmp/cvs-serv1397/t Modified Files: Charset.t 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: Charset.t =================================================================== RCS file: /cvsroot/koha/koha/t/Charset.t,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Charset.t 19 Jan 2003 06:15:44 -0000 1.1 --- Charset.t 2 Feb 2003 07:18:38 -0000 1.2 *************** *** 1,4 **** use strict; ! use C4::Charset; use vars qw( @tests ); --- 1,4 ---- use strict; ! use C4::Interface::CGI::Output; use vars qw( @tests ); *************** *** 9,13 **** [ 'Normal HTML without meta tag', ! sub { C4::Charset::guesscharset($_[0]) }, undef, < --- 22,28 ---- EOF ], [ ! 'Result of guesstype with normal HTML with irrelevant meta tag', ! sub { guesstype($_[0]) }, ! 'text/html', < *************** *** 30,34 **** ], [ 'Result of guesscharset with normal HTML with relevant meta tag', ! sub { C4::Charset::guesscharset($_[0]) }, 'big5', < Update of /cvsroot/koha/koha/opac In directory sc8-pr-cvs1:/tmp/cvs-serv1397/opac Modified Files: opac-account.pl opac-detail.pl opac-main.pl opac-membership.pl opac-readingrecord.pl opac-reserve.pl opac-search.pl opac-searchresults.pl opac-sidebar.pl opac-user.pl opac-userdetails.pl opac-userupdate.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: opac-account.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-account.pl 19 Dec 2002 11:04:14 -0000 1.4 --- opac-account.pl 2 Feb 2003 07:18:38 -0000 1.5 *************** *** 56,59 **** #$template->param(loggeninuser => $loggedinuser); ! print $query->header(-cookie => $cookie), $template->output; --- 56,59 ---- #$template->param(loggeninuser => $loggedinuser); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-detail.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-detail.pl 20 Jan 2003 07:39:28 -0000 1.8 --- opac-detail.pl 2 Feb 2003 07:18:38 -0000 1.9 *************** *** 5,9 **** use C4::Search; use C4::Auth; ! use C4::Charset; use HTML::Template; --- 5,9 ---- use C4::Search; use C4::Auth; ! use C4::Interface::CGI::Output; use HTML::Template; *************** *** 55,61 **** $template->param(SITE_RESULTS => $sitearray); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 55,58 ---- $template->param(SITE_RESULTS => $sitearray); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-main.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-main.pl 20 Jan 2003 07:39:28 -0000 1.6 --- opac-main.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 6,10 **** use C4::Auth; # get_template_and_user ! use C4::Charset; my $query = new CGI; --- 6,10 ---- use C4::Auth; # get_template_and_user ! use C4::Interface::CGI::Output; my $query = new CGI; *************** *** 18,23 **** }); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 18,20 ---- }); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-membership.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-membership.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-membership.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-membership.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 16,18 **** }); ! print $query->header(-cookie => $cookie), $template->output; --- 16,18 ---- }); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-readingrecord.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-readingrecord.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-readingrecord.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 52,55 **** ! print $query->header(-cookie => $cookie), $template->output; --- 52,55 ---- ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-reserve.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-reserve.pl 19 Dec 2002 11:04:15 -0000 1.5 --- opac-reserve.pl 2 Feb 2003 07:18:38 -0000 1.6 *************** *** 226,228 **** ! print $query->header(-cookie => $cookie), $template->output; --- 226,228 ---- ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-search.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** opac-search.pl 20 Jan 2003 07:39:28 -0000 1.7 --- opac-search.pl 2 Feb 2003 07:18:38 -0000 1.8 *************** *** 4,8 **** use C4::Auth; ! use C4::Charset; use C4::Context; use CGI; --- 4,8 ---- use C4::Auth; ! use C4::Interface::CGI::Output; use C4::Context; use CGI; *************** *** 33,38 **** $template->param(classlist => $classlist); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 33,35 ---- $template->param(classlist => $classlist); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-searchresults.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-searchresults.pl 20 Jan 2003 07:39:28 -0000 1.8 --- opac-searchresults.pl 2 Feb 2003 07:18:38 -0000 1.9 *************** *** 5,9 **** use C4::Search; use C4::Auth; ! use C4::Charset; use HTML::Template; --- 5,9 ---- use C4::Search; use C4::Auth; ! use C4::Interface::CGI::Output; use HTML::Template; *************** *** 128,134 **** $template->param(numbers => $numbers); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 128,131 ---- $template->param(numbers => $numbers); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-sidebar.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-sidebar.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-sidebar.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 29,31 **** $template->param(url => $self_url); ! print $query->header(-cookie => $cookie), $template->output; --- 29,31 ---- $template->param(url => $self_url); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-user.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-user.pl 19 Dec 2002 11:04:15 -0000 1.6 --- opac-user.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 132,135 **** $template->param(waiting_count => $wcount); ! print $query->header(-cookie => $cookie), $template->output; --- 132,135 ---- $template->param(waiting_count => $wcount); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-userdetails.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-userdetails.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-userdetails.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 31,34 **** $template->param($borr); ! print $query->header(-cookie => $cookie), $template->output; --- 31,34 ---- $template->param($borr); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-userupdate.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-userupdate.pl 19 Dec 2002 11:04:15 -0000 1.6 --- opac-userupdate.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 69,71 **** $template->param(BORROWER_INFO => \@bordat); ! print $query->header(-cookie => $cookie), $template->output; --- 69,71 ---- $template->param(BORROWER_INFO => \@bordat); ! output_html_with_http_headers $query, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/search.marc search.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv1397/search.marc Modified Files: search.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: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.marc/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 2 Feb 2003 00:13:10 -0000 1.2 --- search.pl 2 Feb 2003 07:18:38 -0000 1.3 *************** *** 27,31 **** use C4::Auth; use C4::Output; ! use C4::Charset; use C4::Biblio; use C4::SearchMarc; --- 27,31 ---- use C4::Auth; use C4::Output; ! use C4::Interface::CGI::Output; use C4::Biblio; use C4::SearchMarc; *************** *** 109,114 **** } # Print the page ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 109,111 ---- } # Print the page ! output_html_with_http_headers $query, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members moremember.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv1397/koha-tmpl/intranet-tmpl/default/zh-TW/members Modified Files: moremember.tmpl 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: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** moremember.tmpl 2 Feb 2003 04:56:47 -0000 1.1 --- moremember.tmpl 2 Feb 2003 07:18:38 -0000 1.2 *************** *** 40,44 **** 出生日期：
! 姓別：

Alternative Contact:
Phone:
--- 40,45 ---- 出生日期：
! 姓別：男女 !

Alternative Contact:
Phone:
From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1397/circ Modified Files: branchtransfers.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: branchtransfers.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** branchtransfers.pl 28 Jan 2003 00:48:36 -0000 1.15 --- branchtransfers.pl 2 Feb 2003 07:18:38 -0000 1.16 *************** *** 283,287 **** errmsgloop => \@errmsgloop ); ! print $query->header(-cookie=>$sessioncookie), $template->output; --- 283,287 ---- errmsgloop => \@errmsgloop ); ! output_html_with_http_headers $query, $sessioncookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [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 Message-ID: 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 From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [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 Message-ID: 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; From acli at users.sourceforge.net Sun Feb 2 08:19:31 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:19:31 -0800 Subject: [Koha-cvs] CVS: koha/C4 Charset.pm,1.1,NONE Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv2385 Removed Files: Charset.pm Log Message: Moved C4/Charset.pm to C4/Interface/CGI/Output.pm --- Charset.pm DELETED --- From acli at users.sourceforge.net Sun Feb 2 08:44:08 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:44:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members moremember.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv6674/members Modified Files: moremember.tmpl Log Message: Additional translation Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** moremember.tmpl 2 Feb 2003 07:18:38 -0000 1.2 --- moremember.tmpl 2 Feb 2003 07:44:06 -0000 1.3 *************** *** 117,121 ****

! --- 117,121 ---- ! *************** *** 134,141 **** ! ! ! ! ! ! ! !

對不起，KOHA覺得您好像沒有權限來到這頁。

Sorry, your session has timed out, please login again.

您的IP位址改變了，請重新登入。

您剛才輸入的圖書證編號或密碼不對，請重新輸入。.
Select a Record to Import from
> " [Viewing to of records] |
Search still pending... processing... No results found for query ?file=&numrecord=>
--- NEW FILE ---

Main Menu

--- NEW FILE --- > ()

New Record

Full MARC Record available at bottom
Title" size=40 maxlenght=255>
Subtitle" size=40 maxlenght=255>
Author" size=40 maxlenght=255>
Additional authors
Illustrator" size=40 maxlenght=255>
Copyright" size=20 maxlenght=80>
Series Title" size=40 maxlenght=255>
Volume" size=40 maxlenght=255>
Number" size=40 maxlenght=255>
Volume Date" size=40 maxlenght=255>
Volume Description" size=40 maxlenght=255>
Subject" size=40 maxlenght=255>
Notes" size=40 maxlenght=255>
Item Type
ISBN" size=40 maxlenght=40>
ISSN" size=40 maxlenght=40>
LCCN" size=40 maxlenght=40>
Dewey" size=8 maxlenght=10>
Subclass" size=40 maxlenght=40>
Publication Year" size=5 maxlenght=10>
Publisher" size=40 maxlenght=255>
Place" size=40 maxlenght=255>
Pages" size=5 maxlenght=10>
Size" size=40 maxlenght=40>
"> "> ">
MARC RECORD
      "> 
--- NEW FILE ---

>Main Menu

Select a set of MARC records

Upload a set of MARC records
Upload a set of MARC records:
?menu=" enctype="multipart/form-data">
> Name this set of MARC records:
From acli at users.sourceforge.net Sun Feb 2 05:57:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:57:49 -0800 Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.8,1.9 readingrec.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv5273 Modified Files: MARCdetail.pl readingrec.pl Log Message: Handle non-latin1 charsets Index: MARCdetail.pl =================================================================== RCS file: /cvsroot/koha/koha/MARCdetail.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** MARCdetail.pl 12 Dec 2002 16:33:58 -0000 1.8 --- MARCdetail.pl 2 Feb 2003 04:57:47 -0000 1.9 *************** *** 27,34 **** =head1 DESCRIPTION ! This script needs a biblionumber in bib parameter (bibnumber from koha style DB. Automaticaly maps to marc biblionumber). ! It shows the biblio in a (nice) MARC format depending on MARC parameters tables. ! The template is in /catalogue/MARCdetail.tmpl. this template must be divided in 11 "tabs". ! The 10 firsts presents the biblio, the 11th one presents the items attached to the biblio =head1 FUNCTIONS --- 27,41 ---- =head1 DESCRIPTION ! This script needs a biblionumber in bib parameter (bibnumber ! from koha style DB. Automaticaly maps to marc biblionumber). ! ! It shows the biblio in a (nice) MARC format depending on MARC ! parameters tables. ! ! The template is in /catalogue/MARCdetail.tmpl. ! this template must be divided into 11 "tabs". ! ! The first 10 tabs present the biblio, the 11th one presents ! the items attached to the biblio =head1 FUNCTIONS *************** *** 154,157 **** biblionumber => $biblionumber, bibid => $bibid); ! print $query->header(-cookie => $cookie),$template->output; --- 161,167 ---- biblionumber => $biblionumber, bibid => $bibid); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; Index: readingrec.pl =================================================================== RCS file: /cvsroot/koha/koha/readingrec.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** readingrec.pl 13 Dec 2002 10:21:59 -0000 1.5 --- readingrec.pl 2 Feb 2003 04:57:47 -0000 1.6 *************** *** 26,29 **** --- 26,30 ---- use C4::Auth; use C4::Output; + use C4::Charset; use CGI; use C4::Search; *************** *** 73,77 **** limit => $limit, loop_reading => \@loop_reading); ! print $input->header(-cookie => $cookie),$template->output; --- 74,81 ---- limit => $limit, loop_reading => \@loop_reading); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; From acli at users.sourceforge.net Sun Feb 2 05:58:11 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:58:11 -0800 Subject: [Koha-cvs] CVS: koha/admin aqbookfund.pl,1.10,1.11 aqbudget.pl,1.9,1.10 authorised_values.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1:/tmp/cvs-serv5381/admin Modified Files: aqbookfund.pl aqbudget.pl authorised_values.pl Log Message: Handle non-latin1 charsets Index: aqbookfund.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** aqbookfund.pl 28 Jan 2003 13:04:08 -0000 1.10 --- aqbookfund.pl 2 Feb 2003 04:58:08 -0000 1.11 *************** *** 43,46 **** --- 43,47 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 206,208 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 207,212 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; Index: aqbudget.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** aqbudget.pl 28 Jan 2003 13:04:09 -0000 1.9 --- aqbudget.pl 2 Feb 2003 04:58:08 -0000 1.10 *************** *** 43,46 **** --- 43,47 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 227,230 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 228,234 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; Index: authorised_values.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** authorised_values.pl 10 Dec 2002 17:35:52 -0000 1.4 --- authorised_values.pl 2 Feb 2003 04:58:08 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 189,191 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 190,195 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; From acli at users.sourceforge.net Sun Feb 2 05:59:41 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:59:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue catalogue-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv5511/default/en/catalogue Modified Files: catalogue-home.tmpl Log Message: The search interface takes a barcode from the item number field; adjusting the display to match Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catalogue-home.tmpl 10 Oct 2002 16:17:08 -0000 1.1 --- catalogue-home.tmpl 2 Feb 2003 04:59:39 -0000 1.2 *************** *** 24,28 ****

Item Number     OR
Biblio#AuthorTitle
何時到期 類別Charge 續借
何時到期 類別費用 續借
! ">On Request - no renewals ! " value=y>Y ! " value=n>N --- 134,140 ---- ! ">項目被預訂，不可續借 ! " value=y>嘗試續借
" value=n>毋須續借 From acli at users.sourceforge.net Sun Feb 2 09:47:04 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sun, 02 Feb 2003 00:47:04 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.53,1.54 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv22217/C4 Modified Files: Search.pm Log Message: Distinguish between On Loan, Item Lost, and Withdrawn, instead of saying just "not available". Cf. Bug 112 Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** Search.pm 28 Jan 2003 14:46:50 -0000 1.53 --- Search.pm 2 Feb 2003 08:47:01 -0000 1.54 *************** *** 1,4 **** package C4::Search; - #require '/u/acli/lib/cvs.pl'; # XXX # Copyright 2000-2002 Katipo Communications --- 1,3 ---- *************** *** 2152,2174 **** while (my $data=$sth->fetchrow_hashref){ $counts{'total'}++; - my $query2="select * from issues,items where issues.itemnumber= - '$data->{'itemnumber'}' and returndate is NULL - and items.itemnumber=issues.itemnumber and ((items.itemlost <>1 and - items.itemlost <> 2) or items.itemlost is NULL) - and (wthdrawn <> 1 or wthdrawn is NULL)"; ! my $sth2=$dbh->prepare($query2); ! $sth2->execute; ! # FIXME - fetchrow_hashref() can fail for any number of reasons ! # (e.g., a database server crash). Perhaps use a left join of some ! # sort for this? ! if (my $data2=$sth2->fetchrow_hashref){ ! $counts{'not available'}++; ! #my $x = "Not available, data2=" . (defined $data2? CGI::escapeHTML(cvs($data2)): "undef"); ! #$counts{$x}++; #XXX ! } else { ! $counts{$data->{'branchname'}}++; } ! $sth2->finish; } my $query2="Select * from aqorders where biblionumber=$bibnum and --- 2151,2187 ---- while (my $data=$sth->fetchrow_hashref){ $counts{'total'}++; ! my $status; ! for my $test ( ! [ ! 'Item Lost', ! 'select * from items ! where itemnumber=? ! and not ((items.itemlost <>1 and items.itemlost <> 2) ! or items.itemlost is NULL)' ! ], [ ! 'Withdrawn', ! 'select * from items ! where itemnumber=? and not (wthdrawn <> 1 or wthdrawn is NULL)' ! ], [ ! 'On Loan', "select * from issues,items ! where issues.itemnumber=? and returndate is NULL ! and items.itemnumber=issues.itemnumber" ! ], ! ) { ! my($testlabel, $query2) = @$test; ! ! my $sth2=$dbh->prepare($query2); ! $sth2->execute($data->{'itemnumber'}); ! ! # FIXME - fetchrow_hashref() can fail for any number of reasons ! # (e.g., a database server crash). Perhaps use a left join of some ! # sort for this? ! $status = $testlabel if $sth2->fetchrow_hashref; ! $sth2->finish; ! last if defined $status; } ! $status = $data->{'branchname'} unless defined $status; ! $counts{$status}++; } my $query2="Select * from aqorders where biblionumber=$bibnum and From acli at users.sourceforge.net Mon Feb 3 02:58:57 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sun, 02 Feb 2003 17:58:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-search.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1:/tmp/cvs-serv8588/en Modified Files: opac-search.tmpl Log Message: Wrong field name "item" specified, should be "itemnumber" The "Item number" is actually the barcode; wording corrected (Bug 168) Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-search.tmpl 6 Jan 2003 10:08:15 -0000 1.8 --- opac-search.tmpl 3 Feb 2003 01:58:55 -0000 1.9 *************** *** 49,53 **** -->
Item Number
Barcode
Num廨o d'exemplaire
Num廨o d'exemplaire
Item Number
Barcode
Item Number
條碼
登入 Koha
圖書證編號：
密　　　碼：
--- NEW FILE ---


&type="intra"> ()

BARCODE
Home Branch:
Current Branch:
Date arrived at current branch:
Number of issues since since the above date :
Branch No. of Issues Last seen at branch
--- NEW FILE --- 賬目一覽

 

罰款、手續費等 金額 未付款項
總欠款額

 

--- NEW FILE ---

Each box needs to be filled in with fine,time to start charging,charging cycle
eg 1,7,7 = $1 fine, after 7 days, every 7 days.

--- NEW FILE ---

TitleAuthorItem CountBiblionumber
>
&startfrom=>Previous Records &startfrom=>Next Records

Results through of records.
--- NEW FILE --- WELCOME TO THE KOHA INTRANET
館藏查詢

Koha: Intranet 模組
在上面空格輸入關鍵字，再按回車鍵即可。
-進階搜尋 (更多選項)
讀者搜尋

在上面空格輸入讀者姓名，再按回車鍵即可。
書藉購置
報表列印
系統設定
流通服務
--- NEW FILE ---

Manual Credit

">
讀者編號
類別
Itemnumber
說明
金額
--- NEW FILE ---

手發收據

">
讀者編號
類別
Itemnumber
說明
金額
--- NEW FILE --- ">Modify Website Links
"> ">
Author ">
Title ">
Abstract
Subject ...
Copyright Date ">
Series Title ">
Additional Author ">
Subtitle ">
Unititle ">
Notes
Serial ">
Analytic Author
Analytic Title

--- NEW FILE ---
"&type=intra> ()
Modify Group -
"> ">
RE-ASSIGN TO EXISTING GROUP
OR MODIFY DETAILS
Item Type" size=20>
URL " size="20">
Class" size=20>
Publisher" size=20>
Place" size=20>
ISBN" size=20>
Publication Year" size=20>
Pages" size=20>
Illustrations" size=20>
Volume " size=20>
Notes ">
Size " size=20>
CHANGES TO AFFECT THESE BARCODES
Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.
  Barcode Location Date Due Last Seen
"> "&bib=""&bi=""">

HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some items, tick the appropriate ones and a new group record will be created automatically for them.

 

--- NEW FILE --- ()
"> "> "> "> "> "> "> "> "> ">
Barcode" size=40>
ItemNotes
Home Branch" size=40>
Lost checked > Yes checked > No
Cancelled checked > Yes checked > No
--- NEW FILE ---

">Return to Details Page EOF

"> ">
Title ">
Description
URL ">

Add another Website Link

">
Title
Description
URL
EOF --- NEW FILE --- Invalid cardnumber.

" value="">
--- NEW FILE ---

'Confirm Record'

" > " >
"> NEW MEMBER &nbpsq;
Name
"> MEMBERSHIP DETAILS &nbpsq;
Membership Number
Date Of Birth
Sex
School
General Notes

" value="">
--- NEW FILE ---

Confirm Record

" > " > " > " > " > " > " >
"> NEW MEMBER  
Name
"> MEMBERSHIP DETAILS  
Membership Number
Card Number
Membership Category
Area
Fee
Joining Date
Expiry Date
Joining Branch
"> PERSONAL DETAILS  
Ethnicity
Date Of Birth
Sex
"> MEMBER ADRESS  
Postal Adress
Home Adress
"> MEMBER CONTACT DETAIL  
Phone (Home)
Phone (Daytime)
Fax
E-mail
"> ALTERNATIVE CONTACT DETAIL  
Name
Phone
Relationship
Notes
"> NOTES  
General Notes

" value="">
--- NEW FILE --- WELCOME TO THE KOHA OPAC

Koha: Horowhenua Library Trust Catalogue and Member Services		 Search the Catalogue
   

Type in the box and press the enter key.
-Advanced Search (More Options)

Logged in as: [Log Out]

Log In to Koha

--- NEW FILE --- Items Overdue as of

Due Date Patron Phone Title Author
?subject=Overdue: ">
--- NEW FILE ---

reports

--- NEW FILE ---
    
--- NEW FILE --- >Results with dewey | >Results with biblionumber
--- NEW FILE ---

Logged in as: [Log Out]

Shelf List

Add a book by barcode:

"> Contents of shelf
">"> " width=10 align=center> "> " width=10 align=center> "> " width=10 align=center> ">

"> ">

Modify Shelf Contents

Bookshelves

"> Select Shelves to Delete
"> "> ( books)

Add Shelf:

">
"> Shelf List
"> "> ( books)

Add or Remove Book Shelves --- NEW FILE --- Thesaurus value builder for category <TMPL_VAR name="category">


"> "> ">

"> "> ">
"> "> insert a new authority :
--- NEW FILE ---

Click submit to force the subject
" value=""> ">
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,NONE,1.1 aqbookfund.tmpl,NONE,1.1 aqbudget.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 thesaurus.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv4979/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl systempreferences.tmpl thesaurus.tmpl Log Message: Incomplete translation --- NEW FILE ---

您目前登入為: [登出]

登入 Koha

Koha的系統設定
系統參數
書目相關設定
Item types 各種館藏的分類
budget the budgets allowed to differents book funds.
book funds the differents book funds.
容許值 設定容許值的類別及相關的容許值。 在機讀格式結構的設定裡，可指定某些分欄只能用某些「容許值」，令輸入書目時可以減少錯誤或更加方便
Thesaurus Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
機讀格式 (MARC) 相關設定
定義機讀格式的結構機讀格式的結構：欄及分欄
定義機讀格式和koha資料庫間的連結定義Koha資料庫和機讀格式資料庫間的關係。註：使用「定義機讀格式的結構」功能也可做到這點，但用這個工具做連結會快一些。
核對機讀格式結構核實機讀格式結構的定義有沒有導致資料庫不能正常操作的嚴重錯誤。處理真正的資料前，務必用這個核一核對！
其他參數
分館設定 這套 Koha 伺服器由哪些圖書館共用
讀者類別 設定不同的讀者類別
幣值設定 書藉供應商用什麼貨幣
打印機設定 印表機 (UNIX 路徑) 設定
stopword 查詢時應該省略的字眼
Z39.50 伺服器 用來查詢機讀格式資料的各伺服器
系統偏好 其他影響系統運作的偏好設定
相關工具
匯出
MARC biblio export 以機讀格式匯出
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 bookfund admin
method=post>

You Searched for


"
Book fundNameGroupBudget     
  ">Budget ?op=add_form&bookfundid= ">Edit ?op=delete_confirm&bookfundid=">Delete  

      


 

Book fund>
Book fund
Name 
Group
 
 data recorded

 

data deleted
"" --- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 Budget admin

You Searched for


Book fund
Name
Group
CONFIRM DELETION
>
Book fundStart dateEnd dateBudget amount  
() ">Edit ">Delete
      

Book fund>
Book fund
Book fund
Start date 
End date
Budget amount
 

 

data recorded
" data deleted
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

Book fund
Start date
End date
budgetamount
CONFIRM DELETION
類別
容許值
Lib
  ">
"> 設定容許值

This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.

When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorised values

另開新類別
Variable 說明
Value
真的要刪除嗎？
類別 容許值 說明    
">更改 ">刪除
">

--- NEW FILE ---

Logged in as: [Log out]

登入 Koha

分館編碼
館名"> 
Address
 
 
Phone
Fax
E-mail
 
 Confirm delete:
>

method=post>
分館一覽
館名 編碼 地址 類別  

分館類別
類別 編碼 說明
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

Choose and validate 1 of the following for .

"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">

To "unmap", click ==>
"> ">
MARC links

Koha 欄位 欄號 分欄 說明
">更改
--- NEW FILE ---

您目前登入為: [登出]

登入 to Koha

欄號 給圖書館員看的說明 / 給讀者看的說明 Repet Mand Koha 欄位 在那格出現 Authorised value or
Thesaurus category
-

or
or

Note : in the last column, you can choose :

  • An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table
  • A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table
  • A "value builder" : values builders are perl programm that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly

 data deleted
'>
分欄
 
真的要刪除嗎？
">
是否 是否 ">刪除
">返回欄號設定
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

欄號
給館員看的說明
給讀者看的說明
Repeatable
Mandatory
Authorised value (if you select a value here, the indicators will be limited to the authorised value list)
 
 data deleted
MARC tag structure admin
欄號
 
真的要刪除這整個欄嗎？
欄號 說明 Repeatable Mandatory Authorised
value		 分欄    
是否 是否 ">設定分欄 ">更改 ">刪除


--- NEW FILE ---

目前登入為: [登出]

登入 Koha

參數
現值
 
 data recorded
data deleted
系統設定
Variable
Value
CONFIRM DELETION
參數 現值 說明    
">更改 ">刪除


--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 Thesaurus management
Values related to ()


Other forms    
">Edit ">Delete
"> ">

Category
Authority lib " maxlength="80" size="80">
Other lib " maxlength="80" size="80">
  "> "> "> "> "> "> ">
lib
Value
">
CONFIRM DELETION of this entry and all entries depending from this one
 Thesaurus management

Manages thesaurus and authorities files.

    Dig : see datas depending from this one
    Related : see other forms of this authority entry

"> "> ">

checked>Top hierarchy only "> New category... &search_category=">
  free form Authority Dig Related    
  Dig Related ">Edit ">Delete
From acli at users.sourceforge.net Sun Feb 2 05:56:48 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes acquisitions-bottom.inc,NONE,1.1 acquisitions-top.inc,NONE,1.1 cat-bottom.inc,NONE,1.1 cat-class-list.inc,NONE,1.1 cat-top.inc,NONE,1.1 circulation-bottom.inc,NONE,1.1 circulation-top.inc,NONE,1.1 issues-bottom.inc,NONE,1.1 issues-top.inc,NONE,1.1 members-bottom.inc,NONE,1.1 members-top.inc,NONE,1.1 opac-bottom.inc,NONE,1.1 opac-top.inc,NONE,1.1 parameters-bottom.inc,NONE,1.1 parameters-top.inc,NONE,1.1 reports-bottom.inc,NONE,1.1 reports-top.inc,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1:/tmp/cvs-serv4979/includes Added Files: acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-class-list.inc cat-top.inc circulation-bottom.inc circulation-top.inc issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc opac-bottom.inc opac-top.inc parameters-bottom.inc parameters-top.inc reports-bottom.inc reports-top.inc Log Message: Incomplete translation --- NEW FILE ---

 

返回主頁 || 流通服務 || 館藏查詢 || 讀者帳戶 || 書藉購置 || 報表列印 || 系統設定 || 使用說明
--- NEW FILE --- KOHA: INTRANET: Acquisitions

KOHA: 主選單
Catalogue Members Acquisitions Reports Circulation Home
--- NEW FILE ---

 

返回主頁 || 流通服務 || 館藏查詢 || 讀者帳戶 || 書藉購置 || 報表列印 || 系統設定 || 使用說明
--- NEW FILE ---

 

--- NEW FILE ---
Add New Junior Member
">
PARENT OR GUARDIAN
Title Given Names* Surname* Membership No.
 
CHILD
Member# , Card Number* size=20 value="">
value="">
size=20 value=""> size=20 value=""> size=10 value=""> F M* size=20 value="">
Given Names* Surname* Date of Birth
(dd/mm/yy)*		   School
Notes
 
--- NEW FILE --- 尋找讀者
您找的是「」

圖書證編號 姓 名 類別 地址 OD/Issues 罰款 備註


個入 機構
--- NEW FILE --- <TMPL_VAR NAME=header>
讀者編號 #, 圖書證號碼*
個人資料 * checked>女 checked>男     出生日期 (年/月/日)
Title Initials 名* 姓* Prefered Name
 
 
族裔 族裔備註    讀者類別*
 
讀者地址
Postal Address* 市* 區
 
住址 (如與上列不同) 市
 
聯絡方法
Phone (Home) Phone (day) 傳真 電郵
 
ALTERNATE CONTACT DETAILS
姓名* 電話 關係*
 
備註
 
館方專用
備註
 
FLAGS
>是 >否
--- NEW FILE ---

Logged in as: [登出]

登入 Koha

 尋找讀者

1
尋找讀者
續借書籍、登記新讀者、或給現有的讀者更新或刪除記錄，統統都由這個搜尋開始。
在上列空格內輸入讀者姓名、姓名的一部分、或圖書證編號，再按回車鍵即可。

2
瀏覽讀者記錄
A || B || C || D || E || F || G || H || I || J || K || L || M || N || O || P || Q || R || S || T || U || V || W || X || Y || Z

--- NEW FILE ---

讀者資料


(, )

圖書證編號：
Postal Address: ,
住址：,
Phone (Home):
Phone (Daytime):
傳真：
電郵：">
Textmessaging:

讀者編號：
Membership:
區別：
費用：$30/year, Paid
Joined: , Expires:
Joining Branch:

族裔：,
出生日期：
姓別：

Alternative Contact:
Phone:
Relationship:
備註：

Guarantees:">
 Guarantor: ">
no guarantor

General Notes:

">

罰款、手續費等
&bib=&bi=">  
> >

">
借出項目
書名 何時到期 類別 Charge 續借
&bib=&bi="> ">On Request - no renewals " value=y>Y " value=n>N

"> ">
預約項目
書名 預約日期 取消預約
">

">

--- NEW FILE --- Pay Fines for

">
FINES & CHARGES AMOUNT OWING
" value="no" checked>Unpaid " value="yes">Pay " value="wo">Writeoff " value=""> " value=""> " value=""> " value=""> " value=""> " value="">
Total Due

 

--- NEW FILE ---
&limit=full">所有項目
&order=title&limit=">書名 &order=author&limit=">作者 &limit=">日期 Volume
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/reports reports-home.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/reports In directory sc8-pr-cvs1:/tmp/cvs-serv4979/reports Added Files: reports-home.tmpl Log Message: Incomplete translation --- NEW FILE --- Reports
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc result.tmpl,NONE,1.1 search.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv4979/search.marc Added Files: result.tmpl search.tmpl Log Message: Incomplete translation --- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" >
Biblio# Author Title
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" >
Search
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" align=center valign=center> 0  
From acli at users.sourceforge.net Sun Feb 2 05:56:48 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/marcimport AcceptBiblioitem.tmpl,NONE,1.1 AcceptItemCopy.tmpl,NONE,1.1 AcceptMarcUpload.tmpl,NONE,1.1 ListFileRecords.tmpl,NONE,1.1 mainmenu.tmpl,NONE,1.1 marcimportdetail.tmpl,NONE,1.1 uploadmarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv4979/marcimport Added Files: AcceptBiblioitem.tmpl AcceptItemCopy.tmpl AcceptMarcUpload.tmpl ListFileRecords.tmpl mainmenu.tmpl marcimportdetail.tmpl uploadmarc.tmpl Log Message: Incomplete translation --- NEW FILE ---
New Record | New File
Record already in database
is already in the database with biblionumber and biblioitemnumber

Record entered into database
has been entered into the database with biblionumber and biblioitemnumber
Add a New Item for
"> "> ">
BARCODE"> Home Branch:
Replacement Price:
Notes

--- NEW FILE ---

Barcode '' has already been assigned.

Error :

Item added with barcode

Main Menu

--- NEW FILE ---

>Main Menu

Select a set of MARC records

\n

Upload a set of MARC records
Upload a set of MARC records:
?menu=" enctype="multipart/form-data">
Name this set of MARC records:
--- NEW FILE ---

Main Menu

Select a New File

! + + + + From acli at users.sourceforge.net Sun Feb 2 06:02:38 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 21:02:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/parameters admin-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv6497/default/es/parameters Modified Files: admin-home.tmpl Log Message: Wrong *-top.inc included Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/admin-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** admin-home.tmpl 2 Dec 2002 08:51:42 -0000 1.1 --- admin-home.tmpl 2 Feb 2003 05:02:35 -0000 1.2 *************** *** 1,3 **** !
Koha admin page


--- 1,3 ---- !
Koha admin page


From acli at users.sourceforge.net Sun Feb 2 06:02:38 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 21:02:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters admin-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv6497/default/pl/parameters Modified Files: admin-home.tmpl Log Message: Wrong *-top.inc included Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/admin-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** admin-home.tmpl 10 Jan 2003 14:49:37 -0000 1.1 --- admin-home.tmpl 2 Feb 2003 05:02:35 -0000 1.2 *************** *** 1,4 **** !

Zalogowany jako: [Wyloguj]

--- 1,4 ---- !

Zalogowany jako: [Wyloguj]

From acli at users.sourceforge.net Sun Feb 2 08:10:25 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:10:25 -0800 Subject: [Koha-cvs] CVS: koha/C4/Interface/CGI - New directory Message-ID: Update of /cvsroot/koha/koha/C4/Interface/CGI In directory sc8-pr-cvs1:/tmp/cvs-serv629/CGI Log Message: Directory /cvsroot/koha/koha/C4/Interface/CGI added to the repository From acli at users.sourceforge.net Sun Feb 2 08:18:39 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:39 -0800 Subject: [Koha-cvs] CVS: koha/C4/Interface/CGI Output.pm,NONE,1.1 Template.pm,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/C4/Interface/CGI In directory sc8-pr-cvs1:/tmp/cvs-serv1397/C4/Interface/CGI Added Files: Output.pm Template.pm 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 --- NEW FILE --- package C4::Interface::CGI::Output; # $Id: Output.pm,v 1.1 2003/02/02 07:18:37 acli Exp $ #package to work around problems in HTTP headers # Note: This is just a utility module; it should not be instantiated. # Copyright 2003 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License 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; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; =head1 NAME C4::CGI::Output - Convenience functions for handling outputting HTML pages =head1 SYNOPSIS use C4::CGI::Output; print $query->header(-type => C4::CGI::Output::gettype($output)), $output; =head1 DESCRIPTION The functions in this module peek into a piece of HTML and return strings related to the (guessed) charset. =head1 FUNCTIONS =over 2 =cut @ISA = qw(Exporter); @EXPORT = qw( &guesscharset &guesstype &output_html_with_http_headers ); =item guesscharset &guesscharset($output) "Guesses" the charset from the some HTML that would be output. C<$output> is the HTML page to be output. If it contains a META tag with a Content-Type, the tag will be scanned for a language code. This code is returned if it is found; undef is returned otherwise. This function only does sloppy guessing; it will be confused by unexpected things like SGML comments. What it basically does is to grab something that looks like a META tag and scan it. =cut sub guesscharset ($) { my($html) = @_; my $charset = undef; local($`, $&, $', $1, $2, $3); # FIXME... These regular expressions will miss a lot of valid tags! if ($html =~ //is) { $charset = $3; } elsif ($html =~ //is) { $charset = $2; } return $charset; } # guess sub guesstype ($) { my($html) = @_; my $charset = guesscharset($html); return defined $charset? "text/html; charset=$charset": "text/html"; } =item output_html_with_http_headers &output_html_with_http_headers($query, $cookie, $html) Outputs the HTML page $html with the appropriate HTTP headers, with the authentication cookie $cookie and a Content-Type that corresponds to the HTML page $html. =cut sub output_html_with_http_headers ($$$) { my($query, $cookie, $html) = @_; print $query->header( -type => guesstype($html), -cookie => $cookie, ), $html; } #--------------------------------- END { } # module clean-up code here (global destructor) 1; __END__ =back =head1 AUTHOR Koha Developement team =cut --- NEW FILE --- package C4::Interface::CGI::Template; # $Id: Template.pm,v 1.1 2003/02/02 07:18:37 acli Exp $ # convenience package for HTML templating # Note: This is just a utility module; it should not be instantiated. # Copyright 2003 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License 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; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; =head1 NAME C4::Members - Convenience functions for using HTML::Template =head1 SYNOPSIS use C4::Interface::HTML::Template; =head1 DESCRIPTION The functions in this module peek into a piece of HTML and return strings related to the (guessed) charset. =head1 FUNCTIONS =over 2 =cut @ISA = qw(Exporter); @EXPORT = qw( &expand_sex_into_predicate ); =item expand_sex_into_predicate $data{&expand_sex_into_predicate($data{sex})} = 1; Converts a single 'M' or 'F' into 'sex_M_p' or 'sex_F_p' respectively. In some languages, 'M' and 'F' are not appropriate. However, with HTML::Template, there is no way to localize 'M' or 'F' unless these are converted into variables that TMPL_IF can understand. This function provides this conversion. =cut sub expand_sex_into_predicate ($) { my($sex) = @_; return "sex_${sex}_p"; } # expand_sex_into_predicate #--------------------------------- END { } # module clean-up code here (global destructor) 1; __END__ =back =head1 AUTHOR Koha Developement team =cut From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/acqui newbasket2.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv1397/acqui Modified Files: newbasket2.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: newbasket2.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** newbasket2.pl 28 Jan 2003 15:01:42 -0000 1.9 --- newbasket2.pl 2 Feb 2003 07:18:37 -0000 1.10 *************** *** 29,33 **** use HTML::Template; use C4::Auth; ! use C4::Charset; my $env; --- 29,33 ---- use HTML::Template; use C4::Auth; ! use C4::Interface::CGI::Output; my $env; *************** *** 247,252 **** loopresult =>\@loopresult); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 247,249 ---- loopresult =>\@loopresult); ! output_html_with_http_headers $input, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:39 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:39 -0800 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 Message-ID: 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 => \@accountrows ); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 80,82 ---- accounts => \@accountrows ); ! 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 => \@cmemdata ); ! print $input->header(-cookie => $cookie),$template->output; --- 95,97 ---- cmemloop => \@cmemdata ); ! 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 => \@resultsdata ); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 79,81 ---- resultsloop => \@resultsdata ); ! 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 => \@reservedata); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 207,209 ---- reserveloop => \@reservedata); ! 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 => \@loop_reading); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 74,78 ---- limit => $limit, loop_reading => \@loop_reading); ! 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; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/t Charset.t,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/t In directory sc8-pr-cvs1:/tmp/cvs-serv1397/t Modified Files: Charset.t 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: Charset.t =================================================================== RCS file: /cvsroot/koha/koha/t/Charset.t,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Charset.t 19 Jan 2003 06:15:44 -0000 1.1 --- Charset.t 2 Feb 2003 07:18:38 -0000 1.2 *************** *** 1,4 **** use strict; ! use C4::Charset; use vars qw( @tests ); --- 1,4 ---- use strict; ! use C4::Interface::CGI::Output; use vars qw( @tests ); *************** *** 9,13 **** [ 'Normal HTML without meta tag', ! sub { C4::Charset::guesscharset($_[0]) }, undef, < --- 22,28 ---- EOF ], [ ! 'Result of guesstype with normal HTML with irrelevant meta tag', ! sub { guesstype($_[0]) }, ! 'text/html', < *************** *** 30,34 **** ], [ 'Result of guesscharset with normal HTML with relevant meta tag', ! sub { C4::Charset::guesscharset($_[0]) }, 'big5', < Update of /cvsroot/koha/koha/opac In directory sc8-pr-cvs1:/tmp/cvs-serv1397/opac Modified Files: opac-account.pl opac-detail.pl opac-main.pl opac-membership.pl opac-readingrecord.pl opac-reserve.pl opac-search.pl opac-searchresults.pl opac-sidebar.pl opac-user.pl opac-userdetails.pl opac-userupdate.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: opac-account.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-account.pl 19 Dec 2002 11:04:14 -0000 1.4 --- opac-account.pl 2 Feb 2003 07:18:38 -0000 1.5 *************** *** 56,59 **** #$template->param(loggeninuser => $loggedinuser); ! print $query->header(-cookie => $cookie), $template->output; --- 56,59 ---- #$template->param(loggeninuser => $loggedinuser); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-detail.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-detail.pl 20 Jan 2003 07:39:28 -0000 1.8 --- opac-detail.pl 2 Feb 2003 07:18:38 -0000 1.9 *************** *** 5,9 **** use C4::Search; use C4::Auth; ! use C4::Charset; use HTML::Template; --- 5,9 ---- use C4::Search; use C4::Auth; ! use C4::Interface::CGI::Output; use HTML::Template; *************** *** 55,61 **** $template->param(SITE_RESULTS => $sitearray); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 55,58 ---- $template->param(SITE_RESULTS => $sitearray); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-main.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-main.pl 20 Jan 2003 07:39:28 -0000 1.6 --- opac-main.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 6,10 **** use C4::Auth; # get_template_and_user ! use C4::Charset; my $query = new CGI; --- 6,10 ---- use C4::Auth; # get_template_and_user ! use C4::Interface::CGI::Output; my $query = new CGI; *************** *** 18,23 **** }); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 18,20 ---- }); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-membership.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-membership.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-membership.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-membership.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 16,18 **** }); ! print $query->header(-cookie => $cookie), $template->output; --- 16,18 ---- }); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-readingrecord.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-readingrecord.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-readingrecord.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 52,55 **** ! print $query->header(-cookie => $cookie), $template->output; --- 52,55 ---- ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-reserve.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-reserve.pl 19 Dec 2002 11:04:15 -0000 1.5 --- opac-reserve.pl 2 Feb 2003 07:18:38 -0000 1.6 *************** *** 226,228 **** ! print $query->header(-cookie => $cookie), $template->output; --- 226,228 ---- ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-search.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** opac-search.pl 20 Jan 2003 07:39:28 -0000 1.7 --- opac-search.pl 2 Feb 2003 07:18:38 -0000 1.8 *************** *** 4,8 **** use C4::Auth; ! use C4::Charset; use C4::Context; use CGI; --- 4,8 ---- use C4::Auth; ! use C4::Interface::CGI::Output; use C4::Context; use CGI; *************** *** 33,38 **** $template->param(classlist => $classlist); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 33,35 ---- $template->param(classlist => $classlist); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-searchresults.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-searchresults.pl 20 Jan 2003 07:39:28 -0000 1.8 --- opac-searchresults.pl 2 Feb 2003 07:18:38 -0000 1.9 *************** *** 5,9 **** use C4::Search; use C4::Auth; ! use C4::Charset; use HTML::Template; --- 5,9 ---- use C4::Search; use C4::Auth; ! use C4::Interface::CGI::Output; use HTML::Template; *************** *** 128,134 **** $template->param(numbers => $numbers); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 128,131 ---- $template->param(numbers => $numbers); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-sidebar.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-sidebar.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-sidebar.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 29,31 **** $template->param(url => $self_url); ! print $query->header(-cookie => $cookie), $template->output; --- 29,31 ---- $template->param(url => $self_url); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-user.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-user.pl 19 Dec 2002 11:04:15 -0000 1.6 --- opac-user.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 132,135 **** $template->param(waiting_count => $wcount); ! print $query->header(-cookie => $cookie), $template->output; --- 132,135 ---- $template->param(waiting_count => $wcount); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-userdetails.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-userdetails.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-userdetails.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 31,34 **** $template->param($borr); ! print $query->header(-cookie => $cookie), $template->output; --- 31,34 ---- $template->param($borr); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-userupdate.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-userupdate.pl 19 Dec 2002 11:04:15 -0000 1.6 --- opac-userupdate.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 69,71 **** $template->param(BORROWER_INFO => \@bordat); ! print $query->header(-cookie => $cookie), $template->output; --- 69,71 ---- $template->param(BORROWER_INFO => \@bordat); ! output_html_with_http_headers $query, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/search.marc search.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv1397/search.marc Modified Files: search.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: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.marc/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 2 Feb 2003 00:13:10 -0000 1.2 --- search.pl 2 Feb 2003 07:18:38 -0000 1.3 *************** *** 27,31 **** use C4::Auth; use C4::Output; ! use C4::Charset; use C4::Biblio; use C4::SearchMarc; --- 27,31 ---- use C4::Auth; use C4::Output; ! use C4::Interface::CGI::Output; use C4::Biblio; use C4::SearchMarc; *************** *** 109,114 **** } # Print the page ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 109,111 ---- } # Print the page ! output_html_with_http_headers $query, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members moremember.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv1397/koha-tmpl/intranet-tmpl/default/zh-TW/members Modified Files: moremember.tmpl 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: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** moremember.tmpl 2 Feb 2003 04:56:47 -0000 1.1 --- moremember.tmpl 2 Feb 2003 07:18:38 -0000 1.2 *************** *** 40,44 **** 出生日期：
! 姓別：

Alternative Contact:
Phone:
--- 40,45 ---- 出生日期：
! 姓別：男女 !

Alternative Contact:
Phone:
From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1397/circ Modified Files: branchtransfers.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: branchtransfers.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** branchtransfers.pl 28 Jan 2003 00:48:36 -0000 1.15 --- branchtransfers.pl 2 Feb 2003 07:18:38 -0000 1.16 *************** *** 283,287 **** errmsgloop => \@errmsgloop ); ! print $query->header(-cookie=>$sessioncookie), $template->output; --- 283,287 ---- errmsgloop => \@errmsgloop ); ! output_html_with_http_headers $query, $sessioncookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [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 Message-ID: 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 From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [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 Message-ID: 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; From acli at users.sourceforge.net Sun Feb 2 08:19:31 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:19:31 -0800 Subject: [Koha-cvs] CVS: koha/C4 Charset.pm,1.1,NONE Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv2385 Removed Files: Charset.pm Log Message: Moved C4/Charset.pm to C4/Interface/CGI/Output.pm --- Charset.pm DELETED --- From acli at users.sourceforge.net Sun Feb 2 08:44:08 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:44:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members moremember.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv6674/members Modified Files: moremember.tmpl Log Message: Additional translation Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** moremember.tmpl 2 Feb 2003 07:18:38 -0000 1.2 --- moremember.tmpl 2 Feb 2003 07:44:06 -0000 1.3 *************** *** 117,121 ****

! --- 117,121 ---- ! *************** *** 134,141 **** ! ! ! ! ! ! ! !

對不起，KOHA覺得您好像沒有權限來到這頁。

Sorry, your session has timed out, please login again.

您的IP位址改變了，請重新登入。

您剛才輸入的圖書證編號或密碼不對，請重新輸入。.
Select a Record to Import from
> " [Viewing to of records] |
Search still pending... processing... No results found for query ?file=&numrecord=>
--- NEW FILE ---

Main Menu

--- NEW FILE --- > ()

New Record

Full MARC Record available at bottom
Title" size=40 maxlenght=255>
Subtitle" size=40 maxlenght=255>
Author" size=40 maxlenght=255>
Additional authors
Illustrator" size=40 maxlenght=255>
Copyright" size=20 maxlenght=80>
Series Title" size=40 maxlenght=255>
Volume" size=40 maxlenght=255>
Number" size=40 maxlenght=255>
Volume Date" size=40 maxlenght=255>
Volume Description" size=40 maxlenght=255>
Subject" size=40 maxlenght=255>
Notes" size=40 maxlenght=255>
Item Type
ISBN" size=40 maxlenght=40>
ISSN" size=40 maxlenght=40>
LCCN" size=40 maxlenght=40>
Dewey" size=8 maxlenght=10>
Subclass" size=40 maxlenght=40>
Publication Year" size=5 maxlenght=10>
Publisher" size=40 maxlenght=255>
Place" size=40 maxlenght=255>
Pages" size=5 maxlenght=10>
Size" size=40 maxlenght=40>
"> "> ">
MARC RECORD
      "> 
--- NEW FILE ---

>Main Menu

Select a set of MARC records

Upload a set of MARC records
Upload a set of MARC records:
?menu=" enctype="multipart/form-data">
> Name this set of MARC records:
From acli at users.sourceforge.net Sun Feb 2 05:57:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:57:49 -0800 Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.8,1.9 readingrec.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv5273 Modified Files: MARCdetail.pl readingrec.pl Log Message: Handle non-latin1 charsets Index: MARCdetail.pl =================================================================== RCS file: /cvsroot/koha/koha/MARCdetail.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** MARCdetail.pl 12 Dec 2002 16:33:58 -0000 1.8 --- MARCdetail.pl 2 Feb 2003 04:57:47 -0000 1.9 *************** *** 27,34 **** =head1 DESCRIPTION ! This script needs a biblionumber in bib parameter (bibnumber from koha style DB. Automaticaly maps to marc biblionumber). ! It shows the biblio in a (nice) MARC format depending on MARC parameters tables. ! The template is in /catalogue/MARCdetail.tmpl. this template must be divided in 11 "tabs". ! The 10 firsts presents the biblio, the 11th one presents the items attached to the biblio =head1 FUNCTIONS --- 27,41 ---- =head1 DESCRIPTION ! This script needs a biblionumber in bib parameter (bibnumber ! from koha style DB. Automaticaly maps to marc biblionumber). ! ! It shows the biblio in a (nice) MARC format depending on MARC ! parameters tables. ! ! The template is in /catalogue/MARCdetail.tmpl. ! this template must be divided into 11 "tabs". ! ! The first 10 tabs present the biblio, the 11th one presents ! the items attached to the biblio =head1 FUNCTIONS *************** *** 154,157 **** biblionumber => $biblionumber, bibid => $bibid); ! print $query->header(-cookie => $cookie),$template->output; --- 161,167 ---- biblionumber => $biblionumber, bibid => $bibid); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; Index: readingrec.pl =================================================================== RCS file: /cvsroot/koha/koha/readingrec.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** readingrec.pl 13 Dec 2002 10:21:59 -0000 1.5 --- readingrec.pl 2 Feb 2003 04:57:47 -0000 1.6 *************** *** 26,29 **** --- 26,30 ---- use C4::Auth; use C4::Output; + use C4::Charset; use CGI; use C4::Search; *************** *** 73,77 **** limit => $limit, loop_reading => \@loop_reading); ! print $input->header(-cookie => $cookie),$template->output; --- 74,81 ---- limit => $limit, loop_reading => \@loop_reading); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; From acli at users.sourceforge.net Sun Feb 2 05:58:11 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:58:11 -0800 Subject: [Koha-cvs] CVS: koha/admin aqbookfund.pl,1.10,1.11 aqbudget.pl,1.9,1.10 authorised_values.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1:/tmp/cvs-serv5381/admin Modified Files: aqbookfund.pl aqbudget.pl authorised_values.pl Log Message: Handle non-latin1 charsets Index: aqbookfund.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** aqbookfund.pl 28 Jan 2003 13:04:08 -0000 1.10 --- aqbookfund.pl 2 Feb 2003 04:58:08 -0000 1.11 *************** *** 43,46 **** --- 43,47 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 206,208 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 207,212 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; Index: aqbudget.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** aqbudget.pl 28 Jan 2003 13:04:09 -0000 1.9 --- aqbudget.pl 2 Feb 2003 04:58:08 -0000 1.10 *************** *** 43,46 **** --- 43,47 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 227,230 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 228,234 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; Index: authorised_values.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** authorised_values.pl 10 Dec 2002 17:35:52 -0000 1.4 --- authorised_values.pl 2 Feb 2003 04:58:08 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 189,191 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 190,195 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; From acli at users.sourceforge.net Sun Feb 2 05:59:41 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:59:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue catalogue-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv5511/default/en/catalogue Modified Files: catalogue-home.tmpl Log Message: The search interface takes a barcode from the item number field; adjusting the display to match Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catalogue-home.tmpl 10 Oct 2002 16:17:08 -0000 1.1 --- catalogue-home.tmpl 2 Feb 2003 04:59:39 -0000 1.2 *************** *** 24,28 ****

Item Number     OR
Biblio#AuthorTitle
何時到期 類別Charge 續借
何時到期 類別費用 續借
! ">On Request - no renewals ! " value=y>Y ! " value=n>N --- 134,140 ---- ! ">項目被預訂，不可續借 ! " value=y>嘗試續借
" value=n>毋須續借 From acli at users.sourceforge.net Sun Feb 2 09:47:04 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sun, 02 Feb 2003 00:47:04 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.53,1.54 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv22217/C4 Modified Files: Search.pm Log Message: Distinguish between On Loan, Item Lost, and Withdrawn, instead of saying just "not available". Cf. Bug 112 Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** Search.pm 28 Jan 2003 14:46:50 -0000 1.53 --- Search.pm 2 Feb 2003 08:47:01 -0000 1.54 *************** *** 1,4 **** package C4::Search; - #require '/u/acli/lib/cvs.pl'; # XXX # Copyright 2000-2002 Katipo Communications --- 1,3 ---- *************** *** 2152,2174 **** while (my $data=$sth->fetchrow_hashref){ $counts{'total'}++; - my $query2="select * from issues,items where issues.itemnumber= - '$data->{'itemnumber'}' and returndate is NULL - and items.itemnumber=issues.itemnumber and ((items.itemlost <>1 and - items.itemlost <> 2) or items.itemlost is NULL) - and (wthdrawn <> 1 or wthdrawn is NULL)"; ! my $sth2=$dbh->prepare($query2); ! $sth2->execute; ! # FIXME - fetchrow_hashref() can fail for any number of reasons ! # (e.g., a database server crash). Perhaps use a left join of some ! # sort for this? ! if (my $data2=$sth2->fetchrow_hashref){ ! $counts{'not available'}++; ! #my $x = "Not available, data2=" . (defined $data2? CGI::escapeHTML(cvs($data2)): "undef"); ! #$counts{$x}++; #XXX ! } else { ! $counts{$data->{'branchname'}}++; } ! $sth2->finish; } my $query2="Select * from aqorders where biblionumber=$bibnum and --- 2151,2187 ---- while (my $data=$sth->fetchrow_hashref){ $counts{'total'}++; ! my $status; ! for my $test ( ! [ ! 'Item Lost', ! 'select * from items ! where itemnumber=? ! and not ((items.itemlost <>1 and items.itemlost <> 2) ! or items.itemlost is NULL)' ! ], [ ! 'Withdrawn', ! 'select * from items ! where itemnumber=? and not (wthdrawn <> 1 or wthdrawn is NULL)' ! ], [ ! 'On Loan', "select * from issues,items ! where issues.itemnumber=? and returndate is NULL ! and items.itemnumber=issues.itemnumber" ! ], ! ) { ! my($testlabel, $query2) = @$test; ! ! my $sth2=$dbh->prepare($query2); ! $sth2->execute($data->{'itemnumber'}); ! ! # FIXME - fetchrow_hashref() can fail for any number of reasons ! # (e.g., a database server crash). Perhaps use a left join of some ! # sort for this? ! $status = $testlabel if $sth2->fetchrow_hashref; ! $sth2->finish; ! last if defined $status; } ! $status = $data->{'branchname'} unless defined $status; ! $counts{$status}++; } my $query2="Select * from aqorders where biblionumber=$bibnum and From acli at users.sourceforge.net Mon Feb 3 02:58:57 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sun, 02 Feb 2003 17:58:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-search.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1:/tmp/cvs-serv8588/en Modified Files: opac-search.tmpl Log Message: Wrong field name "item" specified, should be "itemnumber" The "Item number" is actually the barcode; wording corrected (Bug 168) Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-search.tmpl 6 Jan 2003 10:08:15 -0000 1.8 --- opac-search.tmpl 3 Feb 2003 01:58:55 -0000 1.9 *************** *** 49,53 **** -->
Item Number
Barcode
Num廨o d'exemplaire
Num廨o d'exemplaire
Item Number
Barcode
Item Number
條碼
登入 Koha
圖書證編號：
密　　　碼：
--- NEW FILE ---


&type="intra"> ()

BARCODE
Home Branch:
Current Branch:
Date arrived at current branch:
Number of issues since since the above date :
Branch No. of Issues Last seen at branch
--- NEW FILE --- 賬目一覽

 

罰款、手續費等 金額 未付款項
總欠款額

 

--- NEW FILE ---

Each box needs to be filled in with fine,time to start charging,charging cycle
eg 1,7,7 = $1 fine, after 7 days, every 7 days.

--- NEW FILE ---

TitleAuthorItem CountBiblionumber
>
&startfrom=>Previous Records &startfrom=>Next Records

Results through of records.
--- NEW FILE --- WELCOME TO THE KOHA INTRANET
館藏查詢

Koha: Intranet 模組
在上面空格輸入關鍵字，再按回車鍵即可。
-進階搜尋 (更多選項)
讀者搜尋

在上面空格輸入讀者姓名，再按回車鍵即可。
書藉購置
報表列印
系統設定
流通服務
--- NEW FILE ---

Manual Credit

">
讀者編號
類別
Itemnumber
說明
金額
--- NEW FILE ---

手發收據

">
讀者編號
類別
Itemnumber
說明
金額
--- NEW FILE --- ">Modify Website Links
"> ">
Author ">
Title ">
Abstract
Subject ...
Copyright Date ">
Series Title ">
Additional Author ">
Subtitle ">
Unititle ">
Notes
Serial ">
Analytic Author
Analytic Title

--- NEW FILE ---
"&type=intra> ()
Modify Group -
"> ">
RE-ASSIGN TO EXISTING GROUP
OR MODIFY DETAILS
Item Type" size=20>
URL " size="20">
Class" size=20>
Publisher" size=20>
Place" size=20>
ISBN" size=20>
Publication Year" size=20>
Pages" size=20>
Illustrations" size=20>
Volume " size=20>
Notes ">
Size " size=20>
CHANGES TO AFFECT THESE BARCODES
Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.
  Barcode Location Date Due Last Seen
"> "&bib=""&bi=""">

HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some items, tick the appropriate ones and a new group record will be created automatically for them.

 

--- NEW FILE --- ()
"> "> "> "> "> "> "> "> "> ">
Barcode" size=40>
ItemNotes
Home Branch" size=40>
Lost checked > Yes checked > No
Cancelled checked > Yes checked > No
--- NEW FILE ---

">Return to Details Page EOF

"> ">
Title ">
Description
URL ">

Add another Website Link

">
Title
Description
URL
EOF --- NEW FILE --- Invalid cardnumber.

" value="">
--- NEW FILE ---

'Confirm Record'

" > " >
"> NEW MEMBER &nbpsq;
Name
"> MEMBERSHIP DETAILS &nbpsq;
Membership Number
Date Of Birth
Sex
School
General Notes

" value="">
--- NEW FILE ---

Confirm Record

" > " > " > " > " > " > " >
"> NEW MEMBER  
Name
"> MEMBERSHIP DETAILS  
Membership Number
Card Number
Membership Category
Area
Fee
Joining Date
Expiry Date
Joining Branch
"> PERSONAL DETAILS  
Ethnicity
Date Of Birth
Sex
"> MEMBER ADRESS  
Postal Adress
Home Adress
"> MEMBER CONTACT DETAIL  
Phone (Home)
Phone (Daytime)
Fax
E-mail
"> ALTERNATIVE CONTACT DETAIL  
Name
Phone
Relationship
Notes
"> NOTES  
General Notes

" value="">
--- NEW FILE --- WELCOME TO THE KOHA OPAC

Koha: Horowhenua Library Trust Catalogue and Member Services		 Search the Catalogue
   

Type in the box and press the enter key.
-Advanced Search (More Options)

Logged in as: [Log Out]

Log In to Koha

--- NEW FILE --- Items Overdue as of

Due Date Patron Phone Title Author
?subject=Overdue: ">
--- NEW FILE ---

reports

--- NEW FILE ---
    
--- NEW FILE --- >Results with dewey | >Results with biblionumber
--- NEW FILE ---

Logged in as: [Log Out]

Shelf List

Add a book by barcode:

"> Contents of shelf
">"> " width=10 align=center> "> " width=10 align=center> "> " width=10 align=center> ">

"> ">

Modify Shelf Contents

Bookshelves

"> Select Shelves to Delete
"> "> ( books)

Add Shelf:

">
"> Shelf List
"> "> ( books)

Add or Remove Book Shelves --- NEW FILE --- Thesaurus value builder for category <TMPL_VAR name="category">


"> "> ">

"> "> ">
"> "> insert a new authority :
--- NEW FILE ---

Click submit to force the subject
" value=""> ">
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,NONE,1.1 aqbookfund.tmpl,NONE,1.1 aqbudget.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 thesaurus.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv4979/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl systempreferences.tmpl thesaurus.tmpl Log Message: Incomplete translation --- NEW FILE ---

您目前登入為: [登出]

登入 Koha

Koha的系統設定
系統參數
書目相關設定
Item types 各種館藏的分類
budget the budgets allowed to differents book funds.
book funds the differents book funds.
容許值 設定容許值的類別及相關的容許值。 在機讀格式結構的設定裡，可指定某些分欄只能用某些「容許值」，令輸入書目時可以減少錯誤或更加方便
Thesaurus Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
機讀格式 (MARC) 相關設定
定義機讀格式的結構機讀格式的結構：欄及分欄
定義機讀格式和koha資料庫間的連結定義Koha資料庫和機讀格式資料庫間的關係。註：使用「定義機讀格式的結構」功能也可做到這點，但用這個工具做連結會快一些。
核對機讀格式結構核實機讀格式結構的定義有沒有導致資料庫不能正常操作的嚴重錯誤。處理真正的資料前，務必用這個核一核對！
其他參數
分館設定 這套 Koha 伺服器由哪些圖書館共用
讀者類別 設定不同的讀者類別
幣值設定 書藉供應商用什麼貨幣
打印機設定 印表機 (UNIX 路徑) 設定
stopword 查詢時應該省略的字眼
Z39.50 伺服器 用來查詢機讀格式資料的各伺服器
系統偏好 其他影響系統運作的偏好設定
相關工具
匯出
MARC biblio export 以機讀格式匯出
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 bookfund admin
method=post>

You Searched for


"
Book fundNameGroupBudget     
  ">Budget ?op=add_form&bookfundid= ">Edit ?op=delete_confirm&bookfundid=">Delete  

      


 

Book fund>
Book fund
Name 
Group
 
 data recorded

 

data deleted
"" --- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 Budget admin

You Searched for


Book fund
Name
Group
CONFIRM DELETION
>
Book fundStart dateEnd dateBudget amount  
() ">Edit ">Delete
      

Book fund>
Book fund
Book fund
Start date 
End date
Budget amount
 

 

data recorded
" data deleted
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

Book fund
Start date
End date
budgetamount
CONFIRM DELETION
類別
容許值
Lib
  ">
"> 設定容許值

This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.

When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorised values

另開新類別
Variable 說明
Value
真的要刪除嗎？
類別 容許值 說明    
">更改 ">刪除
">

--- NEW FILE ---

Logged in as: [Log out]

登入 Koha

分館編碼
館名"> 
Address
 
 
Phone
Fax
E-mail
 
 Confirm delete:
>

method=post>
分館一覽
館名 編碼 地址 類別  

分館類別
類別 編碼 說明
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

Choose and validate 1 of the following for .

"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">

To "unmap", click ==>
"> ">
MARC links

Koha 欄位 欄號 分欄 說明
">更改
--- NEW FILE ---

您目前登入為: [登出]

登入 to Koha

欄號 給圖書館員看的說明 / 給讀者看的說明 Repet Mand Koha 欄位 在那格出現 Authorised value or
Thesaurus category
-

or
or

Note : in the last column, you can choose :

  • An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table
  • A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table
  • A "value builder" : values builders are perl programm that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly

 data deleted
'>
分欄
 
真的要刪除嗎？
">
是否 是否 ">刪除
">返回欄號設定
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

欄號
給館員看的說明
給讀者看的說明
Repeatable
Mandatory
Authorised value (if you select a value here, the indicators will be limited to the authorised value list)
 
 data deleted
MARC tag structure admin
欄號
 
真的要刪除這整個欄嗎？
欄號 說明 Repeatable Mandatory Authorised
value		 分欄    
是否 是否 ">設定分欄 ">更改 ">刪除


--- NEW FILE ---

目前登入為: [登出]

登入 Koha

參數
現值
 
 data recorded
data deleted
系統設定
Variable
Value
CONFIRM DELETION
參數 現值 說明    
">更改 ">刪除


--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 Thesaurus management
Values related to ()


Other forms    
">Edit ">Delete
"> ">

Category
Authority lib " maxlength="80" size="80">
Other lib " maxlength="80" size="80">
  "> "> "> "> "> "> ">
lib
Value
">
CONFIRM DELETION of this entry and all entries depending from this one
 Thesaurus management

Manages thesaurus and authorities files.

    Dig : see datas depending from this one
    Related : see other forms of this authority entry

"> "> ">

checked>Top hierarchy only "> New category... &search_category=">
  free form Authority Dig Related    
  Dig Related ">Edit ">Delete
From acli at users.sourceforge.net Sun Feb 2 05:56:48 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes acquisitions-bottom.inc,NONE,1.1 acquisitions-top.inc,NONE,1.1 cat-bottom.inc,NONE,1.1 cat-class-list.inc,NONE,1.1 cat-top.inc,NONE,1.1 circulation-bottom.inc,NONE,1.1 circulation-top.inc,NONE,1.1 issues-bottom.inc,NONE,1.1 issues-top.inc,NONE,1.1 members-bottom.inc,NONE,1.1 members-top.inc,NONE,1.1 opac-bottom.inc,NONE,1.1 opac-top.inc,NONE,1.1 parameters-bottom.inc,NONE,1.1 parameters-top.inc,NONE,1.1 reports-bottom.inc,NONE,1.1 reports-top.inc,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1:/tmp/cvs-serv4979/includes Added Files: acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-class-list.inc cat-top.inc circulation-bottom.inc circulation-top.inc issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc opac-bottom.inc opac-top.inc parameters-bottom.inc parameters-top.inc reports-bottom.inc reports-top.inc Log Message: Incomplete translation --- NEW FILE ---

 

返回主頁 || 流通服務 || 館藏查詢 || 讀者帳戶 || 書藉購置 || 報表列印 || 系統設定 || 使用說明
--- NEW FILE --- KOHA: INTRANET: Acquisitions

KOHA: 主選單
Catalogue Members Acquisitions Reports Circulation Home
--- NEW FILE ---

 

返回主頁 || 流通服務 || 館藏查詢 || 讀者帳戶 || 書藉購置 || 報表列印 || 系統設定 || 使用說明
--- NEW FILE ---

 

--- NEW FILE ---
Add New Junior Member
">
PARENT OR GUARDIAN
Title Given Names* Surname* Membership No.
 
CHILD
Member# , Card Number* size=20 value="">
value="">
size=20 value=""> size=20 value=""> size=10 value=""> F M* size=20 value="">
Given Names* Surname* Date of Birth
(dd/mm/yy)*		   School
Notes
 
--- NEW FILE --- ?M??????
?z?????O?u?v

???????s?? ?m ?W ???O ?a?} OD/Issues ?@?? ????


???J ???c
--- NEW FILE --- <TMPL_VAR NAME=header>
?????s?? #, ?????????X*
???H???? * checked>?k checked>?k     ?X?????? (?~/??/??)
Title Initials ?W* ?m* Prefered Name
 
 
???? ????????    ???????O*
 
?????a?}
Postal Address* ??* ??
 
???} (?p?P?W?C???P) ??
 
?p?????k
Phone (Home) Phone (day) ???u ?q?l
 
ALTERNATE CONTACT DETAILS
?m?W* ?q?? ???Y*
 
????
 
?]???M??
????
 
FLAGS
>?O >?_
--- NEW FILE ---

Logged in as: [?n?X]

?n?J Koha

 ?M??????

1
?M??????
???????y?B?n?O?s?????B?????{???????????s???R???O???A?????????o???j?M?}?l?C
?b?W?C?????????J?????m?W?B?m?W???@?????B?????????s???A?A???^?????Y?i?C

2
?s???????O??
A || B || C || D || E || F || G || H || I || J || K || L || M || N || O || P || Q || R || S || T || U || V || W || X || Y || Z

--- NEW FILE ---

????????


(, )

???????s???G
Postal Address: ,
???}?G,
Phone (Home):
Phone (Daytime):
???u?G
?q?l?G">
Textmessaging:

?????s???G
Membership:
???O?G
?O???G$30/year, Paid
Joined: , Expires:
Joining Branch:

?????G,
?X???????G
?m?O?G

Alternative Contact:
Phone:
Relationship:
?????G

Guarantees:">
 Guarantor: ">
no guarantor

General Notes:

">

?@???B?????O??
&bib=&bi=">  
> >

">
???X????
???W ???????? ???O Charge ????
&bib=&bi="> ">On Request - no renewals " value=y>Y " value=n>N

"> ">
?w??????
???W ?w?????? ?????w??
">

">

--- NEW FILE --- Pay Fines for

">
FINES & CHARGES AMOUNT OWING
" value="no" checked>Unpaid " value="yes">Pay " value="wo">Writeoff " value=""> " value=""> " value=""> " value=""> " value=""> " value="">
Total Due

 

--- NEW FILE ---
&limit=full">????????
&order=title&limit=">???W &order=author&limit=">?@?? &limit=">???? Volume
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/reports reports-home.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/reports In directory sc8-pr-cvs1:/tmp/cvs-serv4979/reports Added Files: reports-home.tmpl Log Message: Incomplete translation --- NEW FILE --- Reports
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc result.tmpl,NONE,1.1 search.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv4979/search.marc Added Files: result.tmpl search.tmpl Log Message: Incomplete translation --- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" >
Biblio# Author Title
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" >
Search
bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif" align=center valign=center> 0  
From acli at users.sourceforge.net Sun Feb 2 05:56:48 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/marcimport AcceptBiblioitem.tmpl,NONE,1.1 AcceptItemCopy.tmpl,NONE,1.1 AcceptMarcUpload.tmpl,NONE,1.1 ListFileRecords.tmpl,NONE,1.1 mainmenu.tmpl,NONE,1.1 marcimportdetail.tmpl,NONE,1.1 uploadmarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/marcimport In directory sc8-pr-cvs1:/tmp/cvs-serv4979/marcimport Added Files: AcceptBiblioitem.tmpl AcceptItemCopy.tmpl AcceptMarcUpload.tmpl ListFileRecords.tmpl mainmenu.tmpl marcimportdetail.tmpl uploadmarc.tmpl Log Message: Incomplete translation --- NEW FILE ---
New Record | New File
Record already in database
is already in the database with biblionumber and biblioitemnumber

Record entered into database
has been entered into the database with biblionumber and biblioitemnumber
Add a New Item for
"> "> ">
BARCODE"> Home Branch:
Replacement Price:
Notes

--- NEW FILE ---

Barcode '' has already been assigned.

Error :

Item added with barcode

Main Menu

--- NEW FILE ---

>Main Menu

Select a set of MARC records

\n

Upload a set of MARC records
Upload a set of MARC records:
?menu=" enctype="multipart/form-data">
Name this set of MARC records:
--- NEW FILE ---

Main Menu

Select a New File

! + + + + From acli at users.sourceforge.net Sun Feb 2 06:02:38 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 21:02:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/parameters admin-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv6497/default/es/parameters Modified Files: admin-home.tmpl Log Message: Wrong *-top.inc included Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/admin-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** admin-home.tmpl 2 Dec 2002 08:51:42 -0000 1.1 --- admin-home.tmpl 2 Feb 2003 05:02:35 -0000 1.2 *************** *** 1,3 **** !
Koha admin page


--- 1,3 ---- !
Koha admin page


From acli at users.sourceforge.net Sun Feb 2 06:02:38 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 21:02:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters admin-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv6497/default/pl/parameters Modified Files: admin-home.tmpl Log Message: Wrong *-top.inc included Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/admin-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** admin-home.tmpl 10 Jan 2003 14:49:37 -0000 1.1 --- admin-home.tmpl 2 Feb 2003 05:02:35 -0000 1.2 *************** *** 1,4 **** !

Zalogowany jako: [Wyloguj]

--- 1,4 ---- !

Zalogowany jako: [Wyloguj]

From acli at users.sourceforge.net Sun Feb 2 08:10:25 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:10:25 -0800 Subject: [Koha-cvs] CVS: koha/C4/Interface/CGI - New directory Message-ID: Update of /cvsroot/koha/koha/C4/Interface/CGI In directory sc8-pr-cvs1:/tmp/cvs-serv629/CGI Log Message: Directory /cvsroot/koha/koha/C4/Interface/CGI added to the repository From acli at users.sourceforge.net Sun Feb 2 08:18:39 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:39 -0800 Subject: [Koha-cvs] CVS: koha/C4/Interface/CGI Output.pm,NONE,1.1 Template.pm,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/C4/Interface/CGI In directory sc8-pr-cvs1:/tmp/cvs-serv1397/C4/Interface/CGI Added Files: Output.pm Template.pm 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 --- NEW FILE --- package C4::Interface::CGI::Output; # $Id: Output.pm,v 1.1 2003/02/02 07:18:37 acli Exp $ #package to work around problems in HTTP headers # Note: This is just a utility module; it should not be instantiated. # Copyright 2003 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License 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; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; =head1 NAME C4::CGI::Output - Convenience functions for handling outputting HTML pages =head1 SYNOPSIS use C4::CGI::Output; print $query->header(-type => C4::CGI::Output::gettype($output)), $output; =head1 DESCRIPTION The functions in this module peek into a piece of HTML and return strings related to the (guessed) charset. =head1 FUNCTIONS =over 2 =cut @ISA = qw(Exporter); @EXPORT = qw( &guesscharset &guesstype &output_html_with_http_headers ); =item guesscharset &guesscharset($output) "Guesses" the charset from the some HTML that would be output. C<$output> is the HTML page to be output. If it contains a META tag with a Content-Type, the tag will be scanned for a language code. This code is returned if it is found; undef is returned otherwise. This function only does sloppy guessing; it will be confused by unexpected things like SGML comments. What it basically does is to grab something that looks like a META tag and scan it. =cut sub guesscharset ($) { my($html) = @_; my $charset = undef; local($`, $&, $', $1, $2, $3); # FIXME... These regular expressions will miss a lot of valid tags! if ($html =~ //is) { $charset = $3; } elsif ($html =~ //is) { $charset = $2; } return $charset; } # guess sub guesstype ($) { my($html) = @_; my $charset = guesscharset($html); return defined $charset? "text/html; charset=$charset": "text/html"; } =item output_html_with_http_headers &output_html_with_http_headers($query, $cookie, $html) Outputs the HTML page $html with the appropriate HTTP headers, with the authentication cookie $cookie and a Content-Type that corresponds to the HTML page $html. =cut sub output_html_with_http_headers ($$$) { my($query, $cookie, $html) = @_; print $query->header( -type => guesstype($html), -cookie => $cookie, ), $html; } #--------------------------------- END { } # module clean-up code here (global destructor) 1; __END__ =back =head1 AUTHOR Koha Developement team =cut --- NEW FILE --- package C4::Interface::CGI::Template; # $Id: Template.pm,v 1.1 2003/02/02 07:18:37 acli Exp $ # convenience package for HTML templating # Note: This is just a utility module; it should not be instantiated. # Copyright 2003 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License 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; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; =head1 NAME C4::Members - Convenience functions for using HTML::Template =head1 SYNOPSIS use C4::Interface::HTML::Template; =head1 DESCRIPTION The functions in this module peek into a piece of HTML and return strings related to the (guessed) charset. =head1 FUNCTIONS =over 2 =cut @ISA = qw(Exporter); @EXPORT = qw( &expand_sex_into_predicate ); =item expand_sex_into_predicate $data{&expand_sex_into_predicate($data{sex})} = 1; Converts a single 'M' or 'F' into 'sex_M_p' or 'sex_F_p' respectively. In some languages, 'M' and 'F' are not appropriate. However, with HTML::Template, there is no way to localize 'M' or 'F' unless these are converted into variables that TMPL_IF can understand. This function provides this conversion. =cut sub expand_sex_into_predicate ($) { my($sex) = @_; return "sex_${sex}_p"; } # expand_sex_into_predicate #--------------------------------- END { } # module clean-up code here (global destructor) 1; __END__ =back =head1 AUTHOR Koha Developement team =cut From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/acqui newbasket2.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1:/tmp/cvs-serv1397/acqui Modified Files: newbasket2.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: newbasket2.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** newbasket2.pl 28 Jan 2003 15:01:42 -0000 1.9 --- newbasket2.pl 2 Feb 2003 07:18:37 -0000 1.10 *************** *** 29,33 **** use HTML::Template; use C4::Auth; ! use C4::Charset; my $env; --- 29,33 ---- use HTML::Template; use C4::Auth; ! use C4::Interface::CGI::Output; my $env; *************** *** 247,252 **** loopresult =>\@loopresult); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 247,249 ---- loopresult =>\@loopresult); ! output_html_with_http_headers $input, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:39 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:39 -0800 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 Message-ID: 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 => \@accountrows ); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 80,82 ---- accounts => \@accountrows ); ! 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 => \@cmemdata ); ! print $input->header(-cookie => $cookie),$template->output; --- 95,97 ---- cmemloop => \@cmemdata ); ! 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 => \@resultsdata ); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 79,81 ---- resultsloop => \@resultsdata ); ! 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 => \@reservedata); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 207,209 ---- reserveloop => \@reservedata); ! 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 => \@loop_reading); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; --- 74,78 ---- limit => $limit, loop_reading => \@loop_reading); ! 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; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/t Charset.t,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/t In directory sc8-pr-cvs1:/tmp/cvs-serv1397/t Modified Files: Charset.t 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: Charset.t =================================================================== RCS file: /cvsroot/koha/koha/t/Charset.t,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Charset.t 19 Jan 2003 06:15:44 -0000 1.1 --- Charset.t 2 Feb 2003 07:18:38 -0000 1.2 *************** *** 1,4 **** use strict; ! use C4::Charset; use vars qw( @tests ); --- 1,4 ---- use strict; ! use C4::Interface::CGI::Output; use vars qw( @tests ); *************** *** 9,13 **** [ 'Normal HTML without meta tag', ! sub { C4::Charset::guesscharset($_[0]) }, undef, < --- 22,28 ---- EOF ], [ ! 'Result of guesstype with normal HTML with irrelevant meta tag', ! sub { guesstype($_[0]) }, ! 'text/html', < *************** *** 30,34 **** ], [ 'Result of guesscharset with normal HTML with relevant meta tag', ! sub { C4::Charset::guesscharset($_[0]) }, 'big5', < Update of /cvsroot/koha/koha/opac In directory sc8-pr-cvs1:/tmp/cvs-serv1397/opac Modified Files: opac-account.pl opac-detail.pl opac-main.pl opac-membership.pl opac-readingrecord.pl opac-reserve.pl opac-search.pl opac-searchresults.pl opac-sidebar.pl opac-user.pl opac-userdetails.pl opac-userupdate.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: opac-account.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-account.pl 19 Dec 2002 11:04:14 -0000 1.4 --- opac-account.pl 2 Feb 2003 07:18:38 -0000 1.5 *************** *** 56,59 **** #$template->param(loggeninuser => $loggedinuser); ! print $query->header(-cookie => $cookie), $template->output; --- 56,59 ---- #$template->param(loggeninuser => $loggedinuser); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-detail.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-detail.pl 20 Jan 2003 07:39:28 -0000 1.8 --- opac-detail.pl 2 Feb 2003 07:18:38 -0000 1.9 *************** *** 5,9 **** use C4::Search; use C4::Auth; ! use C4::Charset; use HTML::Template; --- 5,9 ---- use C4::Search; use C4::Auth; ! use C4::Interface::CGI::Output; use HTML::Template; *************** *** 55,61 **** $template->param(SITE_RESULTS => $sitearray); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 55,58 ---- $template->param(SITE_RESULTS => $sitearray); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-main.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-main.pl 20 Jan 2003 07:39:28 -0000 1.6 --- opac-main.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 6,10 **** use C4::Auth; # get_template_and_user ! use C4::Charset; my $query = new CGI; --- 6,10 ---- use C4::Auth; # get_template_and_user ! use C4::Interface::CGI::Output; my $query = new CGI; *************** *** 18,23 **** }); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 18,20 ---- }); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-membership.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-membership.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-membership.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-membership.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 16,18 **** }); ! print $query->header(-cookie => $cookie), $template->output; --- 16,18 ---- }); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-readingrecord.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-readingrecord.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-readingrecord.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 52,55 **** ! print $query->header(-cookie => $cookie), $template->output; --- 52,55 ---- ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-reserve.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-reserve.pl 19 Dec 2002 11:04:15 -0000 1.5 --- opac-reserve.pl 2 Feb 2003 07:18:38 -0000 1.6 *************** *** 226,228 **** ! print $query->header(-cookie => $cookie), $template->output; --- 226,228 ---- ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-search.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** opac-search.pl 20 Jan 2003 07:39:28 -0000 1.7 --- opac-search.pl 2 Feb 2003 07:18:38 -0000 1.8 *************** *** 4,8 **** use C4::Auth; ! use C4::Charset; use C4::Context; use CGI; --- 4,8 ---- use C4::Auth; ! use C4::Interface::CGI::Output; use C4::Context; use CGI; *************** *** 33,38 **** $template->param(classlist => $classlist); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 33,35 ---- $template->param(classlist => $classlist); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-searchresults.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-searchresults.pl 20 Jan 2003 07:39:28 -0000 1.8 --- opac-searchresults.pl 2 Feb 2003 07:18:38 -0000 1.9 *************** *** 5,9 **** use C4::Search; use C4::Auth; ! use C4::Charset; use HTML::Template; --- 5,9 ---- use C4::Search; use C4::Auth; ! use C4::Interface::CGI::Output; use HTML::Template; *************** *** 128,134 **** $template->param(numbers => $numbers); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 128,131 ---- $template->param(numbers => $numbers); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-sidebar.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-sidebar.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-sidebar.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 29,31 **** $template->param(url => $self_url); ! print $query->header(-cookie => $cookie), $template->output; --- 29,31 ---- $template->param(url => $self_url); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-user.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-user.pl 19 Dec 2002 11:04:15 -0000 1.6 --- opac-user.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 132,135 **** $template->param(waiting_count => $wcount); ! print $query->header(-cookie => $cookie), $template->output; --- 132,135 ---- $template->param(waiting_count => $wcount); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-userdetails.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-userdetails.pl 19 Dec 2002 11:04:15 -0000 1.3 --- opac-userdetails.pl 2 Feb 2003 07:18:38 -0000 1.4 *************** *** 31,34 **** $template->param($borr); ! print $query->header(-cookie => $cookie), $template->output; --- 31,34 ---- $template->param($borr); ! output_html_with_http_headers $query, $cookie, $template->output; Index: opac-userupdate.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-userupdate.pl 19 Dec 2002 11:04:15 -0000 1.6 --- opac-userupdate.pl 2 Feb 2003 07:18:38 -0000 1.7 *************** *** 69,71 **** $template->param(BORROWER_INFO => \@bordat); ! print $query->header(-cookie => $cookie), $template->output; --- 69,71 ---- $template->param(BORROWER_INFO => \@bordat); ! output_html_with_http_headers $query, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/search.marc search.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/search.marc In directory sc8-pr-cvs1:/tmp/cvs-serv1397/search.marc Modified Files: search.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: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.marc/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 2 Feb 2003 00:13:10 -0000 1.2 --- search.pl 2 Feb 2003 07:18:38 -0000 1.3 *************** *** 27,31 **** use C4::Auth; use C4::Output; ! use C4::Charset; use C4::Biblio; use C4::SearchMarc; --- 27,31 ---- use C4::Auth; use C4::Output; ! use C4::Interface::CGI::Output; use C4::Biblio; use C4::SearchMarc; *************** *** 109,114 **** } # Print the page ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; --- 109,111 ---- } # Print the page ! output_html_with_http_headers $query, $cookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members moremember.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv1397/koha-tmpl/intranet-tmpl/default/zh-TW/members Modified Files: moremember.tmpl 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: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** moremember.tmpl 2 Feb 2003 04:56:47 -0000 1.1 --- moremember.tmpl 2 Feb 2003 07:18:38 -0000 1.2 *************** *** 40,44 **** ?X???????G
! ?m?O?G

Alternative Contact:
Phone:
--- 40,45 ---- ?X???????G
! ?m?O?G?k?k !

Alternative Contact:
Phone:
From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [Koha-cvs] CVS: koha/circ branchtransfers.pl,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1:/tmp/cvs-serv1397/circ Modified Files: branchtransfers.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: branchtransfers.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** branchtransfers.pl 28 Jan 2003 00:48:36 -0000 1.15 --- branchtransfers.pl 2 Feb 2003 07:18:38 -0000 1.16 *************** *** 283,287 **** errmsgloop => \@errmsgloop ); ! print $query->header(-cookie=>$sessioncookie), $template->output; --- 283,287 ---- errmsgloop => \@errmsgloop ); ! output_html_with_http_headers $query, $sessioncookie, $template->output; From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [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 Message-ID: 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 From acli at users.sourceforge.net Sun Feb 2 08:18:40 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:18:40 -0800 Subject: [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 Message-ID: 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; From acli at users.sourceforge.net Sun Feb 2 08:19:31 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:19:31 -0800 Subject: [Koha-cvs] CVS: koha/C4 Charset.pm,1.1,NONE Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv2385 Removed Files: Charset.pm Log Message: Moved C4/Charset.pm to C4/Interface/CGI/Output.pm --- Charset.pm DELETED --- From acli at users.sourceforge.net Sun Feb 2 08:44:08 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 23:44:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/members moremember.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members In directory sc8-pr-cvs1:/tmp/cvs-serv6674/members Modified Files: moremember.tmpl Log Message: Additional translation Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** moremember.tmpl 2 Feb 2003 07:18:38 -0000 1.2 --- moremember.tmpl 2 Feb 2003 07:44:06 -0000 1.3 *************** *** 117,121 ****

! --- 117,121 ---- ! *************** *** 134,141 **** ! ! ! ! ! ! ! !

?????_?AKOHA???o?z?n???S???v???????o???C

Sorry, your session has timed out, please login again.

?z??IP???}?????F?A?????s?n?J?C

?z???~???J?????????s?????K?X?????A?????s???J?C.
Select a Record to Import from
> " [Viewing to of records] |
Search still pending... processing... No results found for query ?file=&numrecord=>
--- NEW FILE ---

Main Menu

--- NEW FILE --- > ()

New Record

Full MARC Record available at bottom
Title" size=40 maxlenght=255>
Subtitle" size=40 maxlenght=255>
Author" size=40 maxlenght=255>
Additional authors
Illustrator" size=40 maxlenght=255>
Copyright" size=20 maxlenght=80>
Series Title" size=40 maxlenght=255>
Volume" size=40 maxlenght=255>
Number" size=40 maxlenght=255>
Volume Date" size=40 maxlenght=255>
Volume Description" size=40 maxlenght=255>
Subject" size=40 maxlenght=255>
Notes" size=40 maxlenght=255>
Item Type
ISBN" size=40 maxlenght=40>
ISSN" size=40 maxlenght=40>
LCCN" size=40 maxlenght=40>
Dewey" size=8 maxlenght=10>
Subclass" size=40 maxlenght=40>
Publication Year" size=5 maxlenght=10>
Publisher" size=40 maxlenght=255>
Place" size=40 maxlenght=255>
Pages" size=5 maxlenght=10>
Size" size=40 maxlenght=40>
"> "> ">
MARC RECORD
      "> 
--- NEW FILE ---

>Main Menu

Select a set of MARC records

Upload a set of MARC records
Upload a set of MARC records:
?menu=" enctype="multipart/form-data">
> Name this set of MARC records:
From acli at users.sourceforge.net Sun Feb 2 05:57:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:57:49 -0800 Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.8,1.9 readingrec.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1:/tmp/cvs-serv5273 Modified Files: MARCdetail.pl readingrec.pl Log Message: Handle non-latin1 charsets Index: MARCdetail.pl =================================================================== RCS file: /cvsroot/koha/koha/MARCdetail.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** MARCdetail.pl 12 Dec 2002 16:33:58 -0000 1.8 --- MARCdetail.pl 2 Feb 2003 04:57:47 -0000 1.9 *************** *** 27,34 **** =head1 DESCRIPTION ! This script needs a biblionumber in bib parameter (bibnumber from koha style DB. Automaticaly maps to marc biblionumber). ! It shows the biblio in a (nice) MARC format depending on MARC parameters tables. ! The template is in /catalogue/MARCdetail.tmpl. this template must be divided in 11 "tabs". ! The 10 firsts presents the biblio, the 11th one presents the items attached to the biblio =head1 FUNCTIONS --- 27,41 ---- =head1 DESCRIPTION ! This script needs a biblionumber in bib parameter (bibnumber ! from koha style DB. Automaticaly maps to marc biblionumber). ! ! It shows the biblio in a (nice) MARC format depending on MARC ! parameters tables. ! ! The template is in /catalogue/MARCdetail.tmpl. ! this template must be divided into 11 "tabs". ! ! The first 10 tabs present the biblio, the 11th one presents ! the items attached to the biblio =head1 FUNCTIONS *************** *** 154,157 **** biblionumber => $biblionumber, bibid => $bibid); ! print $query->header(-cookie => $cookie),$template->output; --- 161,167 ---- biblionumber => $biblionumber, bibid => $bibid); ! print $query->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; Index: readingrec.pl =================================================================== RCS file: /cvsroot/koha/koha/readingrec.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** readingrec.pl 13 Dec 2002 10:21:59 -0000 1.5 --- readingrec.pl 2 Feb 2003 04:57:47 -0000 1.6 *************** *** 26,29 **** --- 26,30 ---- use C4::Auth; use C4::Output; + use C4::Charset; use CGI; use C4::Search; *************** *** 73,77 **** limit => $limit, loop_reading => \@loop_reading); ! print $input->header(-cookie => $cookie),$template->output; --- 74,81 ---- limit => $limit, loop_reading => \@loop_reading); ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ),$template->output; From acli at users.sourceforge.net Sun Feb 2 05:58:11 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:58:11 -0800 Subject: [Koha-cvs] CVS: koha/admin aqbookfund.pl,1.10,1.11 aqbudget.pl,1.9,1.10 authorised_values.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1:/tmp/cvs-serv5381/admin Modified Files: aqbookfund.pl aqbudget.pl authorised_values.pl Log Message: Handle non-latin1 charsets Index: aqbookfund.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** aqbookfund.pl 28 Jan 2003 13:04:08 -0000 1.10 --- aqbookfund.pl 2 Feb 2003 04:58:08 -0000 1.11 *************** *** 43,46 **** --- 43,47 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 206,208 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 207,212 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; Index: aqbudget.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** aqbudget.pl 28 Jan 2003 13:04:09 -0000 1.9 --- aqbudget.pl 2 Feb 2003 04:58:08 -0000 1.10 *************** *** 43,46 **** --- 43,47 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 227,230 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 228,234 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; Index: authorised_values.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** authorised_values.pl 10 Dec 2002 17:35:52 -0000 1.4 --- authorised_values.pl 2 Feb 2003 04:58:08 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- use C4::Context; use C4::Output; + use C4::Charset; use C4::Search; use HTML::Template; *************** *** 189,191 **** } #---- END $OP eq DEFAULT ! print $input->header(-cookie => $cookie), $template->output; --- 190,195 ---- } #---- END $OP eq DEFAULT ! print $input->header( ! -type => guesstype($template->output), ! -cookie => $cookie ! ), $template->output; From acli at users.sourceforge.net Sun Feb 2 05:59:41 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:59:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue catalogue-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1:/tmp/cvs-serv5511/default/en/catalogue Modified Files: catalogue-home.tmpl Log Message: The search interface takes a barcode from the item number field; adjusting the display to match Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catalogue-home.tmpl 10 Oct 2002 16:17:08 -0000 1.1 --- catalogue-home.tmpl 2 Feb 2003 04:59:39 -0000 1.2 *************** *** 24,28 ****

Item Number     OR
Biblio#AuthorTitle
???????? ???OCharge ????
???????? ???O?O?? ????
! ">On Request - no renewals ! " value=y>Y ! " value=n>N --- 134,140 ---- ! ">?????Q?w?q?A???i???? ! " value=y>????????
" value=n>???????? From acli at users.sourceforge.net Sun Feb 2 09:47:04 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sun, 02 Feb 2003 00:47:04 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.53,1.54 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1:/tmp/cvs-serv22217/C4 Modified Files: Search.pm Log Message: Distinguish between On Loan, Item Lost, and Withdrawn, instead of saying just "not available". Cf. Bug 112 Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** Search.pm 28 Jan 2003 14:46:50 -0000 1.53 --- Search.pm 2 Feb 2003 08:47:01 -0000 1.54 *************** *** 1,4 **** package C4::Search; - #require '/u/acli/lib/cvs.pl'; # XXX # Copyright 2000-2002 Katipo Communications --- 1,3 ---- *************** *** 2152,2174 **** while (my $data=$sth->fetchrow_hashref){ $counts{'total'}++; - my $query2="select * from issues,items where issues.itemnumber= - '$data->{'itemnumber'}' and returndate is NULL - and items.itemnumber=issues.itemnumber and ((items.itemlost <>1 and - items.itemlost <> 2) or items.itemlost is NULL) - and (wthdrawn <> 1 or wthdrawn is NULL)"; ! my $sth2=$dbh->prepare($query2); ! $sth2->execute; ! # FIXME - fetchrow_hashref() can fail for any number of reasons ! # (e.g., a database server crash). Perhaps use a left join of some ! # sort for this? ! if (my $data2=$sth2->fetchrow_hashref){ ! $counts{'not available'}++; ! #my $x = "Not available, data2=" . (defined $data2? CGI::escapeHTML(cvs($data2)): "undef"); ! #$counts{$x}++; #XXX ! } else { ! $counts{$data->{'branchname'}}++; } ! $sth2->finish; } my $query2="Select * from aqorders where biblionumber=$bibnum and --- 2151,2187 ---- while (my $data=$sth->fetchrow_hashref){ $counts{'total'}++; ! my $status; ! for my $test ( ! [ ! 'Item Lost', ! 'select * from items ! where itemnumber=? ! and not ((items.itemlost <>1 and items.itemlost <> 2) ! or items.itemlost is NULL)' ! ], [ ! 'Withdrawn', ! 'select * from items ! where itemnumber=? and not (wthdrawn <> 1 or wthdrawn is NULL)' ! ], [ ! 'On Loan', "select * from issues,items ! where issues.itemnumber=? and returndate is NULL ! and items.itemnumber=issues.itemnumber" ! ], ! ) { ! my($testlabel, $query2) = @$test; ! ! my $sth2=$dbh->prepare($query2); ! $sth2->execute($data->{'itemnumber'}); ! ! # FIXME - fetchrow_hashref() can fail for any number of reasons ! # (e.g., a database server crash). Perhaps use a left join of some ! # sort for this? ! $status = $testlabel if $sth2->fetchrow_hashref; ! $sth2->finish; ! last if defined $status; } ! $status = $data->{'branchname'} unless defined $status; ! $counts{$status}++; } my $query2="Select * from aqorders where biblionumber=$bibnum and From acli at users.sourceforge.net Mon Feb 3 02:58:57 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sun, 02 Feb 2003 17:58:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-search.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1:/tmp/cvs-serv8588/en Modified Files: opac-search.tmpl Log Message: Wrong field name "item" specified, should be "itemnumber" The "Item number" is actually the barcode; wording corrected (Bug 168) Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-search.tmpl 6 Jan 2003 10:08:15 -0000 1.8 --- opac-search.tmpl 3 Feb 2003 01:58:55 -0000 1.9 *************** *** 49,53 **** -->
Item Number
Barcode
Num?ro d'exemplaire
Num?ro d'exemplaire
Item Number
Barcode
Item Number
???X
?n?J Koha
???????s???G
?K?@?@?@?X?G
--- NEW FILE ---


&type="intra"> ()

BARCODE
Home Branch:
Current Branch:
Date arrived at current branch:
Number of issues since since the above date :
Branch No. of Issues Last seen at branch
--- NEW FILE --- ?????@??

 

?@???B?????O?? ???B ???I????
?`?????B

 

--- NEW FILE ---

Each box needs to be filled in with fine,time to start charging,charging cycle
eg 1,7,7 = $1 fine, after 7 days, every 7 days.

--- NEW FILE ---

TitleAuthorItem CountBiblionumber
>
&startfrom=>Previous Records &startfrom=>Next Records

Results through of records.
--- NEW FILE --- WELCOME TO THE KOHA INTRANET
?]???d??

Koha: Intranet ????
?b?W?????????J?????r?A?A???^?????Y?i?C
-?i???j?M (???h????)
?????j?M

?b?W?????????J?????m?W?A?A???^?????Y?i?C
???????m
?????C?L
?t???]?w
?y?q?A??
--- NEW FILE ---

Manual Credit

">
?????s??
???O
Itemnumber
????
???B
--- NEW FILE ---

???o????

">
?????s??
???O
Itemnumber
????
???B
--- NEW FILE --- ">Modify Website Links
"> ">
Author ">
Title ">
Abstract
Subject ...
Copyright Date ">
Series Title ">
Additional Author ">
Subtitle ">
Unititle ">
Notes
Serial ">
Analytic Author
Analytic Title

--- NEW FILE ---
"&type=intra> ()
Modify Group -
"> ">
RE-ASSIGN TO EXISTING GROUP
OR MODIFY DETAILS
Item Type" size=20>
URL " size="20">
Class" size=20>
Publisher" size=20>
Place" size=20>
ISBN" size=20>
Publication Year" size=20>
Pages" size=20>
Illustrations" size=20>
Volume " size=20>
Notes ">
Size " size=20>
CHANGES TO AFFECT THESE BARCODES
Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.
  Barcode Location Date Due Last Seen
"> "&bib=""&bi=""">

HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some items, tick the appropriate ones and a new group record will be created automatically for them.

 

--- NEW FILE --- ()
"> "> "> "> "> "> "> "> "> ">
Barcode" size=40>
ItemNotes
Home Branch" size=40>
Lost checked > Yes checked > No
Cancelled checked > Yes checked > No
--- NEW FILE ---

">Return to Details Page EOF

"> ">
Title ">
Description
URL ">

Add another Website Link

">
Title
Description
URL
EOF --- NEW FILE --- Invalid cardnumber.

" value="">
--- NEW FILE ---

'Confirm Record'

" > " >
"> NEW MEMBER &nbpsq;
Name
"> MEMBERSHIP DETAILS &nbpsq;
Membership Number
Date Of Birth
Sex
School
General Notes

" value="">
--- NEW FILE ---

Confirm Record

" > " > " > " > " > " > " >
"> NEW MEMBER  
Name
"> MEMBERSHIP DETAILS  
Membership Number
Card Number
Membership Category
Area
Fee
Joining Date
Expiry Date
Joining Branch
"> PERSONAL DETAILS  
Ethnicity
Date Of Birth
Sex
"> MEMBER ADRESS  
Postal Adress
Home Adress
"> MEMBER CONTACT DETAIL  
Phone (Home)
Phone (Daytime)
Fax
E-mail
"> ALTERNATIVE CONTACT DETAIL  
Name
Phone
Relationship
Notes
"> NOTES  
General Notes

" value="">
--- NEW FILE --- WELCOME TO THE KOHA OPAC

Koha: Horowhenua Library Trust Catalogue and Member Services		 Search the Catalogue
   

Type in the box and press the enter key.
-Advanced Search (More Options)

Logged in as: [Log Out]

Log In to Koha

--- NEW FILE --- Items Overdue as of

Due Date Patron Phone Title Author
?subject=Overdue: ">
--- NEW FILE ---

reports

--- NEW FILE ---
    
--- NEW FILE --- >Results with dewey | >Results with biblionumber
--- NEW FILE ---

Logged in as: [Log Out]

Shelf List

Add a book by barcode:

"> Contents of shelf
">"> " width=10 align=center> "> " width=10 align=center> "> " width=10 align=center> ">

"> ">

Modify Shelf Contents

Bookshelves

"> Select Shelves to Delete
"> "> ( books)

Add Shelf:

">
"> Shelf List
"> "> ( books)

Add or Remove Book Shelves --- NEW FILE --- Thesaurus value builder for category <TMPL_VAR name="category">


"> "> ">

"> "> ">
"> "> insert a new authority :
--- NEW FILE ---

Click submit to force the subject
" value=""> ">
From acli at users.sourceforge.net Sun Feb 2 05:56:49 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,NONE,1.1 aqbookfund.tmpl,NONE,1.1 aqbudget.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 thesaurus.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1:/tmp/cvs-serv4979/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl systempreferences.tmpl thesaurus.tmpl Log Message: Incomplete translation --- NEW FILE ---

?z???e?n?J??: [?n?X]

?n?J Koha

Koha???t???]?w
?t??????
?????????]?w
Item types ?U???]????????
budget the budgets allowed to differents book funds.
book funds the differents book funds.
?e?\?? ?]?w?e?\???????O?????????e?\???C ?b???????????c???]?w???A?i???w?Y???????u?????Y???u?e?\???v?A?O???J???????i?H???????~?????[???K
Thesaurus Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
???????? (MARC) ?????]?w
?w?q?????????????c?????????????c?G????????
?w?q?????????Mkoha?????w?????s???w?qKoha?????w?M?????????????w???????Y?C???G?????u?w?q?????????????c?v?\???]?i?????o?I?A?????o???u?????s???|???@???C
???????????????c???????????????c???w?q???S?????P?????w???????`???@???Y?????~?C?B?z?u?????????e?A???????o?????@?????I
???L????
???]?]?w ?o?M Koha ???A?????????????]?@??
???????O ?]?w???P?????????O
?????]?w ?????????????????f??
???L???]?w ?L???? (UNIX ???|) ?]?w
stopword ?d???????????????r??
Z39.50 ???A?? ?????d?????????????????U???A??
?t?????n ???L?v?T?t???B?@?????n?]?w
?????u??
???X
MARC biblio export ?H???????????X
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 bookfund admin
method=post>

You Searched for


"
Book fundNameGroupBudget     
  ">Budget ?op=add_form&bookfundid= ">Edit ?op=delete_confirm&bookfundid=">Delete  

      


 

Book fund>
Book fund
Name 
Group
 
 data recorded

 

data deleted
"" --- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 Budget admin

You Searched for


Book fund
Name
Group
CONFIRM DELETION
>
Book fundStart dateEnd dateBudget amount  
() ">Edit ">Delete
      

Book fund>
Book fund
Book fund
Start date 
End date
Budget amount
 

 

data recorded
" data deleted
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

Book fund
Start date
End date
budgetamount
CONFIRM DELETION
???O
?e?\??
Lib
  ">
"> ?]?w?e?\??

This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.

When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorised values

?t?}?s???O
Variable ????
Value
?u???n?R?????H
???O ?e?\?? ????    
">???? ">?R??
">

--- NEW FILE ---

Logged in as: [Log out]

?n?J Koha

???]?s?X
?]?W"> 
Address
 
 
Phone
Fax
E-mail
 
 Confirm delete:
>

method=post>
???]?@??
?]?W ?s?X ?a?} ???O  

???]???O
???O ?s?X ????
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

Choose and validate 1 of the following for .

"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">
"> ">

To "unmap", click ==>
"> ">
MARC links

Koha ???? ???? ???? ????
">????
--- NEW FILE ---

?z???e?n?J??: [?n?X]

?n?J to Koha

???? ???????]?????????? / ?????????????? Repet Mand Koha ???? ?b?????X?{ Authorised value or
Thesaurus category
-

or
or

Note : in the last column, you can choose :

  • An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table
  • A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table
  • A "value builder" : values builders are perl programm that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly

 data deleted
'>
????
 
?u???n?R?????H
">
?O?_ ?O?_ ">?R??
">???^?????]?w
--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

????
???]??????????
??????????????
Repeatable
Mandatory
Authorised value (if you select a value here, the indicators will be limited to the authorised value list)
 
 data deleted
MARC tag structure admin
????
 
?u???n?R???o?????????H
???? ???? Repeatable Mandatory Authorised
value		 ????    
?O?_ ?O?_ ">?]?w???? ">???? ">?R??


--- NEW FILE ---

???e?n?J??: [?n?X]

?n?J Koha

????
?{??
 
 data recorded
data deleted
?t???]?w
Variable
Value
CONFIRM DELETION
???? ?{?? ????    
">???? ">?R??


--- NEW FILE ---

Logged in as: [Log Out]

Log In to Koha

 Thesaurus management
Values related to ()


Other forms    
">Edit ">Delete
"> ">

Category
Authority lib " maxlength="80" size="80">
Other lib " maxlength="80" size="80">
  "> "> "> "> "> "> ">
lib
Value
">
CONFIRM DELETION of this entry and all entries depending from this one
 Thesaurus management

Manages thesaurus and authorities files.

    Dig : see datas depending from this one
    Related : see other forms of this authority entry

"> "> ">

checked>Top hierarchy only "> New category... &search_category=">
  free form Authority Dig Related    
  Dig Related ">Edit ">Delete
From acli at users.sourceforge.net Sun Feb 2 05:56:48 2003 From: acli at users.sourceforge.net (Ambrose Li) Date: Sat, 01 Feb 2003 20:56:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes acquisitions-bottom.inc,NONE,1.1 acquisitions-top.inc,NONE,1.1 cat-bottom.inc,NONE,1.1 cat-class-list.inc,NONE,1.1 cat-top.inc,NONE,1.1 circulation-bottom.inc,NONE,1.1 circulation-top.inc,NONE,1.1 issues-bottom.inc,NONE,1.1 issues-top.inc,NONE,1.1 members-bottom.inc,NONE,1.1 members-top.inc,NONE,1.1 opac-bottom.inc,NONE,1.1 opac-top.inc,NONE,1.1 parameters-bottom.inc,NONE,1.1 parameters-top.inc,NONE,1.1 reports-bottom.inc,NONE,1.1 reports-top.inc,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1:/tmp/cvs-serv4979/includes Added Files: acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-class-list.inc cat-top.inc circulation-bottom.inc circulation-top.inc issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc opac-bottom.inc opac-top.inc parameters-bottom.inc parameters-top.inc reports-bottom.inc reports-top.inc Log Message: Incomplete translation --- NEW FILE ---

 

???^?D?? || ?y?q?A?? || ?]???d?? || ?????b?? || ???????m || ?????C?L || ?t???]?w || ????????
--- NEW FILE --- KOHA: INTRANET: Acquisitions

KOHA: ?D????
Catalogue Members Acquisitions Reports Circulation Home
--- NEW FILE ---

 

???^?D?? || ?y?q?A?? || ?]???d?? || ?????b?? || ???????m || ?????C?L || ?t???]?w || ????????
--- NEW FILE ---