From bogus@does.not.exist.com Tue Mar 25 14:19:08 2008 From: bogus@does.not.exist.com () Date: Tue, 25 Mar 2008 13:19:08 -0000 Subject: Sans objet Message-ID: Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** intranet.zh_TW 23 Feb 2004 06:11:53 -0000 1.11 --- intranet.zh_TW 23 Feb 2004 06:28:12 -0000 1.12 *************** *** 2281,2285 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:40 msgid "Charges amounts for itemtypes / borrower types." ! msgstr "" # FIXME --- 2281,2285 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:40 msgid "Charges amounts for itemtypes / borrower types." ! msgstr "設定各類讀者借出各類圖書資料的各種罰款。" # FIXME *************** *** 2298,2301 **** --- 2298,2304 ---- "show mistakes that can BREAK Koha's database!" msgstr "" + "核實機讀格式結構的定義有沒有導致資料庫不能正常" + "操作的嚴重錯誤。處理真正的資料前，務必用這個核" + "一核對！" #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl:59 *************** *** 2540,2544 **** msgid "" "Data about the current version of Koha for bug reports (or general interest)." ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:137 --- 2543,2547 ---- msgid "" "Data about the current version of Koha for bug reports (or general interest)." ! msgstr "有關這個Koha版本的資料 (報告錯誤用的資訊以及其他一般的資訊)：" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:137 *************** *** 2619,2622 **** --- 2622,2628 ---- "in MARC form to limit and help editing MARC biblios." msgstr "" + "設定容許值的類別及相關的容許值──修改機讀格式" + "的書目時，容許值可以讓修改機讀格式時減少錯誤以" + "及較為方便" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:25 *************** *** 2634,2637 **** --- 2640,2646 ---- "up linkage." msgstr "" + "定義Koha資料庫和機讀格式資料庫間的關係。註：只" + "用「機讀格式欄位結構」功能也可完成這個步驟，但" + "用這個工具做連結會較快。" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:35 *************** *** 3055,3059 **** #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:11 msgid "Full MARC Record available at bottom" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:8 --- 3064,3068 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:11 msgid "Full MARC Record available at bottom" ! msgstr "完整的機讀格式記錄在下面" #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:8 *************** *** 3063,3067 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:73 msgid "Funds" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:233 --- 3072,3076 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:73 msgid "Funds" ! msgstr "資金" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:233 *************** *** 3763,3771 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:59 msgid "Links Koha - MARC DB" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 msgid "Links to" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 --- 3772,3780 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:59 msgid "Links Koha - MARC DB" ! msgstr "連結Koha及機讀格式資料庫" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 msgid "Links to" ! msgstr "連結至" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 *************** *** 3879,3891 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:55 msgid "MARC structure: tags then subfields." ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:54 msgid "MARC tag structure" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:95 msgid "MARC tag structure admin" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:44 --- 3888,3900 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:55 msgid "MARC structure: tags then subfields." ! msgstr "設定機讀格式的欄位結構 (欄及分欄)" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:54 msgid "MARC tag structure" ! msgstr "機讀格式欄位結構" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:95 msgid "MARC tag structure admin" ! msgstr "機讀格式欄位結構管理" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:44 From bogus@does.not.exist.com Tue Mar 25 15:02:14 2008 From: bogus@does.not.exist.com () Date: Tue, 25 Mar 2008 14:02:14 -0000 Subject: Sans objet Message-ID: Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** intranet.zh_TW 23 Feb 2004 06:11:53 -0000 1.11 --- intranet.zh_TW 23 Feb 2004 06:28:12 -0000 1.12 *************** *** 2281,2285 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:40 msgid "Charges amounts for itemtypes / borrower types." ! msgstr "" # FIXME --- 2281,2285 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:40 msgid "Charges amounts for itemtypes / borrower types." ! msgstr "設定各類讀者借出各類圖書資料的各種罰款。" # FIXME *************** *** 2298,2301 **** --- 2298,2304 ---- "show mistakes that can BREAK Koha's database!" msgstr "" + "核實機讀格式結構的定義有沒有導致資料庫不能正常" + "操作的嚴重錯誤。處理真正的資料前，務必用這個核" + "一核對！" #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl:59 *************** *** 2540,2544 **** msgid "" "Data about the current version of Koha for bug reports (or general interest)." ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:137 --- 2543,2547 ---- msgid "" "Data about the current version of Koha for bug reports (or general interest)." ! msgstr "有關這個Koha版本的資料 (報告錯誤用的資訊以及其他一般的資訊)：" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:137 *************** *** 2619,2622 **** --- 2622,2628 ---- "in MARC form to limit and help editing MARC biblios." msgstr "" + "設定容許值的類別及相關的容許值──修改機讀格式" + "的書目時，容許值可以讓修改機讀格式時減少錯誤以" + "及較為方便" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:25 *************** *** 2634,2637 **** --- 2640,2646 ---- "up linkage." msgstr "" + "定義Koha資料庫和機讀格式資料庫間的關係。註：只" + "用「機讀格式欄位結構」功能也可完成這個步驟，但" + "用這個工具做連結會較快。" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:35 *************** *** 3055,3059 **** #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:11 msgid "Full MARC Record available at bottom" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:8 --- 3064,3068 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:11 msgid "Full MARC Record available at bottom" ! msgstr "完整的機讀格式記錄在下面" #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:8 *************** *** 3063,3067 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:73 msgid "Funds" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:233 --- 3072,3076 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:73 msgid "Funds" ! msgstr "資金" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:233 *************** *** 3763,3771 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:59 msgid "Links Koha - MARC DB" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 msgid "Links to" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 --- 3772,3780 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:59 msgid "Links Koha - MARC DB" ! msgstr "連結Koha及機讀格式資料庫" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 msgid "Links to" ! msgstr "連結至" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 *************** *** 3879,3891 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:55 msgid "MARC structure: tags then subfields." ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:54 msgid "MARC tag structure" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:95 msgid "MARC tag structure admin" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:44 --- 3888,3900 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:55 msgid "MARC structure: tags then subfields." ! msgstr "設定機讀格式的欄位結構 (欄及分欄)" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:54 msgid "MARC tag structure" ! msgstr "機讀格式欄位結構" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:95 msgid "MARC tag structure admin" ! msgstr "機讀格式欄位結構管理" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:44 From kyle.m.hall at gmail.com Fri Mar 14 14:42:13 2008 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Fri, 14 Mar 2008 13:42:13 +0000 Subject: [Koha-cvs] koha readingrec.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 08/03/14 13:42:13 Modified files: . : readingrec.pl Log message: Reading record sorting by title now ignores stopwords. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/readingrec.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.12.2.5.2.3&r2=1.12.2.5.2.4 Patches: Index: readingrec.pl =================================================================== RCS file: /sources/koha/koha/Attic/readingrec.pl,v retrieving revision 1.12.2.5.2.3 retrieving revision 1.12.2.5.2.4 diff -u -b -r1.12.2.5.2.3 -r1.12.2.5.2.4 --- readingrec.pl 31 May 2007 12:48:52 -0000 1.12.2.5.2.3 +++ readingrec.pl 14 Mar 2008 13:42:13 -0000 1.12.2.5.2.4 @@ -22,6 +22,8 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +use Data::Dumper; + use strict; use C4::Auth; use C4::Output; @@ -47,9 +49,10 @@ } else { $limit=50; } -my ($count,$issues)=allissues($bornum,$order2,$limit); -my ($template, $loggedinuser, $cookie) +my ( $count, $issues ) = allissues( $bornum, $order2, $limit ); + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user({template_name => "members/readingrec.tmpl", query => $input, type => "intranet", @@ -60,30 +63,49 @@ my @loop_reading; +my $stopwords = C4::Context->stopwords; + for (my $i=0;$i<$count;$i++){ my %line; if($i%2){ $line{'toggle'} = 1; } - $line{biblionumber}=$issues->[$i]->{'biblionumber'}; - $line{title}=$issues->[$i]->{'title'}; - $line{author}=$issues->[$i]->{'author'}; + $line{biblionumber} = $issues->[$i]->{'biblionumber'}; + $line{title} = $issues->[$i]->{'title'}; + $line{author} = $issues->[$i]->{'author'}; $line{classification} = $issues->[$i]->{'classification'}; - $line{date_due}=format_date($issues->[$i]->{'date_due'}); - $line{issue_date}=format_date($issues->[$i]->{'issue_date'}); - $line{returndate}=format_date($issues->[$i]->{'returndate'}); - $line{volumeddesc}=$issues->[$i]->{'volumeddesc'}; - $line{volume} =$issues->[$i]->{'volume'}; - $line{publicationyear} =$issues->[$i]->{'publicationyear'}; - $line{publishercode} =$issues->[$i]->{'publishercode'}; - $line{place} =$issues->[$i]->{'place'}; - $line{pages} =$issues->[$i]->{'pages'}; - $line{size} =$issues->[$i]->{'size'}; - $line{description} =$issues->[$i]->{'description'}; - $line{itemcallnumber}=$issues->[$i]->{'itemcallnumber'}; + $line{date_due} = format_date($issues->[$i]->{'date_due'}); + $line{issue_date} = format_date($issues->[$i]->{'issue_date'}); + $line{returndate} = format_date($issues->[$i]->{'returndate'}); + $line{volumeddesc} = $issues->[$i]->{'volumeddesc'}; + $line{volume} = $issues->[$i]->{'volume'}; + $line{publicationyear} = $issues->[$i]->{'publicationyear'}; + $line{publishercode} = $issues->[$i]->{'publishercode'}; + $line{place} = $issues->[$i]->{'place'}; + $line{pages} = $issues->[$i]->{'pages'}; + $line{size} = $issues->[$i]->{'size'}; + $line{description} = $issues->[$i]->{'description'}; + $line{itemcallnumber} = $issues->[$i]->{'itemcallnumber'}; + + if ( $order2 =~ m/title/ ) { ## If we are sorting by 'title' + ## Need to sort ignoring stopwords, create 'titlesort' which is the title without any stopwords + $line{titlesort} = uc( $issues->[$i]->{'title'} ); ## Stopwords are all uppercase + my ( $key, $value ); + while ( ( $key, $value ) = each( %$stopwords ) ) { + if ( $line{titlesort} =~ m/^$key / ) { ## space after $key make sure its not the beginning of a different word + $line{titlesort} = substr( $line{titlesort}, length( $key ) ); + } + } + } + push(@loop_reading,\%line); } +## resort @loop_reading based on 'titlesort' instead of 'title' if being sorted by title +if ( $order2 =~ m/title/ ) { + @loop_reading = sort { $a->{titlesort} cmp $b->{titlesort} } @loop_reading; +} + $template->param( biblionumber => $data->{'biblionumber'}, title => $data->{'title'}, From kyle.m.hall at gmail.com Fri Mar 14 15:38:53 2008 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Fri, 14 Mar 2008 14:38:53 +0000 Subject: [Koha-cvs] koha readingrec.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 08/03/14 14:38:52 Modified files: . : readingrec.pl Log message: Bugfix: Forgot to add + 1 to the substring length to removing the space trailing the stopword. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/readingrec.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.12.2.5.2.4&r2=1.12.2.5.2.5 Patches: Index: readingrec.pl =================================================================== RCS file: /sources/koha/koha/Attic/readingrec.pl,v retrieving revision 1.12.2.5.2.4 retrieving revision 1.12.2.5.2.5 diff -u -b -r1.12.2.5.2.4 -r1.12.2.5.2.5 --- readingrec.pl 14 Mar 2008 13:42:13 -0000 1.12.2.5.2.4 +++ readingrec.pl 14 Mar 2008 14:38:52 -0000 1.12.2.5.2.5 @@ -93,7 +93,7 @@ my ( $key, $value ); while ( ( $key, $value ) = each( %$stopwords ) ) { if ( $line{titlesort} =~ m/^$key / ) { ## space after $key make sure its not the beginning of a different word - $line{titlesort} = substr( $line{titlesort}, length( $key ) ); + $line{titlesort} = substr( $line{titlesort}, length( $key ) + 1 ); } } } From kyle.m.hall at gmail.com Thu Mar 20 17:09:44 2008 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Thu, 20 Mar 2008 16:09:44 +0000 Subject: [Koha-cvs] koha/C4 Reserves2.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 08/03/20 16:09:44 Modified files: C4 : Reserves2.pm Log message: Bugfix. Reserves without expiration dates were being canceled automatically. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.38.4.7&r2=1.38.4.8 Patches: Index: Reserves2.pm =================================================================== RCS file: /sources/koha/koha/C4/Attic/Reserves2.pm,v retrieving revision 1.38.4.7 retrieving revision 1.38.4.8 diff -u -b -r1.38.4.7 -r1.38.4.8 --- Reserves2.pm 31 Oct 2007 12:14:21 -0000 1.38.4.7 +++ Reserves2.pm 20 Mar 2008 16:09:44 -0000 1.38.4.8 @@ -3,7 +3,7 @@ package C4::Reserves2; -# $Id: Reserves2.pm,v 1.38.4.7 2007/10/31 12:14:21 kylemhall Exp $ +# $Id: Reserves2.pm,v 1.38.4.8 2008/03/20 16:09:44 kylemhall Exp $ # Copyright 2000-2002 Katipo Communications # Copyright 2007 Liblime @@ -109,6 +109,7 @@ my $sth = $dbh->prepare( "UPDATE reserves SET priority = ?, cancellationdate = CURRENT_DATE() WHERE expirationDate IS NOT NULL + AND exirationDate != '0000-00-00' AND expirationDate <= CURRENT_DATE()" ); From kyle.m.hall at gmail.com Thu Mar 20 17:24:37 2008 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Thu, 20 Mar 2008 16:24:37 +0000 Subject: [Koha-cvs] koha/updater updatedatabase [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 08/03/20 16:24:37 Modified files: updater : updatedatabase Log message: Added the new fields for the updated reserves system. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=dev_week&r1=1.100.2.43.2.16&r2=1.100.2.43.2.17 Patches: Index: updatedatabase =================================================================== RCS file: /sources/koha/koha/updater/updatedatabase,v retrieving revision 1.100.2.43.2.16 retrieving revision 1.100.2.43.2.17 diff -u -b -r1.100.2.43.2.16 -r1.100.2.43.2.17 --- updatedatabase 31 Oct 2007 13:18:02 -0000 1.100.2.43.2.16 +++ updatedatabase 20 Mar 2008 16:24:35 -0000 1.100.2.43.2.17 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: updatedatabase,v 1.100.2.43.2.16 2007/10/31 13:18:02 kylemhall Exp $ +# $Id: updatedatabase,v 1.100.2.43.2.17 2008/03/20 16:24:35 kylemhall Exp $ # Database Updater # This script checks for required updates to the database. @@ -461,6 +461,12 @@ }, marc_biblio => { 'frameworkcode' => 'char(4) not NULL default \'\'' }, serial => { 'publisheddate' => 'date'}, + reserves => { + 'lockPriority' => 'tinyint(1) NOT NULL default 0', + 'lowestPriority' => 'tinyint(1) NOT NULL default 0', + 'startDate' => 'date NULL', + 'expirationDate' => 'date NULL', + } ); my %dropable_table = ( @@ -2211,6 +2217,9 @@ exit; # $Log: updatedatabase,v $ +# Revision 1.100.2.43.2.17 2008/03/20 16:24:35 kylemhall +# Added the new fields for the updated reserves system. +# # Revision 1.100.2.43.2.16 2007/10/31 13:18:02 kylemhall # Fixed the default values. # From kyle.m.hall at gmail.com Thu Mar 20 17:25:50 2008 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Thu, 20 Mar 2008 16:25:50 +0000 Subject: [Koha-cvs] koha/updater updatedatabase [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 08/03/20 16:25:50 Modified files: updater : updatedatabase Log message: CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=dev_week&r1=1.100.2.43.2.17&r2=1.100.2.43.2.18 Patches: Index: updatedatabase =================================================================== RCS file: /sources/koha/koha/updater/updatedatabase,v retrieving revision 1.100.2.43.2.17 retrieving revision 1.100.2.43.2.18 diff -u -b -r1.100.2.43.2.17 -r1.100.2.43.2.18 --- updatedatabase 20 Mar 2008 16:24:35 -0000 1.100.2.43.2.17 +++ updatedatabase 20 Mar 2008 16:25:50 -0000 1.100.2.43.2.18 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: updatedatabase,v 1.100.2.43.2.17 2008/03/20 16:24:35 kylemhall Exp $ +# $Id: updatedatabase,v 1.100.2.43.2.18 2008/03/20 16:25:50 kylemhall Exp $ # Database Updater # This script checks for required updates to the database. @@ -462,8 +462,8 @@ marc_biblio => { 'frameworkcode' => 'char(4) not NULL default \'\'' }, serial => { 'publisheddate' => 'date'}, reserves => { - 'lockPriority' => 'tinyint(1) NOT NULL default 0', - 'lowestPriority' => 'tinyint(1) NOT NULL default 0', + 'lockPriority' => 'tinyint(1) NOT NULL default \'0\'', + 'lowestPriority' => 'tinyint(1) NOT NULL default \'0\'', 'startDate' => 'date NULL', 'expirationDate' => 'date NULL', } @@ -2217,6 +2217,9 @@ exit; # $Log: updatedatabase,v $ +# Revision 1.100.2.43.2.18 2008/03/20 16:25:50 kylemhall +# *** empty log message *** +# # Revision 1.100.2.43.2.17 2008/03/20 16:24:35 kylemhall # Added the new fields for the updated reserves system. # From kyle.m.hall at gmail.com Thu Mar 20 17:33:08 2008 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Thu, 20 Mar 2008 16:33:08 +0000 Subject: [Koha-cvs] koha/C4 Reserves2.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 08/03/20 16:33:08 Modified files: C4 : Reserves2.pm Log message: Bugfix CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.38.4.8&r2=1.38.4.9 Patches: Index: Reserves2.pm =================================================================== RCS file: /sources/koha/koha/C4/Attic/Reserves2.pm,v retrieving revision 1.38.4.8 retrieving revision 1.38.4.9 diff -u -b -r1.38.4.8 -r1.38.4.9 --- Reserves2.pm 20 Mar 2008 16:09:44 -0000 1.38.4.8 +++ Reserves2.pm 20 Mar 2008 16:33:07 -0000 1.38.4.9 @@ -3,7 +3,7 @@ package C4::Reserves2; -# $Id: Reserves2.pm,v 1.38.4.8 2008/03/20 16:09:44 kylemhall Exp $ +# $Id: Reserves2.pm,v 1.38.4.9 2008/03/20 16:33:07 kylemhall Exp $ # Copyright 2000-2002 Katipo Communications # Copyright 2007 Liblime @@ -109,7 +109,7 @@ my $sth = $dbh->prepare( "UPDATE reserves SET priority = ?, cancellationdate = CURRENT_DATE() WHERE expirationDate IS NOT NULL - AND exirationDate != '0000-00-00' + AND expirationDate != '0000-00-00' AND expirationDate <= CURRENT_DATE()" );