Browse Source

functions that were in C4::Interface::CGI::Output are now in C4::Output.

So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
3.0.x
hdl 15 years ago
parent
commit
100e6a9808
  1. 1
      C4/Auth.pm
  2. 64
      C4/Output.pm
  3. 1
      about.pl
  4. 1
      acqui/acqui-home.pl
  5. 2
      acqui/addorder.pl
  6. 1
      acqui/basket.pl
  7. 2
      acqui/bookfund.pl
  8. 1
      acqui/booksellers.pl
  9. 2
      acqui/histsearch.pl
  10. 1
      acqui/lateorders.pl
  11. 3
      acqui/neworderbiblio.pl
  12. 1
      acqui/neworderempty.pl
  13. 2
      acqui/newordersuggestion.pl
  14. 2
      acqui/orderreceive.pl
  15. 3
      acqui/parcel.pl
  16. 1
      acqui/parcels.pl
  17. 2
      acqui/spent.pl
  18. 1
      acqui/supplier.pl
  19. 1
      admin/admin-home.pl
  20. 1
      admin/aqbookfund.pl
  21. 1
      admin/aqbudget.pl
  22. 1
      admin/auth_subfields_structure.pl
  23. 1
      admin/auth_tag_structure.pl
  24. 1
      admin/authorised_values.pl
  25. 3
      admin/authtypes.pl
  26. 3
      admin/biblio_framework.pl
  27. 1
      admin/branches.pl
  28. 4
      admin/categorie.pl
  29. 4
      admin/categoryitem.pl
  30. 1
      admin/checkmarc.pl
  31. 4
      admin/cities.pl
  32. 4
      admin/currency.pl
  33. 4
      admin/finesrules.pl
  34. 3
      admin/issuingrules.pl
  35. 3
      admin/itemtypecategory.pl
  36. 3
      admin/itemtypes.pl
  37. 3
      admin/itemtypesubcategory.pl
  38. 1
      admin/koha2marclinks.pl
  39. 1
      admin/letter.pl
  40. 1
      admin/marc_subfields_structure.pl
  41. 1
      admin/marctagstructure.pl
  42. 3
      admin/mediatype.pl
  43. 2
      admin/printers.pl
  44. 3
      admin/roadtype.pl
  45. 1
      admin/systempreferences.pl
  46. 4
      admin/thesaurus.pl
  47. 5
      admin/z3950servers.pl
  48. 2
      authorities/auth_finder.pl
  49. 1
      authorities/authorities-home.pl
  50. 1
      authorities/authorities.pl
  51. 1
      authorities/blinddetail-biblio-search.pl
  52. 1
      authorities/detail-biblio-search.pl
  53. 1
      authorities/detail.pl
  54. 3
      barcodes/barcodes.pl
  55. 1
      barcodes/label-home.pl
  56. 1
      barcodes/label-item-search.pl
  57. 1
      barcodes/label-manager.pl
  58. 1
      barcodes/label-print-opus-pdf.pl
  59. 1
      barcodes/label-print-pdf.pl
  60. 1
      barcodes/label-print.pl
  61. 1
      barcodes/printerConfig.pl
  62. 8
      bookshelves/addbookbybiblionumber.pl
  63. 10
      bookshelves/shelves.pl
  64. 1
      catalogue/ISBDdetail.pl
  65. 1
      catalogue/MARCdetail.pl
  66. 2
      catalogue/detail.pl
  67. 3
      catalogue/detailprint.pl
  68. 3
      catalogue/dictionary.pl
  69. 2
      catalogue/issuehistory.pl
  70. 1
      catalogue/moredetail.pl
  71. 2
      catalogue/search.pl
  72. 1
      catalogue/suggest.pl
  73. 1
      cataloguing/addbiblio.pl
  74. 1
      cataloguing/addbooks.pl
  75. 1
      cataloguing/additem.pl
  76. 4
      cataloguing/thesaurus_popup.pl
  77. 2
      cataloguing/value_builder/labs_theses.pl
  78. 2
      cataloguing/value_builder/marc21_field_003.pl
  79. 2
      cataloguing/value_builder/marc21_field_005.pl
  80. 1
      cataloguing/value_builder/marc21_field_040c.pl
  81. 1
      cataloguing/value_builder/marc21_field_040d.pl
  82. 13
      cataloguing/value_builder/unimarc_field_210c.pl
  83. 2
      cataloguing/value_builder/unimarc_field_4XX.pl
  84. 2
      cataloguing/value_builder/usmarc_field_952v.pl
  85. 1
      cataloguing/z3950_search.pl
  86. 2
      circ/branchoverdues.pl
  87. 1
      circ/branchtransfers.pl
  88. 10
      circ/circulation.pl
  89. 1
      circ/overdue.pl
  90. 3
      circ/reserve.pl
  91. 7
      circ/returns.pl
  92. 1
      circ/selectbranchprinter.pl
  93. 3
      circ/stats.pl
  94. 1
      export/export.pl
  95. 1
      export/export_filtered.pl
  96. 1
      export/marc.pl
  97. 2
      help.pl
  98. 3
      installer/InstallAuth.pm
  99. 2
      installer/install.pl
  100. 1
      members/boraccount.pl

1
C4/Auth.pm

@ -26,7 +26,6 @@ use Digest::MD5 qw(md5_base64);
require Exporter;
use C4::Context;
use C4::Output; # to get the template
use C4::Interface::CGI::Output;
use C4::Members;
use C4::Koha;
use C4::Branch; # GetBranches

64
C4/Output.pm

@ -48,10 +48,18 @@ C4::Output - Functions for managing templates
=cut
@ISA = qw(Exporter);
@EXPORT = qw(
push @EXPORT, qw(
&themelanguage &gettemplate setlanguagecookie pagination_bar
);
#Output
push @EXPORT, qw(
&guesscharset
&guesstype
&output_html_with_http_headers
);
#FIXME: this is a quick fix to stop rc1 installing broken
#Still trying to figure out the correct fix.
my $path = C4::Context->config('intrahtdocs') . "/default/en/includes/";
@ -307,6 +315,60 @@ sub pagination_bar {
return $pagination_bar;
}
=item guesscharset
&guesscharset($output)
"Guesses" the charset from the some HTML that would be output.
C<$output> is the HTML page to be output. If it contains a META tag
with a Content-Type, the tag will be scanned for a language code.
This code is returned if it is found; undef is returned otherwise.
This function only does sloppy guessing; it will be confused by
unexpected things like SGML comments. What it basically does is to
grab something that looks like a META tag and scan it.
=cut
sub guesscharset ($) {
my($html) = @_;
my $charset = undef;
local($`, $&, $', $1, $2, $3);
# FIXME... These regular expressions will miss a lot of valid tags!
if ($html =~ /<meta\s+http-equiv=(["']?)Content-Type\1\s+content=(["'])text\/html\s*;\s*charset=([^\2\s\r\n]+)\2\s*(?:\/?)>/is) {
$charset = $3;
} elsif ($html =~ /<meta\s+content=(["'])text\/html\s*;\s*charset=([^\1\s\r\n]+)\1\s+http-equiv=(["']?)Content-Type\3\s*(?:\/?)>/is) {
$charset = $2;
}
return $charset;
} # guess
sub guesstype ($) {
my($html) = @_;
my $charset = guesscharset($html);
return defined $charset? "text/html; charset=$charset": "text/html";
}
=item output_html_with_http_headers
&output_html_with_http_headers($query, $cookie, $html)
Outputs the HTML page $html with the appropriate HTTP headers,
with the authentication cookie $cookie and a Content-Type that
corresponds to the HTML page $html.
=cut
sub output_html_with_http_headers ($$$) {
my($query, $cookie, $html) = @_;
print $query->header(
-type => guesstype($html),
-cookie => $cookie,
), $html;
}
END { } # module clean-up code here (global destructor)
1;

1
about.pl

@ -20,7 +20,6 @@ use strict;
require Exporter;
use C4::Output; # contains gettemplate
use C4::Interface::CGI::Output;
use C4::Auth;
use C4::Context;
use CGI;

1
acqui/acqui-home.pl

@ -44,7 +44,6 @@ use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Suggestions;

2
acqui/addorder.pl

@ -115,12 +115,10 @@ if it is an order from an existing suggestion : the id of this suggestion.
use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Acquisition;
use C4::Suggestions;
use C4::Biblio;
use C4::Output;
use C4::Interface::CGI::Output;

1
acqui/basket.pl

@ -27,7 +27,6 @@ use C4::Auth;
use C4::Koha;
use C4::Output;
use CGI;
use C4::Interface::CGI::Output;
use C4::Acquisition;

2
acqui/bookfund.pl

@ -21,7 +21,7 @@ use C4::Context;
use strict;
use CGI;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
my $dbh = C4::Context->dbh;
my $input = new CGI;

1
acqui/booksellers.pl

@ -58,7 +58,6 @@ use C4::Auth;
use C4::Biblio;
use C4::Output;
use CGI;
use C4::Interface::CGI::Output;
use C4::Acquisition;

2
acqui/histsearch.pl

@ -52,7 +52,7 @@ use strict;
require Exporter;
use CGI;
use C4::Auth; # get_template_and_user
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Acquisition;
my $input = new CGI;

1
acqui/lateorders.pl

@ -49,7 +49,6 @@ use C4::Bookseller;
use C4::Auth;
use C4::Koha;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use C4::Acquisition;
use C4::Letters;

3
acqui/neworderbiblio.pl

@ -57,12 +57,11 @@ the basket number to know on which basket this script have to add a new order.
use strict;
use C4::Search;
use CGI;
use C4::Output;
use C4::Bookseller;
use C4::Biblio;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Koha;
my $input = new CGI;

1
acqui/neworderempty.pl

@ -76,7 +76,6 @@ use C4::Biblio;
use C4::Output;
use C4::Input;
use C4::Koha;
use C4::Interface::CGI::Output;
use C4::Branch; # GetBranches
use C4::Members;

2
acqui/newordersuggestion.pl

@ -91,7 +91,7 @@ use strict;
require Exporter;
use CGI;
use C4::Auth; # get_template_and_user
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Suggestions;
use C4::Biblio;

2
acqui/orderreceive.pl

@ -63,7 +63,7 @@ use C4::Context;
use C4::Koha; # GetKohaAuthorisedValues GetItemTypes
use C4::Acquisition;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Date;
use C4::Bookseller;
use C4::Members;

3
acqui/parcel.pl

@ -59,9 +59,8 @@ use C4::Auth;
use C4::Acquisition;
use C4::Bookseller;
use C4::Biblio;
use C4::Output;
use CGI;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Date;
use strict;

1
acqui/parcels.pl

@ -65,7 +65,6 @@ use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Date;

2
acqui/spent.pl

@ -6,7 +6,7 @@
use C4::Context;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
use strict;
use CGI;

1
acqui/supplier.pl

@ -47,7 +47,6 @@ use C4::Acquisition;
use C4::Biblio;
use C4::Output;
use CGI;
use C4::Interface::CGI::Output;
use C4::Bookseller;

1
admin/admin-home.pl

@ -19,7 +19,6 @@ use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;

1
admin/aqbookfund.pl

@ -59,7 +59,6 @@ use C4::Koha;
use C4::Context;
use C4::Bookfund;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Date;
my $dbh = C4::Context->dbh;

1
admin/aqbudget.pl

@ -47,7 +47,6 @@ use C4::Auth;
use C4::Acquisition;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Koha;
my $input = new CGI;

1
admin/auth_subfields_structure.pl

@ -20,7 +20,6 @@
use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Context;

1
admin/auth_tag_structure.pl

@ -24,7 +24,6 @@ use C4::Auth;
use C4::Koha;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;

1
admin/authorised_values.pl

@ -22,7 +22,6 @@ use CGI;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;

3
admin/authtypes.pl

@ -24,9 +24,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {

3
admin/biblio_framework.pl

@ -24,9 +24,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {

1
admin/branches.pl

@ -48,7 +48,6 @@ use CGI;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Koha;
use C4::Branch;

4
admin/categorie.pl

@ -39,10 +39,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

4
admin/categoryitem.pl

@ -40,10 +40,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

1
admin/checkmarc.pl

@ -20,7 +20,6 @@
use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Context;

4
admin/cities.pl

@ -20,10 +20,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

4
admin/currency.pl

@ -40,10 +40,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

4
admin/finesrules.pl

@ -20,12 +20,10 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Output;
use C4::Koha;
use C4::Interface::CGI::Output;
use C4::Branch; # GetBranches
my $input = new CGI;

3
admin/issuingrules.pl

@ -21,11 +21,8 @@ use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Output;
use C4::Koha;
use C4::Interface::CGI::Output;
use C4::Branch; # GetBranches
my $input = new CGI;

3
admin/itemtypecategory.pl

@ -42,9 +42,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {

3
admin/itemtypes.pl

@ -45,9 +45,8 @@ use List::Util qw/min/;
use C4::Koha;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

3
admin/itemtypesubcategory.pl

@ -42,9 +42,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {

1
admin/koha2marclinks.pl

@ -19,7 +19,6 @@
use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Context;

1
admin/letter.pl

@ -43,7 +43,6 @@ use C4::Date;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
sub StringSearch {

1
admin/marc_subfields_structure.pl

@ -19,7 +19,6 @@
use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Context;

1
admin/marctagstructure.pl

@ -24,7 +24,6 @@ use C4::Auth;
use C4::Koha;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;

3
admin/mediatype.pl

@ -43,9 +43,8 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {

2
admin/printers.pl

@ -41,9 +41,7 @@ use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

3
admin/roadtype.pl

@ -21,9 +21,8 @@ use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

1
admin/systempreferences.pl

@ -47,7 +47,6 @@ use C4::Context;
use C4::Koha;
use C4::Languages;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;

4
admin/thesaurus.pl

@ -19,11 +19,9 @@
use strict;
use CGI;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::AuthoritiesMarc;
my $input = new CGI;

5
admin/z3950servers.pl

@ -20,13 +20,10 @@
# - we delete the record having primkey=$primkey
use strict;
use C4::Output;
use CGI;
use C4::Context;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
sub StringSearch {
my ($searchstring,$type)=@_;

2
authorities/auth_finder.pl

@ -21,7 +21,7 @@
use strict;
require Exporter;
use CGI;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Auth;
use C4::Context;

1
authorities/authorities-home.pl

@ -26,7 +26,6 @@ use C4::Auth;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::AuthoritiesMarc;
use C4::Acquisition;
use C4::Koha; # XXX subfield_is_koha_internal_p

1
authorities/authorities.pl

@ -23,7 +23,6 @@ use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Koha; # XXX subfield_is_koha_internal_p

1
authorities/blinddetail-biblio-search.pl

@ -44,7 +44,6 @@ use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use MARC::Record;
use C4::Koha;

1
authorities/detail-biblio-search.pl

@ -44,7 +44,6 @@ use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use MARC::Record;
use C4::Koha;

1
authorities/detail.pl

@ -44,7 +44,6 @@ use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use MARC::Record;
use C4::Koha;

3
barcodes/barcodes.pl

@ -3,7 +3,7 @@
# script to generate items barcodes
# written 07/04
# by Veleda Matias - matias_veleda@hotmail.com - Physics Library UNLP Argentina and
# Castañeda Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina and
# Castaeda Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina and
# This file is part of Koha.
#
@ -24,7 +24,6 @@ use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use C4::Barcodes::PrinterConfig;

1
barcodes/label-home.pl

@ -20,7 +20,6 @@ use CGI;
use C4::Auth;
use C4::Output;
use C4::Labels;
use C4::Interface::CGI::Output;
use C4::Context;

1
barcodes/label-item-search.pl

@ -27,7 +27,6 @@ use C4::Auth;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Biblio;
use C4::Acquisition;
use C4::Koha; # XXX subfield_is_koha_internal_p

1
barcodes/label-manager.pl

@ -20,7 +20,6 @@ use CGI;
use C4::Auth;
use C4::Labels;
use C4::Output;
use C4::Interface::CGI::Output;
use POSIX;

1
barcodes/label-print-opus-pdf.pl

@ -20,7 +20,6 @@ use CGI;
use C4::Labels;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use PDF::Reuse;
use PDF::Reuse::Barcode;

1
barcodes/label-print-pdf.pl

@ -36,7 +36,6 @@ use CGI;
use C4::Labels;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use PDF::Reuse;

1
barcodes/label-print.pl

@ -20,7 +20,6 @@ use CGI;
use C4::Auth;
use C4::Serials;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use GD::Barcode::UPCE;

1
barcodes/printerConfig.pl

@ -31,7 +31,6 @@ use C4::Auth;
use PDF::API2;
use PDF::API2::Page;
use PDF::API2::Util;
use C4::Interface::CGI::Output;
# This function returns the path to deal with the correct files, considering
# templates set and language.

8
bookshelves/addbookbybiblionumber.pl

@ -62,7 +62,6 @@ use C4::Output;
use C4::BookShelves;
use C4::Circulation;
use C4::Auth;
use C4::Interface::CGI::Output;
#use it only to debug !
@ -122,6 +121,13 @@ if ($shelfnumber || ($shelfnumber == -1)) { # the shelf already exist.
}
# $Log$
# Revision 1.8 2007/04/24 13:54:29 hdl
# functions that were in C4::Interface::CGI::Output are now in C4::Output.
# So this implies quite a change for files.
# Sorry about conflicts which will be caused.
# directory Interface::CGI should now be dropped.
# I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
#
# Revision 1.7 2007/04/04 16:46:22 tipaul
# HUGE COMMIT : code cleaning circulation.
#

10
bookshelves/shelves.pl

@ -65,11 +65,10 @@
use strict;
use CGI;
use C4::Output;
use C4::BookShelves;
use C4::Biblio;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
my $query = new CGI;
@ -281,6 +280,13 @@ sub shelves {
#
# $Log$
# Revision 1.13 2007/04/24 13:54:29 hdl
# functions that were in C4::Interface::CGI::Output are now in C4::Output.
# So this implies quite a change for files.
# Sorry about conflicts which will be caused.
# directory Interface::CGI should now be dropped.
# I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
#
# Revision 1.12 2007/04/04 16:46:22 tipaul
# HUGE COMMIT : code cleaning circulation.
#

1
catalogue/ISBDdetail.pl

@ -39,7 +39,6 @@ require Exporter;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Koha;
use C4::Biblio;

1
catalogue/MARCdetail.pl

@ -48,7 +48,6 @@ require Exporter;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Koha;
use MARC::Record;

2
catalogue/detail.pl

@ -22,7 +22,7 @@ require Exporter;
use CGI;
use C4::Auth;
use C4::Serials; #uses getsubscriptionfrom biblionumber
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Biblio;
use C4::Serials;

3
catalogue/detailprint.pl

@ -21,11 +21,10 @@
use strict;
require Exporter;
use C4::Context;
use C4::Output; # contains gettemplate
use CGI;
use C4::Auth;
use C4::Biblio;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Date;
my $query=new CGI;

3
catalogue/dictionary.pl

@ -20,7 +20,6 @@
use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
@ -149,7 +148,7 @@ if ($op eq "do_search") {
my @authresults;
my $authnbresults;
while ((my $authtypecode) = $sth->fetchrow) {
my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
my ($curauthresults,$nbresults) = SearchAuthorities([''],[''],[''],['contains'],
\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
if (defined(@$curauthresults)) {
for (my $i = 0; $i < @$curauthresults ;$i++) {

2
catalogue/issuehistory.pl

@ -21,7 +21,7 @@ use strict;
require Exporter;
use CGI;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Circulation; # GetBiblioIssues

1
catalogue/moredetail.pl

@ -27,7 +27,6 @@ use C4::Biblio; # to use &GetBiblioItemData &itemissues
use C4::Acquisition;
use C4::Output; # contains gettemplate
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Date;
use C4::Circulation; # to use itemissues

2
catalogue/search.pl

@ -145,7 +145,7 @@ use strict; # always use
# to perform, etc.
## load Koha modules
use C4::Context;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Auth;
use C4::Search;
use C4::Languages; # getAllLanguages

1
catalogue/suggest.pl

@ -26,7 +26,6 @@ use C4::Auth;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Biblio;
use C4::Acquisition;
use C4::Koha; # XXX subfield_is_koha_internal_p

1
cataloguing/addbiblio.pl

@ -23,7 +23,6 @@ use strict;
use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Biblio;
use C4::Search;
use C4::Context;

1
cataloguing/addbooks.pl

@ -38,7 +38,6 @@ use C4::Auth;
use C4::Biblio;
use C4::Breeding;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Koha;
use C4::Search;

1
cataloguing/additem.pl

@ -23,7 +23,6 @@ use CGI;
use strict;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Biblio;
use C4::Context;
use C4::Koha; # XXX subfield_is_koha_internal_p

4
cataloguing/thesaurus_popup.pl

@ -22,13 +22,11 @@
# Suite 330, Boston, MA 02111-1307 USA
use strict;
use C4::Auth;
use CGI;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Authorities;
use C4::Interface::CGI::Output;
# get all the data ....
my $input = new CGI;
my $result = $input->param('result');

2
cataloguing/value_builder/labs_theses.pl

@ -21,7 +21,7 @@ use strict;
require Exporter;
use CGI;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Context;
use C4::Auth;
use C4::Output;

2
cataloguing/value_builder/marc21_field_003.pl

@ -20,11 +20,9 @@
# Suite 330, Boston, MA 02111-1307 USA
require Exporter;
use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Search;
use MARC::Record;

2
cataloguing/value_builder/marc21_field_005.pl

@ -21,11 +21,9 @@
# Suite 330, Boston, MA 02111-1307 USA
require Exporter;
use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Search;
use MARC::Record;

1
cataloguing/value_builder/marc21_field_040c.pl

@ -24,7 +24,6 @@ use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Search;
use MARC::Record;

1
cataloguing/value_builder/marc21_field_040d.pl

@ -24,7 +24,6 @@ use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Search;
use MARC::Record;

13
cataloguing/value_builder/unimarc_field_210c.pl

@ -24,12 +24,11 @@ use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Search;
use MARC::Record;
use C4::Koha;
###TODO To rewrite in order to use SearchAuthorities
=head1
@ -64,10 +63,12 @@ my $function_name= "210c".(int(rand(100000))+1);
#---- 200$a for isbn
#---- 200$b for editor
#---- 200$c (repeated) for collections
my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table
left join auth_header on auth_subfield_table.authid=auth_header.authid
where authtypecode='EDITORS' and tag='200' and subfieldcode='a'");
my $sth2 = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='b' and authid=?");
my $sth;
#= $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table
# left join auth_header on auth_subfield_table.authid=auth_header.authid
# where authtypecode='EDITORS' and tag='200' and subfieldcode='a'");
my $sth2;
# = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='b' and authid=?");
$sth->execute;
my @editors;
my $authoritysep = C4::Context->preference("authoritysep");

2
cataloguing/value_builder/unimarc_field_4XX.pl

@ -20,7 +20,7 @@
use strict;
require Exporter;
use CGI;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Context;
use C4::Search;
use C4::Auth;

2
cataloguing/value_builder/usmarc_field_952v.pl

@ -20,11 +20,9 @@
# Suite 330, Boston, MA 02111-1307 USA
require Exporter;
use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Search;
use MARC::Record;

1
cataloguing/z3950_search.pl

@ -22,7 +22,6 @@ use CGI;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Biblio;
use C4::Context;
use C4::Breeding;

2
circ/branchoverdues.pl

@ -20,7 +20,7 @@
use strict;
use C4::Context;
use CGI;
use C4::Interface::CGI::Output;
use C4::Output;
use C4::Auth;
use C4::Date;
use C4::Overdues; # AddNotifyLine

1
circ/branchtransfers.pl

@ -28,7 +28,6 @@ use C4::Output;
use C4::Reserves;
use C4::Biblio;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Branch; # GetBranches
use C4::Koha;

10
circ/circulation.pl

@ -28,9 +28,13 @@ use C4::Output;
use C4::Print;
use C4::Auth;
use C4::Date;
use C4::Interface::CGI::Output;
use C4::Branch; # GetBranches
use C4::Koha; # GetPrinter
use C4::Circulation;
use C4::Members;
use C4::Biblio;
use C4::Reserves;
use Date::Calc qw(
Today
Today_and_Now
@ -39,10 +43,6 @@ use Date::Calc qw(
Date_to_Days
);
use C4::Circulation;
use C4::Members;
use C4::Biblio;
use C4::Reserves;
#
# PARAMETERS READING

1
circ/overdue.pl

@ -22,7 +22,6 @@
use strict;
use C4::Context;
use C4::Output;
use C4::Interface::CGI::Output;
use CGI;
use C4::Auth;
use C4::Date;

3
circ/reserve.pl

@ -20,12 +20,11 @@
# Suite 330, Boston, MA 02111-1307 USA
use strict;
use CGI;
use C4::Context;
use C4::Output;
use CGI;
use C4::Auth;
use C4::Date;
use C4::Interface::CGI::Output;
my $input = new CGI;
my $order = $input->param('order');

7
circ/returns.pl

@ -27,18 +27,17 @@ written 11/3/2002 by Finlay
use strict;
use CGI;
use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Circulation;
use C4::Date;
use C4::Output;
use C4::Print;
use C4::Reserves;
use C4::Auth;
use C4::Biblio;
use C4::Members;
use C4::Interface::CGI::Output;
use C4::Branch; # GetBranchName
use C4::Koha; # FIXME : is it still useful ?
use C4::Context;
my $query = new CGI;

1
circ/selectbranchprinter.pl

@ -23,7 +23,6 @@ use C4::Circulation;
use C4::Output;
use C4::Auth;
use C4::Print;
use C4::Interface::CGI::Output;
use C4::Koha;
use C4::Branch; # GetBranches

3
circ/stats.pl

@ -24,10 +24,9 @@
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Context;
use Date::Manip;
use C4::Stats;

1
export/export.pl

@ -22,7 +22,6 @@
use strict;
require Exporter;
use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Output; # contains gettemplate
use C4::Biblio;