The AWSPrivateKey syspref is describe more fully
in a previous commit, but to summarize, it should
contain the Amazon Web Services Secret Access Key
required by Amazon to sign requests to their
Product Advertising API.
---
installer/data/mysql/en/mandatory/sysprefs.sql | 12 ++++++------
.../1-Obligatoire/unimarc_standard_systemprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 7 +++++++
kohaversion.pl | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
b/installer/data/mysql/en/mandatory/sysprefs.sql
index cb0cd04..1921948 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -2,11 +2,11 @@ INSERT INTO `systempreferences`
(variable,value,explanation,options,type) VALUES
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('advancedMARCeditor',0,'If ON, the MARC editor won\'t display
field/subfield descriptions','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES ('AllowHoldDateInFuture','0','If set a date field is displayed on the
Hold screen of the Staff Interface, allowing the hold date to be set in the
future.','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES ('OPACAllowHoldDateInFuture','0','If set, along with the
AllowHoldDateInFuture system preference, OPAC users can set the date of a hold
to be in the future.','','YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonEnabled',0,'Turn ON Amazon Content - You MUST set AWSAccessKeyID
and AmazonAssocTag if enabled','','YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonReviews',0,'Display Amazon review on staff interface - You MUST
set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You MUST
set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('OPACAmazonEnabled',0,'Turn ON Amazon Content in the OPAC - You MUST set
AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('OPACAmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You
MUST set AWSAccessKeyID and AmazonAssocTag if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonEnabled',0,'Turn ON Amazon Content - You MUST set AWSAccessKeyID,
AWSPrivateKey, and AmazonAssocTag if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonReviews',0,'Display Amazon review on staff interface - You MUST
set AWSAccessKeyID, AWSPrivateKey, and AmazonAssocTag if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You MUST
set AWSAccessKeyID, AWSPrivateKey, and AmazonAssocTag if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('OPACAmazonEnabled',0,'Turn ON Amazon Content in the OPAC - You MUST set
AWSAccessKeyID, AWSPrivateKey, and AmazonAssocTag if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('OPACAmazonSimilarItems',0,'Turn ON Amazon Similar Items feature - You
MUST set AWSAccessKeyID, AWSPrivateKey, and AmazonAssocTag if
enabled','','YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonLocale','US','Use to set the Locale of your Amazon.com Web
Services','US|CA|DE|FR|JP|UK','Choice');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AWSAccessKeyID','','See: http://aws.amazon.com','','free');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AmazonAssocTag','','See: http://aws.amazon.com','','free');
@@ -249,4 +249,4 @@ INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('v
INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('FilterBeforeOverdueReport','0','Do
not run overdue report until filter selected','','YesNo');
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('SpineLabelFormat',
'<itemcallnumber><copynumber>', '30|10', 'This preference defines the format
for the quick spine label printer. Just list the fields you would like to see
in the order you would like to see them, surrounded by <>, for example
<itemcallnumber>.', 'Textarea');
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint', '0', '',
'If this setting is turned on, a print dialog will automatically pop up for the
quick spine label printer.', 'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AWSPrivateKey','','See: http://aws.amazon.com','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AWSPrivateKey','','See: http://aws.amazon.com. Note that this is
required after 2009/08/15 in order to retrieve any enhanced content other than
book covers from Amazon.','','free');
diff --git
a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index db76715..d08415f 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -251,4 +251,4 @@ INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('v
INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('FilterBeforeOverdueReport','0','Ne
pas lancer le rapport sur les retards tant qu''il n''y a pas de
filtre','','YesNo');
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('SpineLabelFormat',
'<itemcallnumber><copynumber>', '30|10', 'This preference defines the format
for the quick spine label printer. Just list the fields you would like to see
in the order you would like to see them, surrounded by <>, for example
<itemcallnumber>.', 'Textarea');
INSERT INTO systempreferences
(variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint', '0', '',
'If this setting is turned on, a print dialog will automatically pop up for the
quick spine label printer.', 'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AWSPrivateKey','','See: http://aws.amazon.com','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('AWSPrivateKey','','Voir: http://aws.amazon.com. Notez que cela est
nécessaire après le 15 Aout 2009 pour pouvoir utiliser les webservices Amazon
autre que les couvertures de livre.','','free');
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 7dd236c..f81acaa 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2496,6 +2496,13 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
print "Upgrade to $DBversion done (AllowHoldDateInFuture and
OPACAllowHoldDateInFuture sysprefs)\n";
}
+$DBversion = '3.01.00.041';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO `systempreferences`
(variable,value,explanation,options,type) VALUES('AWSPrivateKey','','See:
http://aws.amazon.com. Note that this is required after 2009/08/15 in order to
retrieve any enhanced content other than book covers from Amazon.','','free')");
+ SetVersion ($DBversion);
+ print "Upgrade to $DBversion done (added AWSPrivateKey syspref - note that
if you use enhanced content from Amazon, this should be set right away.)";
+}
+
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table
diff --git a/kohaversion.pl b/kohaversion.pl
index 98eeb31..c9bdbb1 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
use strict;
sub kohaversion {
- our $VERSION = '3.01.00.040';
+ our $VERSION = '3.01.00.041';
# 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
