I just realized that this patch shouldn't update existing installs - it should only be for new installs. Updated patch to come.
On Sun, Aug 16, 2009 at 9:47 PM, Nicole Engard<[email protected]> wrote: > From 10b7bab4445c92f7f647be53e4b0ea858cbb2a84 Mon Sep 17 00:00:00 2001 > From: Nicole Engard <[email protected]> > Date: Sun, 16 Aug 2009 17:45:47 -0400 > Subject: [PATCH] Fixed some typos and language in the sample notices. > Content-Type: text/plain; charset="utf-8" > > --- > .../data/mysql/en/mandatory/sample_notices.sql | 16 +--------------- > installer/data/mysql/updatedatabase.pl | 8 ++++++++ > kohaversion.pl | 2 +- > 3 files changed, 10 insertions(+), 16 deletions(-) > > diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql > b/installer/data/mysql/en/mandatory/sample_notices.sql > index 8026c6e..e4044ff 100644 > --- a/installer/data/mysql/en/mandatory/sample_notices.sql > +++ b/installer/data/mysql/en/mandatory/sample_notices.sql > @@ -1,15 +1 @@ > -INSERT INTO `letter` > -(module, code, name, title, content) > -VALUES > -('circulation','ODUE','Overdue Notice','Item Overdue','Dear > <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nAccording to our > current records, you have items that are overdue.Your library does not > charge late fines, but please return orrenew them as soon as > possible.\r\n\r\n<<branches.branchname>><<branches.branchaddress1>><<branches.branchaddress2>><<branches.branchaddress3>><<branches.branchphone>><<branches.branchfax>><<branches.branchemail>>If > you have registered a password with the library, you may use it withyour > library card number to renew online. If an item becomes more than 30 days > overdue, you will be unable to use your library card until the item is > returned. The following item is currently > overdue:\r\n\r\n<<items.content>>'), > -('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not > Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber > <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> > ordered) ($<<aqorders.listprice>> each) has not been received.'), > -('serial','RLIST','Routing List','Serial is now > available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe > following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> > (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'), > -('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new > Koha account details.','Hello <<borrowers.title>> <<borrowers.firstname>> > <<borrowers.surname>>.\r\n\r\nYour new Koha account details > are:\r\n\r\nUser: <<borrowers.userid>>\r\nPassword: > <<borrowers.password>>\r\n\r\nIf you have any problems or questions > regarding your account, please contact your Koha Administrator.\r\n\r\nThank > you,\r\nKoha administrator\r\[email protected]'), > -('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear > <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is > now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), > -('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due > Reminder','You have <<count>> items due'), > -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of > Item Due','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe > following item will be due soon:\r\n\r\n<<biblio.title>>, <<biblio.author>> > (<<items.barcode>>)'), > -('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance > Notice of Item Due','You have <<count>> items due soon'), > -('circulation','EVENT','Upcoming Library Event','Upcoming Library > Event','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThis is a > reminder of an upcoming library event in which you have expressed > interest.'), > -('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for > Pickup at <<branches.branchname>>', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\r\n\r\nYou have a hold available for pickup as of > <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: > <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\nLocation: > <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>'), > -('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The > following items have been checked > in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'), > -('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The > following items have been checked > out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting > <<branches.branchname>>.'); > +INSERT INTO `letter` (module, code, name, title, content) VALUES > ('circulation','ODUE','Overdue Notice','Item Overdue',''Dear > <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nAccording to our > current records, you have items that are overdue. Your library does not > charge late fines, but please return or renew them as soon as > possible.\r\n\r\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n<<branches.branchaddress3>>\n<<branches.branchphone>>\n<<branches.branchfax>>\n<<branches.branchemail>>\r\n\r\nIf > you have registered a password with the library, you may use it with your > library card number to renew online. If an item becomes more than 30 days > overdue, you will be unable to use your library card until the item is > returned. The following item is currently > overdue:\r\n\r\n<<items.content>>'), > ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not > Received','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nOrdernumber > <<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> > ordered) ($<<aqorders.listprice>> each) has not been received.'), > ('serial','RLIST','Routing List','Serial is now > available','<<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe > following issue is now available:\r\n\r\n<<biblio.title>>, <<biblio.author>> > (<<items.barcode>>)\r\n\r\nPlease pick it up at your convenience.'), > ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha > account details.','Hello <<borrowers.title>> <<borrowers.firstname>> > <<borrowers.surname>>.\r\n\r\nYour new Koha account details > are:\r\n\r\nUser: <<borrowers.userid>>\r\nPassword: > <<borrowers.password>>\r\n\r\nIf you have any problems or questions > regarding your account, please contact your Koha Administrator.\r\n\r\nThank > you,\r\nKoha administrator\r\[email protected]'), > ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear > <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item is > now due:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)'), > ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due > Reminder','You have <<count>> items due'), ('circulation','PREDUE','Advance > Notice of Item Due','Advance Notice of Item Due','Dear > <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item > will be due soon:\r\n\r\n<<biblio.title>>, <<biblio.author>> > (<<items.barcode>>)'), ('circulation','PREDUEDGST','Advance Notice of Item > Due (Digest)','Advance Notice of Item Due','You have <<count>> items due > soon'), ('circulation','EVENT','Upcoming Library Event','Upcoming Library > Event','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThis is a > reminder of an upcoming library event in which you have expressed > interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold > Available for Pickup at <<branches.branchname>>', 'Dear > <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nYou have a hold > available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: > <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: > <<items.copynumber>>\r\nLocation: > <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> > <<branches.branchzip>>'), ('circulation','CHECKIN','Item Check-in > (Digest)','Check-ins','The following items have been checked > in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.'), > ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The > following items have been checked > out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting > <<branches.branchname>>.'); > \ No newline at end of file > diff --git a/installer/data/mysql/updatedatabase.pl > b/installer/data/mysql/updatedatabase.pl > index 9b37206..7d410ee 100755 > --- a/installer/data/mysql/updatedatabase.pl > +++ b/installer/data/mysql/updatedatabase.pl > @@ -2521,6 +2521,14 @@ if (C4::Context->preference("Version") < > TransformToNum($DBversion)) { > print " Upgrade to $DBversion done (fix spelling/capitalization to make > things match the standard.)\n"; > } > > +$DBversion = '3.01.00.044'; > +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > + $dbh->do("UPDATE letter SET content='Dear <<borrowers.firstname>> > <<borrowers.surname>>,\r\n\r\nYou have a hold available for pickup as of > <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: > <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\nLocation: > <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> > <<branches.branchzip>>' WHERE code = 'HOLD';"); > + $dbh->do("UPDATE letter SET content='Dear <<borrowers.firstname>> > <<borrowers.surname>>,\r\n\r\nAccording to our current records, you have > items that are overdue. Your library does not charge late fines, but please > return or renew them as soon as > possible.\r\n\r\n<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n<<branches.branchaddress3>>\n<<branches.branchphone>>\n<<branches.branchfax>>\n<<branches.branchemail>>\r\n\r\nIf > you have registered a password with the library, you may use it with your > library card number to renew online. If an item becomes more than 30 days > overdue, you will be unable to use your library card until the item is > returned. The following item is currently overdue:\r\n\r\n<<items.content>>' > WHERE code = 'ODUE';' WHERE bit=9;"); > + SetVersion ($DBversion); > + print " Upgrade to $DBversion done (fixed language and typos in > notices.)\n"; > +} > + > =item DropAllForeignKeys($table) > > Drop all foreign keys of the table $table > diff --git a/kohaversion.pl b/kohaversion.pl > index 9701165..f5151fe 100644 > --- a/kohaversion.pl > +++ b/kohaversion.pl > @@ -10,7 +10,7 @@ > use strict; > > sub kohaversion { > - our $VERSION = '3.01.00.043'; > + our $VERSION = '3.01.00.044'; > # version needs to be set this way > # so that it can be picked up by Makefile.PL > # during install > -- > 1.5.6.5 > > > _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
