From 451b4cfb0464e636bb52513fc9b3c0c6f8fd2959 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 14 May 2010 16:10:52 -0400 Subject: [PATCH] bug 4509: remove references to PINESISBN system preference This system preference never worked; also, as far as I can tell, the PINES oISBN service was experimental, not meant for production use, and is not currently advertised. Signed-off-by: Galen Charlton --- C4/XISBN.pm | 9 ++------- admin/systempreferences.pl | 1 - installer/data/mysql/en/mandatory/sysprefs.sql | 3 +-- .../fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql | 1 - installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 - .../system_preferences_full_optimal_for_install_only.sql | 1 - .../system_preferences_only_translation_updating.sql | 3 --- .../system_preferences_full_optimal_for_install_only.sql | 1 - .../system_preferences_only_translation_updating.sql | 3 --- .../en/modules/admin/preferences/enhanced-content.pref | 1 - 10 files changed, 3 insertions(+), 21 deletions(-) diff --git a/C4/XISBN.pm b/C4/XISBN.pm index aa9687c2de..e015ce3102 100644 --- a/C4/XISBN.pm +++ b/C4/XISBN.pm @@ -85,7 +85,7 @@ sub _get_biblio_from_xisbn { sub get_xisbns { my ( $isbn ) = @_; - my ($response,$thing_response,$xisbn_response,$gapines_response,$syndetics_response); + my ($response,$thing_response,$xisbn_response,$syndetics_response); # THINGISBN if ( C4::Context->preference('ThingISBN') ) { my $url = "http://www.librarything.com/api/thingISBN/".$isbn; @@ -113,12 +113,7 @@ sub get_xisbns { } } - # PINES ISBN (Experimental) - #if ( C4::Context->preference('PINESISBN') ) { - # my $url = "http://www.librarything.com/api/thingISBN/".$isbn; - # $gapines_response = _get_url($url,'thingisbn'); - #} - $response->{isbn} = [ @{ $xisbn_response->{isbn} or [] }, @{ $syndetics_response->{isbn} or [] }, @{ $thing_response->{isbn} or [] }, @{ $gapines_response->{isbn} or [] } ]; + $response->{isbn} = [ @{ $xisbn_response->{isbn} or [] }, @{ $syndetics_response->{isbn} or [] }, @{ $thing_response->{isbn} or [] } ]; my @xisbns; my $unique_xisbns; # a hashref diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index ecdfa05302..6ed5310afa 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -291,7 +291,6 @@ $tabsysprefs{FRBRizeEditions} = "EnhancedContent"; $tabsysprefs{XISBN} = "EnhancedContent"; $tabsysprefs{OCLCAffiliateID} = "EnhancedContent"; $tabsysprefs{XISBNDailyLimit} = "EnhancedContent"; -$tabsysprefs{PINESISBN} = "EnhancedContent"; $tabsysprefs{ThingISBN} = "EnhancedContent"; $tabsysprefs{OPACFRBRizeEditions} = "EnhancedContent"; diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 62b55356ad..dbd832c1a9 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -126,7 +126,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the OCLC xISBN web service in the Editions tab on the detail pages. See: http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OCLCAffiliateID','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBNDailyLimit',499,'The xISBN Web service is free for non-commercial use when usage does not exceed 500 requests per day','','Integer'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('PINESISBN',0,'Use with FRBRizeEditions. If ON, Koha will use PINES OISBN web service in the Editions tab on the detail pages.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ThingISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the ThingISBN web service in the Editions tab on the detail pages.','','YesNo'); -- I18N/L10N @@ -287,4 +286,4 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI','0','Enables ILS-DI services at OPAC.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:Authorized_IPs','','.','Restricts usage of ILS-DI to some IPs','Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo'); \ No newline at end of file +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo'); 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 5948f86e46..7b852032f5 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 @@ -141,7 +141,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('XISBN',0,'Utilisé avec ''FRBRizeEditions''. Si activé, Koha va utiliser le service xISBN de l''OCLC dans l''onglet supplémentaire de la page de détail. Voir : http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OCLCAffiliateID','','Utilisé avec ''FRBRizeEditions'' and ''XISBN''. Vous pouvez obtenir un AffiliateID à l''adresse : http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('XISBNDailyLimit',499,'Le service XISBN est gratuit pour tout usage non commercial, dans la limite de 500 interrogations quotidiennes.','','Integer'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PINESISBN',0,'Utilisé avec ''FRBRizeEditions''. Si activé, koha utilisera le service ''PINES OISBN'' dans l''onglet supplémentaire de la page de détail de notice.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ThingISBN',0,'Utilisé avec ''FRBRizeEditions''. Si activé, Koha utilisera le service ''ThingISBN'' dans l''onglet supplémentaire de la page de détail de notice.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WebBasedSelfCheck',0,'Si activé, permet le système de prêt auto-controlé à partir de l''opac (/cgi-bin/koha/sco/sco-main.pl',NULL,'YesNo'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index 66f8021524..d0db52a65a 100644 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -127,7 +127,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the OCLC xISBN web service in the Editions tab on the detail pages. See: http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OCLCAffiliateID','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBNDailyLimit',499,'The xISBN Web service is free for non-commercial use when usage does not exceed 500 requests per day','','Integer'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('PINESISBN',0,'Use with FRBRizeEditions. If ON, Koha will use PINES OISBN web service in the Editions tab on the detail pages.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ThingISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the ThingISBN web service in the Editions tab on the detail pages.','','YesNo'); -- I18N/L10N diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index ba8a349b27..e3661b36e3 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -157,7 +157,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the OCLC xISBN web service in the Editions tab on the detail pages. See: http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OCLCAffiliateID','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBNDailyLimit',499,'The xISBN Web service is free for non-commercial use when usage does not exceed 500 requests per day','','Integer'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('PINESISBN',0,'Use with FRBRizeEditions. If ON, Koha will use PINES OISBN web service in the Editions tab on the detail pages.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ThingISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the ThingISBN web service in the Editions tab on the detail pages.','','YesNo'); -- I18N/L10N diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql index 869503cb25..dc295d2292 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql @@ -124,9 +124,6 @@ UPDATE systempreferences SET explanation='Включить возможност UPDATE systempreferences SET explanation='Если включено, то ЭК будет опрашивать один или несколько веб-сервисов ISBN касательно связанных ISBN и отобразит на вкладке «Издания» на странице с подробностями' WHERE variable='OPACFRBRizeEditions'; -- If ON, the OPAC will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages -UPDATE systempreferences SET explanation='Используется с FRBRizeEditions. Если включено, Коха использует веб-сервис PINES OISBN для вкладки «Издания» на странице с подробностями.' WHERE variable='PINESISBN'; --- Use with FRBRizeEditions. If ON, Koha will use PINES OISBN web service in the Editions tab on the detail pages. - UPDATE systempreferences SET explanation='Включает или выключает все функции меток. Это основной переключатель для меток.' WHERE variable='TagsEnabled'; -- Enables or disables all tagging features. This is the main switch for tags. diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql index e22efcfa87..e45ad312af 100644 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -157,7 +157,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the OCLC xISBN web service in the Editions tab on the detail pages. See: http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OCLCAffiliateID','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('XISBNDailyLimit',499,'The xISBN Web service is free for non-commercial use when usage does not exceed 500 requests per day','','Integer'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('PINESISBN',0,'Use with FRBRizeEditions. If ON, Koha will use PINES OISBN web service in the Editions tab on the detail pages.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ThingISBN',0,'Use with FRBRizeEditions. If ON, Koha will use the ThingISBN web service in the Editions tab on the detail pages.','','YesNo'); -- I18N/L10N diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql index b1b78875c4..5a8bb0d356 100644 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql @@ -124,9 +124,6 @@ UPDATE systempreferences SET explanation='Включити можливість UPDATE systempreferences SET explanation='Якщо ввімкнуто, то ЕК буде опитувати один чи більше веб-сервісів ISBN щодо пов’язаних ISBN та відобразить на вкладці «Видання» на сторінці з подробицями' WHERE variable='OPACFRBRizeEditions'; -- If ON, the OPAC will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages -UPDATE systempreferences SET explanation='Використовується з FRBRizeEditions. Якщо ввімкнуто, Коха використає веб-сервіс PINES OISBN для вкладки «Видання» на сторінці з подробицями.' WHERE variable='PINESISBN'; --- Use with FRBRizeEditions. If ON, Koha will use PINES OISBN web service in the Editions tab on the detail pages. - UPDATE systempreferences SET explanation='Вмикає або вимикає усі функцій міток. Це основний перемикач для міток.' WHERE variable='TagsEnabled'; -- Enables or disables all tagging features. This is the main switch for tags. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref index cf89468316..5ab6c6729a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref @@ -1,5 +1,4 @@ Enhanced Content: -# Broken, omitted: PINESISBN All: - - NOTE: if you have more than one source of cover images set up, Koha will use the first available. -- 2.20.1