From b49a0a30a15ea416bbf4e01d23d3db1e4e21ea0f Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 21 Oct 2010 21:36:45 -0400 Subject: [PATCH] bug 4176: remove references to unimplemented system preference MIME The intended functionality of this system preference was never implemented. To avoid template changes prior to 3.2.0, put in hard-coded string 'CSV' to (accurately) identify the type of the output files in the affected reports. Signed-off-by: Galen Charlton --- admin/aqplan.pl | 4 +-- admin/systempreferences.pl | 1 - .../data/mysql/de-DE/mandatory/sysprefs.sql | 1 - .../data/mysql/en/mandatory/sysprefs.sql | 1 - .../unimarc_standard_systemprefs.sql | 1 - .../data/mysql/it-IT/necessari/sysprefs.sql | 1 - .../data/mysql/pl-PL/mandatory/sysprefs.sql | 1 - ...ferences_full_optimal_for_install_only.sql | 1 - ..._preferences_only_translation_updating.sql | 3 --- ...ferences_full_optimal_for_install_only.sql | 1 - ..._preferences_only_translation_updating.sql | 3 --- .../en/modules/admin/preferences/admin.pref | 1 - reports/acquisitions_stats.pl | 8 +----- reports/bor_issues_top.pl | 3 +-- reports/borrowers_out.pl | 8 +----- reports/borrowers_stats.pl | 5 +--- reports/cat_issues_top.pl | 8 +----- reports/catalogue_out.pl | 3 +-- reports/catalogue_stats.pl | 3 +-- reports/issues_avg_stats.pl | 8 +----- reports/issues_stats.pl | 6 +---- reports/serials_stats.pl | 5 +--- tools/viewlog.pl | 25 +------------------ 23 files changed, 12 insertions(+), 89 deletions(-) diff --git a/admin/aqplan.pl b/admin/aqplan.pl index da4717925c..8efa427b91 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -95,7 +95,6 @@ my $show_actual = $input->param('show_actual'); my $show_percent = $input->param('show_percent'); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); my $del = $input->param("sep"); my $show_mine = $input->param('show_mine') ; @@ -332,11 +331,10 @@ foreach my $n (@names) { # ------------------------------------------------------------ # DEFAULT DISPLAY BEGINS -my @mime = ( C4::Context->preference("MIME") ); my $CGIextChoice = CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 97f9e1b467..58f8ac7377 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -88,7 +88,6 @@ $tabsysprefs{IndependantBranches} = "Admin"; $tabsysprefs{insecure} = "Admin"; $tabsysprefs{KohaAdmin} = "Admin"; $tabsysprefs{KohaAdminEmailAddress} = "Admin"; -$tabsysprefs{MIME} = "Admin"; $tabsysprefs{timeout} = "Admin"; $tabsysprefs{Intranet_includes} = "Admin"; $tabsysprefs{AutoLocation} = "Admin"; diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index a83bfc5605..339be61576 100644 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql @@ -60,7 +60,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME','EXCEL','Define the default application for exporting report data','EXCEL|OPENOFFICE.ORG','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo'); diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index e1bd137023..c5d451b877 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -60,7 +60,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME','EXCEL','Define the default application for exporting report data','EXCEL|OPENOFFICE.ORG','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'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 4e1dc4d6b5..1be8d7d96c 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 @@ -62,7 +62,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding', '5', 'Ce paramètre définit le montant maximal des dettes au dela duquel le lecteur ne peut plus faire de réservation', '', 'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves', '2', 'Ce paramètre définit le nombre maximal de réservations qu''un lecteur peut faire.', '', 'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution', '0', 'Vos adhérents sont ils membres d''une institution ?', NULL, 'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME', 'OPENOFFICE.ORG', 'Ce paramètre définit l''application par défaut à ouvrir lorsqu''on télécharge un fichier (OpenOffice.org ou MS-Excel habituellement)', 'EXCEL|OPENOFFICE.ORG', 'Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge', '5', 'Ce paramètre définit le montant maximal des dettes au delà duquel le lecteur ne peut plus emprunter', '', 'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture', '0', 'Ce paramètre permet d''être prévenu N jours avant l''expiration de la carte d''un adhérent, à la banque de prêt.', '', 'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('DebugLevel', '2', 'Définit le niveau d''affichage des erreurs en cas de problème : 0= aucun affichage, 1= un peu, 2=tout (peut être risqué pour la sécurité)', '0|1|2', 'Choice'); diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql index 6326b640d9..6bbdafcfee 100644 --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql @@ -95,7 +95,6 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('maxreserves','2','','Definisce il numero massimo di prenotazioni che un utente può effettuare.','Integer'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('memberofinstitution','0','','Se ON, gli utenti possono essere linkati alle istituzioni.','YesNo'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('MergeAuthoritiesOnUpdate','1','','Se ON, aggiornando le authorities saranno automaticamente aggiornati anche i record bibliografici','YesNo'); -insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('MIME','EXCEL','EXCEL|OPENOFFICE.ORG','Definisce l’applicazione usata di default per esportare i dati dei report','Choice'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('minPasswordLength','3','','Specifica la lunghezza minima della password sia per l\'utente che per lo staff','free'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('noissuescharge','5','','Definisce l’ammontare massimo di multa che un utente può raggiungere prima di venir sospeso dal prestito','Integer'); insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('noItemTypeImages','0','','Se Attivo, disabilita le immagini relative al tipo documento','YesNo'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index e44a3d2013..1735fe5c0c 100644 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -61,7 +61,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME','EXCEL','Define the default application for exporting report data','EXCEL|OPENOFFICE.ORG','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo'); 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 c0cd8ab14d..9fc7690bd8 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 @@ -93,7 +93,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME','OPENOFFICE.ORG','Define the default application for exporting report data','EXCEL|OPENOFFICE.ORG','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo'); 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 85462954ee..b3bb4e5cd0 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 @@ -26,9 +26,6 @@ UPDATE systempreferences SET explanation='Папка «includes» может б UPDATE systempreferences SET explanation='Адрес электронной почты, на который приходят запросы посетителей касательно модификации их учётных записей' WHERE variable='KohaAdminEmailAddress'; -- Define the email address where patron modification requests are sent -UPDATE systempreferences SET explanation='Программа по умолчанию для экспорта файлов отчётов' WHERE variable='MIME'; --- Define the default application for exporting report data - UPDATE systempreferences SET explanation='Если включено, то будут отключены изображения типов единиц' WHERE variable='noItemTypeImages'; -- If ON, disables item-type images 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 897dced183..607a9ecb02 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 @@ -93,7 +93,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME','OPENOFFICE.ORG','Define the default application for exporting report data','EXCEL|OPENOFFICE.ORG','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo'); 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 1c415e3c52..5d760a8ce8 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 @@ -25,9 +25,6 @@ UPDATE systempreferences SET explanation='Тека «includes» може бут UPDATE systempreferences SET explanation='Адреса електронної пошти, на яку приходять запити відвідувачів щодо модифікації їх облікових записів' WHERE variable='KohaAdminEmailAddress'; -- Define the email address where patron modification requests are sent -UPDATE systempreferences SET explanation='Програма за умовчанням для експорту файлів звітів' WHERE variable='MIME'; --- Define the default application for exporting report data - UPDATE systempreferences SET explanation='Якщо вімкнуто, то будуть відключені зображення типів одиниць' WHERE variable='noItemTypeImages'; -- If ON, disables item-type images diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 306e3afe6a..3ef972b6f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -1,5 +1,4 @@ Administration: -# Broken, omitted: MIME, OpacMaintenance # Only used internally, omitted: FrameworksLoaded, Version Interface options: - diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl index 6c29e47802..045a423ae5 100755 --- a/reports/acquisitions_stats.pl +++ b/reports/acquisitions_stats.pl @@ -57,7 +57,6 @@ my $aodsp = $input->param("AcquiredOnDisplay"); ##added by mason. my $calc = $input->param("Cellvalue"); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); #warn "calcul : ".$calc; my ($template, $borrowernumber, $cookie) @@ -229,15 +228,10 @@ else { -multiple => 0 ); - my @mime = ( C4::Context->preference("MIME") ); - foreach my $mime (@mime) { - # warn "".$mime; - } - my $CGIextChoice = CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl index 0290ab062a..9f912572a1 100755 --- a/reports/bor_issues_top.pl +++ b/reports/bor_issues_top.pl @@ -55,7 +55,6 @@ foreach ( @filters[0..3] ) { } my $output = $input->param("output"); my $basename = $input->param("basename"); -# my $mime = $input->param("MIME"); my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => $fullreportname, query => $input, @@ -110,7 +109,7 @@ my $dbh = C4::Context->dbh; my @values; # here each element returned by map is a hashref, get it? -my @mime = ( map { {type =>$_} } (split /[;:]/,C4::Context->preference("MIME")) ); +my @mime = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation my $delims = GetDelimiterChoices; my $branches = GetBranches; my @branchloop; diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl index a6de5f0204..0502dc6676 100755 --- a/reports/borrowers_out.pl +++ b/reports/borrowers_out.pl @@ -49,7 +49,6 @@ my @filters = $input->param("Filter"); $filters[1] = format_date_in_iso($filters[1]) if $filters[1]; my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); our $sep = $input->param("sep") || ''; $sep = "\t" if ($sep eq 'tabulation'); my ($template, $borrowernumber, $cookie) @@ -114,15 +113,10 @@ if ($do_it) { my %select; my $req; - my @mime = ( C4::Context->preference("MIME") ); -# foreach my $mime (@mime){ -# warn "".$mime; -# } - my $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl index f44c20ede3..c17a32683d 100755 --- a/reports/borrowers_stats.pl +++ b/reports/borrowers_stats.pl @@ -59,7 +59,6 @@ my $borstat = $input->param("status"); my $borstat1 = $input->param("activity"); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); our $sep = $input->param("sep"); $sep = "\t" if ($sep eq 'tabulation'); my $selected_branch; # = $input->param("?"); @@ -131,12 +130,10 @@ if ($do_it) { $req->execute; $template->param( SORT2_LOOP => $req->fetchall_arrayref({})); - my @mime = ( C4::Context->preference("MIME") ); - # warn 'MIME(s): ' . join ' ', @mime; my $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); my $CGIsepChoice=GetDelimiterChoices; diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index d07335e524..606106d2a4 100755 --- a/reports/cat_issues_top.pl +++ b/reports/cat_issues_top.pl @@ -53,7 +53,6 @@ $filters[2]=format_date_in_iso($filters[2]); $filters[3]=format_date_in_iso($filters[3]); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); #warn "calcul : ".$calc; my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => $fullreportname, @@ -119,15 +118,10 @@ if ($do_it) { my %select; my $req; - my @mime = ( C4::Context->preference("MIME") ); -# foreach my $mime (@mime){ -# warn "".$mime; -# } - my $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl index 36be473f48..87990c1564 100755 --- a/reports/catalogue_out.pl +++ b/reports/catalogue_out.pl @@ -45,7 +45,6 @@ my $column = $input->param("Criteria"); my @filters = $input->param("Filter"); my $output = $input->param("output"); my $basename = $input->param("basename") || 'catalogue_out'; -my $mime = $input->param("MIME"); my ($template, $borrowernumber, $cookie) = get_template_and_user({ template_name => "reports/catalogue_out.tmpl", query => $input, @@ -104,7 +103,7 @@ if ($do_it) { my @values; my %select; -my @mime = ( map { +{type =>$_} } (split /[;:]/,C4::Context->preference("MIME")) ); +my @mime = ( map { +{type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation my $itemtypes = GetItemTypes; my @itemtypeloop; foreach (sort {$itemtypes->{$a}->{description} cmp $itemtypes->{$b}->{description}} keys %$itemtypes) { diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl index 5f865f308e..11dff4d3cb 100755 --- a/reports/catalogue_stats.pl +++ b/reports/catalogue_stats.pl @@ -51,7 +51,6 @@ my $lccndigits = $input->param("lccndigits"); my $cotedigits = $input->param("cotedigits"); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); our $sep = $input->param("sep"); $sep = "\t" if ($sep eq 'tabulation'); my $item_itype; @@ -159,7 +158,7 @@ if ($do_it) { push @locations, { code => $_, description => "$_ - " . $locations->{$_} }; } - my @mime = ( map { +{type =>$_} } (split /[;:]/,C4::Context->preference("MIME")) ); + my @mime = ( map { +{type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation $template->param(hasdewey=>$hasdewey, haslccn => $haslccn, diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl index 8285bec0d6..f0f1dd5780 100755 --- a/reports/issues_avg_stats.pl +++ b/reports/issues_avg_stats.pl @@ -56,7 +56,6 @@ my $rodsp = $input->param("ReturnDisplay"); my $calc = $input->param("Cellvalue"); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); #warn "calcul : ".$calc; my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => $fullreportname, @@ -201,15 +200,10 @@ if ($do_it) { -size => 1, -multiple => 0 ); - my @mime = ( C4::Context->preference("MIME") ); -# foreach my $mime (@mime){ -# warn "".$mime; -# } - my $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index d1c0a04213..f932a6f1f8 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -61,7 +61,6 @@ my $monthsel = $input->param("PeriodMonthSel"); my $calc = $input->param("Cellvalue"); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); my ($template, $borrowernumber, $cookie) = get_template_and_user({ template_name => $fullreportname, query => $input, @@ -149,13 +148,10 @@ foreach (sort {$ccodes->{$a} cmp $ccodes->{$b}} keys %$ccodes) { push @ccodes, { code => $_, description => $ccodes->{$_} }; } -# various -my @mime = (C4::Context->preference("MIME")); - my $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl index 30dec07360..640ef603ad 100755 --- a/reports/serials_stats.pl +++ b/reports/serials_stats.pl @@ -48,7 +48,6 @@ my $expired = $input->param("expired"); my $order = $input->param("order"); my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); our $sep = $input->param("sep") || ''; $sep = "\t" if ($sep eq 'tabulation'); @@ -154,12 +153,10 @@ if($do_it){ push @branchloop, \%row; } - my @mime = ( C4::Context->preference("MIME") ); - # warn 'MIME(s): ' . join ' ', @mime; my $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', - -values => \@mime, + -values => ['CSV'], # FIXME translation -size => 1, -multiple => 0 ); my $CGIsepChoice=GetDelimiterChoices; diff --git a/tools/viewlog.pl b/tools/viewlog.pl index 48804517fe..84c247468b 100755 --- a/tools/viewlog.pl +++ b/tools/viewlog.pl @@ -53,7 +53,6 @@ my $info = $input->param("info"); my $datefrom = $input->param("from"); my $dateto = $input->param("to"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); #my $del = $input->param("sep"); my $output = $input->param("output") || "screen"; my $src = $input->param("src"); # this param allows us to be told where we were called from -fbcit @@ -102,29 +101,7 @@ $template->param( debug => $debug, C4::Search::enabled_staff_search_views, ); -# -#### This code was never really used - maybe some day some will fix it ### -#my @mime = ( C4::Context->preference("MIME") ); -#my $CGIextChoice = CGI::scrolling_list( -# -name => 'MIME', -# -id => 'MIME', -# -values => \@mime, -# -size => 1, -# -multiple => 0 -#); -#my @dels = ( C4::Context->preference("delimiter") ); -#my $CGIsepChoice = CGI::scrolling_list( -# -name => 'sep', -# -id => 'sep', -# -values => \@dels, -# -size => 1, -# -multiple => 0 -#); -#$template->param( -# CGIextChoice => $CGIextChoice, -# CGIsepChoice => $CGIsepChoice, -#); -# + if ($do_it) { my $results = GetLogs($datefrom,$dateto,$user,\@modules,$action,$object,$info); -- 2.20.1