Bugzilla – Attachment 64472 Details for
Bug 17600
Standardize the EXPORT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17600: Export subroutine from modules
Bug-17600-Export-subroutine-from-modules.patch (text/plain), 32.33 KB, created by
Jonathan Druart
on 2017-06-20 19:32:09 UTC
(
hide
)
Description:
Bug 17600: Export subroutine from modules
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-06-20 19:32:09 UTC
Size:
32.33 KB
patch
obsolete
>From 91a780ab0939d4ae7f5551add9d0f5902a384b5f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 16 Jun 2017 11:51:42 -0300 >Subject: [PATCH] Bug 17600: Export subroutine from modules > >--- > C4/Accounts.pm | 18 +++--- > C4/Acquisition.pm | 101 ++++++++++++++++++--------------- > C4/Auth.pm | 18 +++++- > C4/Auth_with_cas.pm | 10 +++- > C4/Auth_with_ldap.pm | 11 +++- > C4/AuthoritiesMarc.pm | 47 ++++++++-------- > C4/Biblio.pm | 114 ++++++++++++++++++-------------------- > C4/Bookseller.pm | 12 ++++ > C4/Breeding.pm | 7 ++- > C4/Budgets.pm | 77 +++++++++++++------------ > C4/Circulation.pm | 92 +++++++++++++++++------------- > C4/HoldsQueue.pm | 17 ++++-- > C4/Items.pm | 29 ++++------ > C4/Koha.pm | 51 ++++++++--------- > C4/Languages.pm | 14 +++-- > C4/Letters.pm | 20 ++++++- > C4/Matcher.pm | 28 ++++++++++ > C4/Members.pm | 51 ++++++++--------- > C4/Reserves.pm | 84 +++++++++++++--------------- > C4/RotatingCollections.pm | 2 + > C4/Search.pm | 21 ++++--- > C4/Serials.pm | 82 +++++++++++++++++++-------- > C4/ShelfBrowser.pm | 4 +- > C4/SocialData.pm | 12 ++++ > C4/UsageStats.pm | 13 +++++ > C4/XSLT.pm | 7 ++- > Koha/Template/Plugin/KohaDates.pm | 2 +- > 27 files changed, 564 insertions(+), 380 deletions(-) > >diff --git a/C4/Accounts.pm b/C4/Accounts.pm >index 5ce3d65901..0dfe7f58c7 100644 >--- a/C4/Accounts.pm >+++ b/C4/Accounts.pm >@@ -35,15 +35,15 @@ BEGIN { > require Exporter; > @ISA = qw( Exporter ); > @EXPORT_OK = qw( >- &manualinvoice >- &getnextacctno >- &getcharges >- &ModNote >- &getcredits >- &getrefunds >- &chargelostitem >- &ReversePayment >- &purge_zero_balance_fees >+ getnextacctno >+ chargelostitem >+ manualinvoice >+ getcharges >+ ModNote >+ getcredits >+ getrefunds >+ ReversePayment >+ purge_zero_balance_fees > ); > } > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index a780623f57..da59f003ad 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -48,50 +48,63 @@ BEGIN { > require Exporter; > @ISA = qw( Exporter ); > >- @EXPORT = qw( >- &GetBasket &NewBasket &CloseBasket &ReopenBasket &DelBasket &ModBasket >- &GetBasketAsCSV &GetBasketGroupAsCSV >- &GetBasketsByBookseller &GetBasketsByBasketgroup >- &GetBasketsInfosByBookseller >- >- &GetBasketUsers &ModBasketUsers >- &CanUserManageBasket >- >- &ModBasketHeader >- >- &ModBasketgroup &NewBasketgroup &DelBasketgroup &GetBasketgroup &CloseBasketgroup >- &GetBasketgroups &ReOpenBasketgroup >- >- &DelOrder &ModOrder &GetOrder &GetOrders &GetOrdersByBiblionumber >- &GetLateOrders &GetOrderFromItemnumber >- &SearchOrders &GetHistory &GetRecentAcqui >- &ModReceiveOrder &CancelReceipt >- &TransferOrder >- &GetLastOrderNotReceivedFromSubscriptionid &GetLastOrderReceivedFromSubscriptionid >- &ModItemOrder >- >- &GetParcels >- >- &GetInvoices >- &GetInvoice >- &GetInvoiceDetails >- &AddInvoice >- &ModInvoice >- &CloseInvoice >- &ReopenInvoice >- &DelInvoice >- &MergeInvoices >- >- &GetItemnumbersFromOrder >- >- &AddClaim >- &GetBiblioCountByBasketno >- >- &GetOrderUsers >- &ModOrderUsers >- &NotifyOrderUsers >- >- &FillWithDefaultValues >+ @EXPORT_OK = qw( >+ GetOrderFromItemnumber >+ GetItemnumbersFromOrder >+ GetBasket >+ NewBasket >+ CloseBasket >+ ReopenBasket >+ GetBasketAsCSV >+ GetBasketGroupAsCSV >+ CloseBasketgroup >+ ReOpenBasketgroup >+ DelBasket >+ ModBasket >+ ModBasketHeader >+ GetBasketsByBookseller >+ GetBasketsInfosByBookseller >+ GetBasketUsers >+ ModBasketUsers >+ CanUserManageBasket >+ GetBasketsByBasketgroup >+ NewBasketgroup >+ ModBasketgroup >+ DelBasketgroup >+ GetBasketgroup >+ GetBasketgroups >+ GetOrders >+ GetOrdersByBiblionumber >+ GetOrder >+ GetLastOrderNotReceivedFromSubscriptionid >+ GetLastOrderReceivedFromSubscriptionid >+ ModOrder >+ ModItemOrder >+ ModReceiveOrder >+ CancelReceipt >+ SearchOrders >+ DelOrder >+ TransferOrder >+ GetParcels >+ GetLateOrders >+ GetHistory >+ GetRecentAcqui >+ AddClaim >+ GetInvoices >+ GetInvoice >+ GetInvoiceDetails >+ AddInvoice >+ ModInvoice >+ CloseInvoice >+ ReopenInvoice >+ DelInvoice >+ MergeInvoices >+ GetBiblioCountByBasketno >+ populate_order_with_prices >+ GetOrderUsers >+ ModOrderUsers >+ NotifyOrderUsers >+ FillWithDefaultValues > ); > } > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 3294cd6954..658318766c 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -53,8 +53,22 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash >- &get_all_subpermissions &get_user_subpermissions >+ psgi_env >+ safe_exit >+ get_template_and_user >+ haspermission >+ checkauth >+ check_api_auth >+ check_cookie_auth >+ get_session >+ checkpw >+ checkpw_internal >+ checkpw_hash >+ getuserflags >+ get_user_subpermissions >+ get_all_subpermissions >+ haspermission >+ getborrowernumber > ); > > $debug = $ENV{DEBUG}; >diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm >index fa6c95eb57..b0c2cb3b25 100644 >--- a/C4/Auth_with_cas.pm >+++ b/C4/Auth_with_cas.pm >@@ -36,7 +36,15 @@ BEGIN { > require Exporter; > $debug = $ENV{DEBUG}; > @ISA = qw(Exporter); >- @EXPORT_OK = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url); >+ @EXPORT_OK = qw( >+ multipleAuth >+ getMultipleAuth >+ logout_cas >+ login_cas >+ login_cas_url >+ checkpw_cas >+ check_api_auth_cas >+ ); > } > my $defaultcasserver; > my $casservers; >diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm >index 2c90989f87..d7b798a632 100644 >--- a/C4/Auth_with_ldap.pm >+++ b/C4/Auth_with_ldap.pm >@@ -36,7 +36,16 @@ our (@ISA, @EXPORT_OK); > BEGIN { > require Exporter; > @ISA = qw(Exporter); >- @EXPORT_OK = qw( checkpw_ldap ); >+ @EXPORT_OK = qw( >+ ldapserver_error >+ description >+ search_method >+ checkpw_ldap >+ ldap_entry_2_hash >+ exists_local >+ _do_changepassword >+ update_local >+ ); > } > > # Redefine checkpw_ldap: >diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm >index d43b6c0e93..3b938a5cf3 100644 >--- a/C4/AuthoritiesMarc.pm >+++ b/C4/AuthoritiesMarc.pm >@@ -41,29 +41,30 @@ BEGIN { > require Exporter; > @ISA = qw( Exporter ); > @EXPORT_OK = qw( >- &GetTagsLabels >- &GetAuthMARCFromKohaField >- >- &AddAuthority >- &ModAuthority >- &DelAuthority >- &GetAuthority >- &GetAuthorityXML >- >- &CountUsage >- &CountUsageChildren >- &SearchAuthorities >- >- &BuildSummary >- &BuildAuthHierarchies >- &BuildAuthHierarchy >- &GenerateHierarchy >- >- &merge >- &FindDuplicateAuthority >- >- &GuessAuthTypeCode >- &GuessAuthId >+ GetAuthMARCFromKohaField >+ SearchAuthorities >+ CountUsage >+ CountUsageChildren >+ GuessAuthTypeCode >+ GuessAuthId >+ GetTagsLabels >+ AddAuthority >+ DelAuthority >+ ModAuthority >+ GetAuthorityXML >+ GetAuthority >+ FindDuplicateAuthority >+ BuildSummary >+ GetAuthorizedHeading >+ BuildAuthHierarchies >+ BuildAuthHierarchy >+ BuildAuthHierarchyBranch >+ GenerateHierarchy >+ GetHeaderAuthority >+ AddAuthorityTrees >+ merge >+ append_fields_ordered >+ get_auth_type_location > ); > } > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index cbca8a1878..73b2c7bcc4 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -58,65 +58,61 @@ BEGIN { > # to add biblios > # EXPORTED FUNCTIONS. > @EXPORT_OK = qw( >- AddBiblio >- GetBiblio >- GetBiblioData >- GetMarcBiblio >- GetBiblioItemData >- GetBiblioItemInfosOf >- GetBiblioItemByBiblioNumber >- GetBiblioFromItemNumber >- GetBiblionumberFromItemnumber >- >- &GetRecordValue >- >- &GetISBDView >- >- &GetMarcControlnumber >- &GetMarcNotes >- &GetMarcISBN >- &GetMarcISSN >- &GetMarcSubjects >- &GetMarcAuthors >- &GetMarcSeries >- &GetMarcHosts >- GetMarcUrls >- &GetUsedMarcStructure >- &GetXmlBiblio >- &GetCOinSBiblio >- &GetMarcPrice >- &MungeMarcPrice >- &GetMarcQuantity >- >- &GetAuthorisedValueDesc >- &GetMarcStructure >- &IsMarcStructureInternal >- &GetMarcFromKohaField >- &GetMarcSubfieldStructureFromKohaField >- &GetFrameworkCode >- &TransformKohaToMarc >- &PrepHostMarcField >- >- &CountItemsIssued >- &CountBiblioInOrders >- &GetSubscriptionsId >- >- &ModBiblio >- &ModZebra >- &UpdateTotalIssues >- &RemoveAllNsb >- >- &DelBiblio >- >- &BiblioAutoLink >- &LinkBibHeadingsToAuthorities >- >- &ModBiblioMarc >- >- &TransformMarcToKoha >- &TransformHtmlToMarc >- &TransformHtmlToXml >- prepare_host_field >+ AddBiblio >+ ModBiblio >+ DelBiblio >+ BiblioAutoLink >+ LinkBibHeadingsToAuthorities >+ GetRecordValue >+ GetBiblioData >+ GetBiblioItemData >+ GetBiblioItemByBiblioNumber >+ GetBiblionumberFromItemnumber >+ GetBiblioFromItemNumber >+ GetISBDView >+ GetBiblio >+ GetBiblioItemInfosOf >+ IsMarcStructureInternal >+ GetMarcStructure >+ GetUsedMarcStructure >+ GetMarcSubfieldStructure >+ GetMarcFromKohaField >+ GetMarcSubfieldStructureFromKohaField >+ GetMarcBiblio >+ GetXmlBiblio >+ GetCOinSBiblio >+ GetMarcPrice >+ MungeMarcPrice >+ GetMarcQuantity >+ GetAuthorisedValueDesc >+ GetMarcControlnumber >+ GetMarcISBN >+ GetMarcISSN >+ GetMarcNotes >+ GetMarcSubjects >+ GetMarcAuthors >+ GetMarcUrls >+ GetMarcSeries >+ GetMarcHosts >+ UpsertMarcSubfield >+ UpsertMarcControlField >+ GetFrameworkCode >+ TransformKohaToMarc >+ PrepHostMarcField >+ TransformHtmlToXml >+ TransformHtmlToMarc >+ TransformMarcToKoha >+ CountItemsIssued >+ get_koha_field_from_marc >+ TransformMarcToKohaOneField >+ ModZebra >+ EmbedItemsInMarcBiblio >+ ModBiblioMarc >+ CountBiblioInOrders >+ GetSubscriptionsId >+ prepare_host_field >+ UpdateTotalIssues >+ RemoveAllNsb > ); > } > >diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm >index 6f3c1acda9..d0be619067 100644 >--- a/C4/Bookseller.pm >+++ b/C4/Bookseller.pm >@@ -21,6 +21,18 @@ package C4::Bookseller; > use strict; > use warnings; > >+our (@ISA, @EXPORT_OK); >+BEGIN { >+ >+ require Exporter; >+ @ISA = qw( Exporter ); >+ >+ @EXPORT_OK = qw( >+ GetBooksellersWithLateOrders >+ ); >+}; >+ >+ > =head1 NAME > > C4::Bookseller - Koha functions for dealing with booksellers. >diff --git a/C4/Breeding.pm b/C4/Breeding.pm >index 58e77ae592..7c9bc3ea1c 100644 >--- a/C4/Breeding.pm >+++ b/C4/Breeding.pm >@@ -35,7 +35,12 @@ our (@ISA, @EXPORT_OK); > BEGIN { > require Exporter; > @ISA = qw(Exporter); >- @EXPORT_OK = qw(&BreedingSearch &Z3950Search &Z3950SearchAuth); >+ @EXPORT_OK = qw( >+ BreedingSearch >+ Z3950Search >+ ImportBreedingAuth >+ Z3950SearchAuth >+ ); > } > > =head1 NAME >diff --git a/C4/Budgets.pm b/C4/Budgets.pm >index 26c83f11cf..c28de9f86e 100644 >--- a/C4/Budgets.pm >+++ b/C4/Budgets.pm >@@ -29,47 +29,46 @@ BEGIN { > require Exporter; > @ISA = qw( Exporter ); > @EXPORT_OK = qw( >- &GetBudget >- &GetBudgetByOrderNumber >- &GetBudgetByCode >- &GetBudgets >- &BudgetsByActivity >- &GetBudgetsReport >- &GetBudgetReport >- &GetBudgetHierarchy >- &AddBudget >- &ModBudget >- &DelBudget >- &GetBudgetSpent >- &GetBudgetOrdered >- &GetBudgetName >- &GetPeriodsCount >+ HideCols >+ GetCols >+ CheckBudgetParentPerm >+ AddBudgetPeriod >+ GetPeriodsCount >+ CheckBudgetParent >+ BudgetHasChildren >+ GetBudgetChildren >+ SetOwnerToFundHierarchy >+ GetBudgetsPlanCell >+ ModBudgetPlan >+ GetBudgetSpent >+ GetBudgetOrdered >+ GetBudgetName >+ GetBudgetAuthCats >+ GetBudgetPeriods >+ GetBudgetPeriod >+ DelBudgetPeriod >+ ModBudgetPeriod >+ GetBudgetHierarchy >+ AddBudget >+ ModBudget >+ DelBudget >+ GetBudget >+ GetBudgetByOrderNumber >+ GetBudgetReport >+ GetBudgetsByActivity >+ GetBudgetsReport >+ GetBudgetByCode > GetBudgetHierarchySpent > GetBudgetHierarchyOrdered >- >- &GetBudgetUsers >- &ModBudgetUsers >- &CanUserUseBudget >- &CanUserModifyBudget >- >- &GetBudgetPeriod >- &GetBudgetPeriods >- &ModBudgetPeriod >- &AddBudgetPeriod >- &DelBudgetPeriod >- >- &ModBudgetPlan >- >- &GetBudgetsPlanCell >- &AddBudgetPlanValue >- &GetBudgetAuthCats >- &BudgetHasChildren >- &CheckBudgetParent >- &CheckBudgetParentPerm >- >- &HideCols >- &GetCols >- ); >+ GetBudgets >+ GetBudgetUsers >+ ModBudgetUsers >+ CanUserUseBudget >+ CanUserModifyBudget >+ CloneBudgetPeriod >+ CloneBudgetHierarchy >+ MoveOrders >+ ); > } > > # ----------------------------BUDGETS.PM-----------------------------"; >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index d13eb9a069..be27b6f846 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -72,46 +72,58 @@ BEGIN { > > # FIXME subs that should probably be elsewhere > push @EXPORT_OK, qw( >- &barcodedecode >- &LostItem >- &ReturnLostItem >- &GetPendingOnSiteCheckouts >- >- &CanBookBeIssued >- &CanBookBeRenewed >- &AddIssue >- &AddRenewal >- &GetRenewCount >- &GetSoonestRenewDate >- &GetLatestAutoRenewDate >- &GetItemIssue >- &GetIssuingCharges >- &GetBranchBorrowerCircRule >- &GetBranchItemRule >- &GetBiblioIssues >- &GetOpenIssue >- &CheckIfIssuedToPatron >- &IsItemIssued >- GetTopIssues >- >- &AddReturn >- &MarkIssueReturned >- >- &transferbook >- &GetTransfers >- &GetTransfersFromTo >- &updateWrongTransfer >- &DeleteTransfer >- &IsBranchTransferAllowed >- &CreateBranchTransferLimit >- &DeleteBranchTransferLimits >- &TransferSlip >- >- &GetOfflineOperations >- &GetOfflineOperation >- &AddOfflineOperation >- &DeleteOfflineOperation >- &ProcessOfflineOperation >+ barcodedecode >+ decode >+ transferbook >+ TooMany >+ CanBookBeIssued >+ CanBookBeReturned >+ checkHighHolds >+ AddIssue >+ GetLoanLength >+ GetHardDueDate >+ GetBranchBorrowerCircRule >+ GetBranchItemRule >+ AddReturn >+ MarkIssueReturned >+ GetItemIssue >+ GetOpenIssue >+ GetBiblioIssues >+ GetUpcomingDueIssues >+ CanBookBeRenewed >+ AddRenewal >+ GetRenewCount >+ GetSoonestRenewDate >+ GetLatestAutoRenewDate >+ GetIssuingCharges >+ AddIssuingCharge >+ GetTransfers >+ GetTransfersFromTo >+ DeleteTransfer >+ SendCirculationAlert >+ updateWrongTransfer >+ UpdateHoldingbranch >+ CalcDateDue >+ CheckValidBarcode >+ IsBranchTransferAllowed >+ CreateBranchTransferLimit >+ DeleteBranchTransferLimits >+ ReturnLostItem >+ LostItem >+ GetOfflineOperations >+ GetOfflineOperation >+ AddOfflineOperation >+ DeleteOfflineOperation >+ ProcessOfflineOperation >+ ProcessOfflineReturn >+ ProcessOfflineIssue >+ ProcessOfflinePayment >+ TransferSlip >+ CheckIfIssuedToPatron >+ IsItemIssued >+ GetAgeRestriction >+ GetPendingOnSiteCheckouts >+ GetTopIssues > ); > } > >diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm >index 5b85584d8e..65487ff323 100755 >--- a/C4/HoldsQueue.pm >+++ b/C4/HoldsQueue.pm >@@ -39,11 +39,18 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &CreateQueue >- &GetHoldsQueueItems >- >- &TransportCostMatrix >- &UpdateTransportCostMatrix >+ TransportCostMatrix >+ UpdateTransportCostMatrix >+ GetHoldsQueueItems >+ CreateQueue >+ GetBibsWithPendingHoldRequests >+ GetPendingHoldRequestsForBib >+ GetItemsAvailableToFillHoldRequestsForBib >+ MapItemsToHoldRequests >+ CreatePicklistFromItemMap >+ AddToHoldTargetMap >+ load_branches_to_pull_from >+ least_cost_branch > ); > } > >diff --git a/C4/Items.pm b/C4/Items.pm >index e2dbe1c245..520c8fa4b8 100644 >--- a/C4/Items.pm >+++ b/C4/Items.pm >@@ -56,43 +56,38 @@ BEGIN { > # function exports > @EXPORT_OK = qw( > GetItem >+ CartToShelf >+ ShelfToCart > AddItemFromMarc > AddItem > AddItemBatchFromMarc > ModItemFromMarc >- Item2Marc > ModItem >- ModDateLastSeen > ModItemTransfer >+ ModDateLastSeen > DelItem >- > CheckItemPreSave >- > GetItemsForInventory > GetItemsByBiblioitemnumber > GetItemsInfo >- GetItemsLocationInfo >- GetHostItemsInfo >+ GetItemsLocationInfo >+ GetHostItemsInfo >+ GetLastAcquisitions > GetItemnumbersForBiblio >- get_hostitemnumbers_of >+ get_hostitemnumbers_of > GetItemnumberFromBarcode > GetBarcodeFromItemnumber > GetHiddenItemnumbers >+ GetMarcItem >+ Item2Marc >+ MoveItemFromBiblio > ItemSafeToDelete > DelItemCheck >- MoveItemFromBiblio >- GetLatestAcquisitions >- >- CartToShelf >- ShelfToCart >- >- GetAnalyticsCount >- >+ GetAnalyticsCount > SearchItemsByField > SearchItems >- > PrepareItemrecordDisplay >- >+ ToggleNewStatus > ); > } > >diff --git a/C4/Koha.pm b/C4/Koha.pm >index 07fb7d32c0..398fbdb324 100644 >--- a/C4/Koha.pm >+++ b/C4/Koha.pm >@@ -39,32 +39,33 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &GetPrinters &GetPrinter >- &getitemtypeinfo >- &GetItemTypesCategorized >- &getallthemes >- &getFacets >- &getnbpages >- &getitemtypeimagedir >- &getitemtypeimagesrc >- &getitemtypeimagelocation >- &GetAuthorisedValues >- &GetNormalizedUPC >- &GetNormalizedISBN >- &GetNormalizedEAN >- &GetNormalizedOCLCNumber >- &xml_escape >- >- &GetVariationsOfISBN >- &GetVariationsOfISBNs >- &NormalizeISBN >- &GetVariationsOfISSN >- &GetVariationsOfISSNs >- &NormalizeISSN >- >+ GetItemTypesCategorized >+ getitemtypeinfo >+ getitemtypeimagedir >+ getitemtypeimagesrc >+ getitemtypeimagelocation >+ getImageSets >+ GetPrinters >+ GetPrinter >+ getnbpages >+ getallthemes >+ getFacets >+ GetAuthorisedValues >+ xml_escape >+ display_marc_indicators >+ GetNormalizedUPC >+ GetNormalizedISBN >+ GetNormalizedEAN >+ GetNormalizedOCLCNumber > GetDailyQuote >- >- ); >+ NormalizeISBN >+ GetVariationsOfISBN >+ GetVariationsOfISBNs >+ NormalizeISSN >+ GetVariationsOfISSN >+ GetVariationsOfISSNs >+ IsKohaFieldLinked >+ ); > } > > =head1 NAME >diff --git a/C4/Languages.pm b/C4/Languages.pm >index be145dd9cc..60b39f3387 100644 >--- a/C4/Languages.pm >+++ b/C4/Languages.pm >@@ -33,12 +33,16 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &getFrameworkLanguages >- &getTranslatedLanguages >- &getLanguages >- &getAllLanguages >+ getFrameworkLanguages >+ getTranslatedLanguages >+ getAllLanguages >+ getLanguages >+ language_get_description >+ regex_lang_subtags >+ get_bidi >+ accept_language >+ getlanguage > ); >- push @EXPORT_OK, qw(getFrameworkLanguages getTranslatedLanguages getAllLanguages getLanguages get_bidi regex_lang_subtags language_get_description accept_language getlanguage); > $DEBUG = 0; > } > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 4868d27701..0745b2da21 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -43,7 +43,25 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &GetLetters &GetLettersAvailableForALibrary &GetLetterTemplates &DelLetter &GetPreparedLetter &GetWrappedLetter &addalert &getalert &delalert &findrelatedto &SendAlerts &GetPrintMessages &GetMessageTransportTypes >+ GetLetters >+ GetLetterTemplates >+ GetLettersAvailableForALibrary >+ getletter >+ DelLetter >+ addalert >+ delalert >+ getalert >+ findrelatedto >+ SendAlerts >+ GetPreparedLetter >+ EnqueueLetter >+ SendQueuedMessages >+ GetRSSMessages >+ GetPrintMessages >+ GetQueuedMessages >+ GetMessageTransportTypes >+ GetMessage >+ ResendMessage > ); > } > >diff --git a/C4/Matcher.pm b/C4/Matcher.pm >index 463a96cf9b..c7b5cc8710 100644 >--- a/C4/Matcher.pm >+++ b/C4/Matcher.pm >@@ -25,6 +25,34 @@ use Koha::SearchEngine; > use Koha::SearchEngine::Search; > use Koha::Util::Normalize qw( remove_spaces upper_case lower_case legacy_default ); > >+our (@ISA, @EXPORT_OK); >+BEGIN { >+ >+ require Exporter; >+ @ISA = qw( Exporter ); >+ >+ @EXPORT_OK = qw( >+ GetMatcherList >+ GetMatcherId >+ new >+ fetch >+ store >+ delete >+ record_type >+ threshold >+ code >+ description >+ add_matchpoint >+ add_simple_matchpoint >+ add_required_check >+ add_simple_required_check >+ get_matches >+ dump >+ valid_normalization_routines >+ ); >+}; >+ >+ > =head1 NAME > > C4::Matcher - find MARC records matching another one >diff --git a/C4/Members.pm b/C4/Members.pm >index 3e030d84f4..39a0c89a4f 100644 >--- a/C4/Members.pm >+++ b/C4/Members.pm >@@ -59,37 +59,30 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &GetMember >- >- &GetPendingIssues >- &GetAllIssues >- >- &GetFirstValidEmailAddress >- &GetNoticeEmailAddress >- >- &GetMemberAccountRecords >- &GetBorNotifyAcctRecord >- >- &GetBorrowersToExpunge >- >- &IssueSlip >+ patronflags >+ GetMember >+ ModMember >+ AddMember >+ Check_Userid >+ Generate_Userid >+ fixup_cardnumber >+ GetPendingIssues >+ GetAllIssues >+ GetMemberAccountRecords >+ GetMemberAccountBalance >+ GetBorNotifyAcctRecord >+ checkcardnumber >+ get_cardnumber_length >+ GetFirstValidEmailAddress >+ GetNoticeEmailAddress >+ GetBorrowersToExpunge >+ IssueSlip > GetBorrowersWithEmail >- >+ AddMember_Auto >+ AddMember_Opac >+ DeleteExpiredOpacRegistrations >+ DeleteUnverifiedOpacRegistrations > GetOverduesForPatron >- >- &ModMember >- &changepassword >- >- &AddMember >- &AddMember_Auto >- &AddMember_Opac >- >- &checkuniquemember >- &checkuserpassword >- &Check_Userid >- &Generate_Userid >- &fixup_cardnumber >- &checkcardnumber > ); > } > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index a4d652bf66..36d8850b66 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -100,53 +100,47 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &AddReserve >- >- &GetReserve >- &GetReservesFromBorrowernumber >- &GetReservesForBranch >- &GetReservesToBranch >- &GetReserveCount >- &GetReserveInfo >- &GetReserveStatus >- >- &GetOtherReserves >- >- &ModReserveFill >- &ModReserveAffect >- &ModReserve >- &ModReserveStatus >- &ModReserveCancelAll >- &ModReserveMinusPriority >- &MoveReserve >- >- &CheckReserves >- &CanBookBeReserved >- &CanItemBeReserved >- &CanReserveBeCanceledFromOpac >- &CancelReserve >- &CancelExpiredReserves >- >- &AutoUnsuspendReserves >- >- &IsAvailableForItemLevelRequest >- >- &OPACItemHoldsAllowed >- >- &AlterPriority >- &ToggleLowestPriority >- >- &ReserveSlip >- &ToggleSuspend >- &SuspendAll >- >- &GetReservesControlBranch >- >+ AddReserve >+ GetReserve >+ GetReservesFromBorrowernumber >+ CanBookBeReserved >+ CanItemBeReserved >+ CanReserveBeCanceledFromOpac >+ GetReserveCount >+ GetOtherReserves >+ ChargeReserveFee >+ GetReserveFee >+ GetReservesToBranch >+ GetReservesForBranch >+ GetReserveStatus >+ CheckReserves >+ CancelExpiredReserves >+ AutoUnsuspendReserves >+ CancelReserve >+ ModReserve >+ ModReserveFill >+ ModReserveStatus >+ ModReserveAffect >+ ModReserveCancelAll >+ ModReserveMinusPriority >+ GetReserveInfo >+ IsAvailableForItemLevelRequest >+ OnShelfHoldsAllowed >+ AlterPriority >+ ToggleLowestPriority >+ ToggleSuspend >+ SuspendAll >+ OPACItemHoldsAllowed >+ MoveReserve >+ MergeHolds >+ RevertWaitingStatus >+ GetReserveId >+ ReserveSlip >+ GetReservesControlBranch >+ CalculatePriority > IsItemOnHoldAndFound >- > GetMaxPatronHoldsForRecord >- >- MergeHolds >+ GetHoldRule > ); > } > >diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm >index 1a9a44195c..679db8e591 100644 >--- a/C4/RotatingCollections.pm >+++ b/C4/RotatingCollections.pm >@@ -62,6 +62,8 @@ BEGIN { > TransferCollection > > GetCollectionItemBranches >+ isItemInThisCollection >+ isItemInAnyCollection > ); > } > >diff --git a/C4/Search.pm b/C4/Search.pm >index 68f79c158c..22f855cbc3 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -41,19 +41,26 @@ use MARC::Record; > use MARC::Field; > use vars qw($DEBUG); > >+our (@ISA, @EXPORT_OK); > BEGIN { > $DEBUG = ($ENV{DEBUG}) ? 1 : 0; > > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &FindDuplicate >- &SimpleSearch >- &searchResults >- &getRecords >- &buildQuery >- &GetDistinctValues >- &enabled_staff_search_views >+ FindDuplicate >+ SimpleSearch >+ getRecords >+ GetFacets >+ pazGetRecords >+ getIndexes >+ parseQuery >+ buildQuery >+ searchResults >+ enabled_staff_search_views >+ z3950_search_args >+ GetDistinctValues >+ new_record_from_zebra > ); > } > >diff --git a/C4/Serials.pm b/C4/Serials.pm >index f534e70cf3..740e62fffd 100644 >--- a/C4/Serials.pm >+++ b/C4/Serials.pm >@@ -63,30 +63,64 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &NewSubscription &ModSubscription &DelSubscription >- &GetSubscription &CountSubscriptionFromBiblionumber &GetSubscriptionsFromBiblionumber >- &SearchSubscriptions >- &GetFullSubscriptionsFromBiblionumber &GetFullSubscription &ModSubscriptionHistory >- &HasSubscriptionStrictlyExpired &HasSubscriptionExpired &GetExpirationDate &abouttoexpire >- &GetSubscriptionHistoryFromSubscriptionId >- >- &GetNextSeq &GetSeq &NewIssue &GetSerials >- &GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2 >- &ReNewSubscription &GetLateOrMissingIssues >- &GetSerialInformation &AddItem2Serial >- &PrepareSerialsData &GetNextExpected &ModNextExpected >- &GetPreviousSerialid >- >- &GetSuppliersWithLateIssues &getsupplierbyserialid >- &GetDistributedTo &SetDistributedTo >- &getroutinglist &delroutingmember &addroutingmember >- &reorder_members >- &check_routing &updateClaim >- &CountIssues >- HasItems >- &GetSubscriptionsFromBorrower >- &subscriptionCurrentlyOnOrder >- >+ GetSuppliersWithLateIssues >+ GetSubscriptionHistoryFromSubscriptionId >+ GetSerialStatusFromSerialId >+ GetSerialInformation >+ AddItem2Serial >+ GetSubscription >+ GetFullSubscription >+ PrepareSerialsData >+ GetSubscriptionsFromBiblionumber >+ GetFullSubscriptionsFromBiblionumber >+ SearchSubscriptions >+ GetSerials >+ GetSerials2 >+ GetLatestSerials >+ GetPreviousSerialid >+ GetDistributedTo >+ GetNextSeq >+ GetSeq >+ GetExpirationDate >+ CountSubscriptionFromBiblionumber >+ ModSubscriptionHistory >+ ModSerialStatus >+ GetNextExpected >+ ModNextExpected >+ GetSubscriptionIrregularities >+ ModSubscription >+ NewSubscription >+ ReNewSubscription >+ NewIssue >+ HasSubscriptionStrictlyExpired >+ HasSubscriptionExpired >+ SetDistributedto >+ DelSubscription >+ DelIssue >+ GetLateOrMissingIssues >+ updateClaim >+ getsupplierbyserialid >+ check_routing >+ addroutingmember >+ reorder_members >+ delroutingmember >+ getroutinglist >+ countissuesfrom >+ CountIssues >+ HasItems >+ abouttoexpire >+ in_array >+ GetSubscriptionsFromBorrower >+ GetFictiveIssueNumber >+ GetNextDate >+ is_barcode_in_use >+ CloseSubscription >+ ReopenSubscription >+ subscriptionCurrentlyOnOrder >+ can_claim_subscription >+ can_edit_subscription >+ can_show_subscription >+ findSerialsByStatus > ); > } > >diff --git a/C4/ShelfBrowser.pm b/C4/ShelfBrowser.pm >index a570eaeb77..c6442fdfb7 100644 >--- a/C4/ShelfBrowser.pm >+++ b/C4/ShelfBrowser.pm >@@ -32,7 +32,9 @@ BEGIN { > require Exporter; > @ISA = qw(Exporter); > @EXPORT_OK = qw( >- &GetNearbyItems >+ GetNearbyItems >+ GetShelfInfo >+ GetBibData > ); > } > >diff --git a/C4/SocialData.pm b/C4/SocialData.pm >index 8217ccb49e..658f2254f6 100644 >--- a/C4/SocialData.pm >+++ b/C4/SocialData.pm >@@ -21,6 +21,18 @@ use C4::Context; > use Business::ISBN; > use C4::Koha qw( GetNormalizedISBN ); > >+our (@ISA, @EXPORT_OK); >+BEGIN { >+ require Exporter; >+ @ISA = qw( Exporter ); >+ >+ @EXPORT_OK = qw( >+ get_data >+ update_data >+ get_report >+ ); >+}: >+ > =head1 NAME > > C4::SocialData - Koha functions for dealing with social datas >diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm >index 96e79fadbc..9e6940784e 100644 >--- a/C4/UsageStats.pm >+++ b/C4/UsageStats.pm >@@ -25,6 +25,19 @@ use JSON; > > use Koha::Libraries; > >+our (@ISA, @EXPORT_OK); >+BEGIN { >+ >+ require Exporter; >+ @ISA = qw( Exporter ); >+ >+ @EXPORT_OK = qw( >+ NeedUpdate >+ BuildReport >+ ReportToCommunity >+ ); >+}; >+ > =head1 NAME > > C4::UsageStats >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index 910c1c69fc..6cdd6b3fd6 100644 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -48,7 +48,12 @@ BEGIN { > @ISA = qw( Exporter ); > > @EXPORT_OK = qw( >- &XSLTParse4Display >+ transformMARCXML4XSLT >+ getAuthorisedValues4MARCSubfields >+ get_xslt_sysprefs >+ XSLTParse4Display >+ buildKohaItemsNamespace >+ engine > ); > $engine=Koha::XSLT_Handler->new( { do_not_return_source => 1 } ); > } >diff --git a/Koha/Template/Plugin/KohaDates.pm b/Koha/Template/Plugin/KohaDates.pm >index 712c89f938..dc54409d2c 100644 >--- a/Koha/Template/Plugin/KohaDates.pm >+++ b/Koha/Template/Plugin/KohaDates.pm >@@ -22,7 +22,7 @@ use Modern::Perl; > use Template::Plugin::Filter; > use base qw( Template::Plugin::Filter ); > >-use Koha::DateUtils; >+use Koha::DateUtils qw( dt_from_string output_pref ); > our $DYNAMIC = 1; > > sub filter { >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17600
:
57394
|
57950
|
57951
|
57952
|
57953
|
57954
|
61994
|
61995
|
61996
|
61997
|
61998
|
62209
|
62210
|
62211
|
62212
|
62213
|
62940
|
62941
|
62942
|
62943
|
62958
|
62959
|
64387
|
64388
|
64389
|
64390
|
64391
|
64392
|
64466
|
64467
|
64468
|
64469
|
64470
|
64471
|
64472
|
64473
|
64474
|
64475
|
64476
|
121309
|
121310
|
121311
|
121312
|
121313
|
121314
|
122360
|
122361
|
122362
|
122363
|
122364
|
122365
|
122869
|
122884
|
122945
|
123194
|
123195
|
123196
|
123200
|
123210
|
123281
|
123283
|
123284
|
123325
|
123417
|
123418
|
123419
|
123420
|
123565
|
124866
|
125059
|
125063
|
125064
|
125066
|
126640
|
127056
|
127918