koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha about.pl help.pl acqui/acqui-home.pl acqui...


From: Henri-Damien LAURENT
Subject: [Koha-cvs] koha about.pl help.pl acqui/acqui-home.pl acqui...
Date: Tue, 24 Apr 2007 13:54:32 +0000

CVSROOT:        /cvsroot/koha
Module name:    koha
Changes by:     Henri-Damien LAURENT <hdl>      07/04/24 13:54:30

Modified files:
        .              : about.pl help.pl 
        acqui          : acqui-home.pl addorder.pl basket.pl bookfund.pl 
                         booksellers.pl histsearch.pl lateorders.pl 
                         neworderbiblio.pl neworderempty.pl 
                         newordersuggestion.pl orderreceive.pl parcel.pl 
                         parcels.pl spent.pl supplier.pl 
        admin          : admin-home.pl aqbookfund.pl aqbudget.pl 
                         authorised_values.pl 
                         auth_subfields_structure.pl 
                         auth_tag_structure.pl authtypes.pl 
                         biblio_framework.pl branches.pl categorie.pl 
                         categoryitem.pl checkmarc.pl cities.pl 
                         currency.pl finesrules.pl issuingrules.pl 
                         itemtypecategory.pl itemtypes.pl 
                         itemtypesubcategory.pl koha2marclinks.pl 
                         letter.pl marc_subfields_structure.pl 
                         marctagstructure.pl mediatype.pl printers.pl 
                         roadtype.pl systempreferences.pl thesaurus.pl 
                         z3950servers.pl 
        authorities    : auth_finder.pl authorities-home.pl 
                         authorities.pl blinddetail-biblio-search.pl 
                         detail-biblio-search.pl detail.pl 
        barcodes       : barcodes.pl label-home.pl label-item-search.pl 
                         label-manager.pl label-print-opus-pdf.pl 
                         label-print-pdf.pl label-print.pl 
                         printerConfig.pl 
        bookshelves    : addbookbybiblionumber.pl shelves.pl 
        C4             : Auth.pm Output.pm 
        catalogue      : detail.pl detailprint.pl dictionary.pl 
                         ISBDdetail.pl issuehistory.pl MARCdetail.pl 
                         moredetail.pl search.pl suggest.pl 
        cataloguing    : addbiblio.pl addbooks.pl additem.pl 
                         thesaurus_popup.pl z3950_search.pl 
        cataloguing/value_builder: labs_theses.pl marc21_field_003.pl 
                                   marc21_field_005.pl 
                                   marc21_field_040c.pl 
                                   marc21_field_040d.pl 
                                   unimarc_field_210c.pl 
                                   unimarc_field_4XX.pl 
                                   usmarc_field_952v.pl 
        circ           : branchoverdues.pl branchtransfers.pl 
                         circulation.pl overdue.pl reserve.pl returns.pl 
                         selectbranchprinter.pl stats.pl 
        export         : export_filtered.pl export.pl marc.pl 
        installer      : InstallAuth.pm install.pl 
        members        : boraccount.pl borrowers_details.pl deletemem.pl 
                         guarantor_search.pl mancredit.pl maninvoice.pl 
                         memberentry.pl member-flags.pl 
                         member-password.pl member-picupload.pl 
                         member.pl members-home.pl moremember.pl pay.pl 
                         readingrec.pl 
        opac           : opac-account.pl opac-addbookbybiblionumber.pl 
                         opac-alert-subscribe.pl 
                         opac-authoritiesdetail.pl 
                         opac-authorities-home.pl opac-basket.pl 
                         opac-browser.pl opac-detail.pl 
                         opac-detailprint.pl opac-dictionary.pl 
                         opac-ISBDdetail.pl opac-main.pl 
                         opac-MARCdetail.pl opac-passwd.pl 
                         opac-readingrecord.pl opac-reserve.pl 
                         opac-review.pl opac-search.pl 
                         opac-sendbasket.pl opac-serial-issues.pl 
                         opac-shelves.pl opac-showreviews.pl 
                         opac-suggestions.pl opac-tags_subject.pl 
                         opac-topissues.pl opac-userdetails.pl 
                         opac-user.pl opac-userupdate.pl 
        reports        : acquisitions_stats.pl bor_issues_top.pl 
                         borrowers_out.pl borrowers_stats.pl 
                         catalogue_out.pl catalogue_stats.pl 
                         cat_issues_top.pl inventory.pl 
                         issues_avg_stats.pl issues_stats.pl manager.pl 
                         reports-home.pl reservereport.pl stats.print.pl 
                         stats.screen.pl 
        reserve        : request.pl 
        reviews        : reviewswaiting.pl 
        serials        : acqui-search.pl acqui-search-result.pl 
                         checkexpiration.pl claims.pl distributedto.pl 
                         lateissues-excel.pl member-search.pl receipt.pl 
                         reorder_members.pl routing.pl 
                         routing-preview.pl serial-issues.pl 
                         serials-collection.pl serials-edit.pl 
                         serials-home.pl serials-recieve.pl 
                         statecollection.pl subscription-add.pl 
                         subscription-bib-search.pl subscription-copy.pl 
                         subscription-detail.pl subscription-renew.pl 
                         viewalerts.pl 
        suggestion     : acceptorreject.pl 
        tools          : barcodes.pl breeding.pl cleanborrowers.pl 
                         exceptionHolidays.pl export.pl holidays.pl 
                         import.pl inventory.pl itemslost.pl 
                         koha-news.pl letter.pl newHolidays.pl 
                         overduerules.pl printerConfig.pl tools-home.pl 
                         viewlog.pl 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/about.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/help.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/acqui-home.pl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/addorder.pl?cvsroot=koha&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/basket.pl?cvsroot=koha&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/bookfund.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/booksellers.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/histsearch.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/lateorders.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/neworderbiblio.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/neworderempty.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/newordersuggestion.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/orderreceive.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/parcel.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/parcels.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/spent.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/supplier.pl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/admin/admin-home.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/admin/aqbookfund.pl?cvsroot=koha&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/koha/admin/aqbudget.pl?cvsroot=koha&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/koha/admin/authorised_values.pl?cvsroot=koha&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_subfields_structure.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_tag_structure.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/admin/authtypes.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/admin/biblio_framework.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/admin/branches.pl?cvsroot=koha&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/koha/admin/categorie.pl?cvsroot=koha&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/koha/admin/categoryitem.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/admin/checkmarc.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/admin/cities.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/admin/currency.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/admin/finesrules.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/admin/issuingrules.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/admin/itemtypecategory.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/admin/itemtypes.pl?cvsroot=koha&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/koha/admin/itemtypesubcategory.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/admin/koha2marclinks.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/admin/letter.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marc_subfields_structure.pl?cvsroot=koha&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marctagstructure.pl?cvsroot=koha&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/koha/admin/mediatype.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/admin/printers.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/admin/roadtype.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/koha/admin/thesaurus.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/admin/z3950servers.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/auth_finder.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities-home.pl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/blinddetail-biblio-search.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/detail-biblio-search.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/detail.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/barcodes.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-home.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-item-search.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-manager.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print-opus-pdf.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print-pdf.pl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-print.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/printerConfig.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/bookshelves/addbookbybiblionumber.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/bookshelves/shelves.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Output.pm?cvsroot=koha&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/detail.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/detailprint.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/dictionary.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/ISBDdetail.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/issuehistory.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/MARCdetail.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/moredetail.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/suggest.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/additem.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/thesaurus_popup.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/z3950_search.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/labs_theses.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/marc21_field_003.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/marc21_field_005.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/marc21_field_040c.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/marc21_field_040d.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/unimarc_field_210c.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/unimarc_field_4XX.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/value_builder/usmarc_field_952v.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/koha/circ/overdue.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/reserve.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/koha/circ/selectbranchprinter.pl?cvsroot=koha&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/koha/circ/stats.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/export/export_filtered.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/export/export.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/export/marc.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/installer/InstallAuth.pm?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/installer/install.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/members/boraccount.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/members/borrowers_details.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/members/guarantor_search.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/members/mancredit.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/members/maninvoice.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-flags.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-password.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-picupload.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/member.pl?cvsroot=koha&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/koha/members/members-home.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/koha/members/pay.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/members/readingrec.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-account.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-addbookbybiblionumber.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-alert-subscribe.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authoritiesdetail.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authorities-home.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-basket.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-browser.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detailprint.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-dictionary.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-ISBDdetail.pl?cvsroot=koha&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-passwd.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-readingrecord.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-review.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-sendbasket.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-serial-issues.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-shelves.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-showreviews.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-suggestions.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-tags_subject.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-topissues.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userdetails.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userupdate.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/reports/acquisitions_stats.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/reports/bor_issues_top.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_out.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_stats.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/reports/catalogue_out.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/reports/catalogue_stats.pl?cvsroot=koha&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/koha/reports/cat_issues_top.pl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/reports/inventory.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_avg_stats.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_stats.pl?cvsroot=koha&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/koha/reports/manager.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/reports/reports-home.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/reports/reservereport.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/reports/stats.print.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/stats.screen.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/reviews/reviewswaiting.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/serials/acqui-search.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/serials/acqui-search-result.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/serials/checkexpiration.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/serials/claims.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/serials/distributedto.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/serials/lateissues-excel.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/serials/member-search.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/serials/receipt.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/serials/reorder_members.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/serials/routing.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/serials/routing-preview.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serial-issues.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-collection.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-edit.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-home.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/serials/serials-recieve.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/serials/statecollection.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-add.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-bib-search.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-copy.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-detail.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-renew.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/serials/viewalerts.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/suggestion/acceptorreject.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/tools/barcodes.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/tools/breeding.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/tools/cleanborrowers.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/tools/exceptionHolidays.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/export.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/tools/holidays.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/tools/import.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/tools/inventory.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/tools/itemslost.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/koha-news.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/letter.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/newHolidays.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/overduerules.pl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/tools/printerConfig.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/tools-home.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/tools/viewlog.pl?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: about.pl
===================================================================
RCS file: /cvsroot/koha/koha/about.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- about.pl    9 Mar 2007 15:26:29 -0000       1.9
+++ about.pl    24 Apr 2007 13:54:28 -0000      1.10
@@ -20,7 +20,6 @@
 require Exporter;
 
 use C4::Output;  # contains gettemplate
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use C4::Context;
 use CGI;

Index: help.pl
===================================================================
RCS file: /cvsroot/koha/koha/help.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- help.pl     9 Mar 2007 15:26:29 -0000       1.4
+++ help.pl     24 Apr 2007 13:54:28 -0000      1.5
@@ -21,7 +21,7 @@
 use strict;
 require Exporter;
 use C4::Output;  # contains gettemplate
-use C4::Interface::CGI::Output;
+use C4::Output;
 # use C4::Auth;
 use C4::Context;
 use CGI;

Index: acqui/acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- acqui/acqui-home.pl 23 Apr 2007 13:10:07 -0000      1.18
+++ acqui/acqui-home.pl 24 Apr 2007 13:54:28 -0000      1.19
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: acqui-home.pl,v 1.18 2007/04/23 13:10:07 hdl Exp $
+# $Id: acqui-home.pl,v 1.19 2007/04/24 13:54:28 hdl Exp $
 
 
 =head1 NAME
@@ -44,7 +44,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 use C4::Suggestions;
 

Index: acqui/addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- acqui/addorder.pl   29 Mar 2007 16:45:53 -0000      1.37
+++ acqui/addorder.pl   24 Apr 2007 13:54:28 -0000      1.38
@@ -115,12 +115,10 @@
 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;
 
 
 

Index: acqui/basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- acqui/basket.pl     9 Mar 2007 14:28:54 -0000       1.36
+++ acqui/basket.pl     24 Apr 2007 13:54:28 -0000      1.37
@@ -20,14 +20,13 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: basket.pl,v 1.36 2007/03/09 14:28:54 tipaul Exp $
+# $Id: basket.pl,v 1.37 2007/04/24 13:54:28 hdl Exp $
 
 use strict;
 use C4::Auth;
 use C4::Koha;
 use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
 
 
 use C4::Acquisition;

Index: acqui/bookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/bookfund.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- acqui/bookfund.pl   9 Mar 2007 14:28:54 -0000       1.4
+++ acqui/bookfund.pl   24 Apr 2007 13:54:28 -0000      1.5
@@ -21,7 +21,7 @@
 use strict;
 use CGI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $dbh      = C4::Context->dbh;
 my $input    = new CGI;

Index: acqui/booksellers.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/booksellers.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- acqui/booksellers.pl        9 Mar 2007 14:28:54 -0000       1.4
+++ acqui/booksellers.pl        24 Apr 2007 13:54:28 -0000      1.5
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: booksellers.pl,v 1.4 2007/03/09 14:28:54 tipaul Exp $
+# $Id: booksellers.pl,v 1.5 2007/04/24 13:54:28 hdl Exp $
 
 =head1 NAME
 
@@ -58,7 +58,6 @@
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
 
 
 use C4::Acquisition;

Index: acqui/histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- acqui/histsearch.pl 9 Mar 2007 14:28:54 -0000       1.10
+++ acqui/histsearch.pl 24 Apr 2007 13:54:28 -0000      1.11
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: histsearch.pl,v 1.10 2007/03/09 14:28:54 tipaul Exp $
+# $Id: histsearch.pl,v 1.11 2007/04/24 13:54:28 hdl Exp $
 
 =head1 NAME
 
@@ -52,7 +52,7 @@
 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;

Index: acqui/lateorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/lateorders.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- acqui/lateorders.pl 9 Mar 2007 14:28:54 -0000       1.8
+++ acqui/lateorders.pl 24 Apr 2007 13:54:28 -0000      1.9
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: lateorders.pl,v 1.8 2007/03/09 14:28:54 tipaul Exp $
+# $Id: lateorders.pl,v 1.9 2007/04/24 13:54:28 hdl Exp $
 
 =head1 NAME
 
@@ -49,7 +49,6 @@
 use C4::Auth;
 use C4::Koha;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Acquisition;
 use C4::Letters;

Index: acqui/neworderbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/neworderbiblio.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- acqui/neworderbiblio.pl     29 Mar 2007 13:31:01 -0000      1.5
+++ acqui/neworderbiblio.pl     24 Apr 2007 13:54:28 -0000      1.6
@@ -57,12 +57,11 @@
 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;

Index: acqui/neworderempty.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/neworderempty.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- acqui/neworderempty.pl      23 Apr 2007 13:10:07 -0000      1.5
+++ acqui/neworderempty.pl      24 Apr 2007 13:54:28 -0000      1.6
@@ -76,7 +76,6 @@
 use C4::Output;
 use C4::Input;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Branch; # GetBranches
 use C4::Members;
 

Index: acqui/newordersuggestion.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newordersuggestion.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- acqui/newordersuggestion.pl 9 Mar 2007 14:28:54 -0000       1.6
+++ acqui/newordersuggestion.pl 24 Apr 2007 13:54:28 -0000      1.7
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: newordersuggestion.pl,v 1.6 2007/03/09 14:28:54 tipaul Exp $
+# $Id: newordersuggestion.pl,v 1.7 2007/04/24 13:54:28 hdl Exp $
 
 =head1 NAME
 
@@ -91,7 +91,7 @@
 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;
 

Index: acqui/orderreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/orderreceive.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- acqui/orderreceive.pl       9 Mar 2007 15:34:17 -0000       1.4
+++ acqui/orderreceive.pl       24 Apr 2007 13:54:28 -0000      1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: orderreceive.pl,v 1.4 2007/03/09 15:34:17 tipaul Exp $
+# $Id: orderreceive.pl,v 1.5 2007/04/24 13:54:28 hdl Exp $
 
 #script to recieve orders
 #written by address@hidden 24/2/2000
@@ -63,7 +63,7 @@
 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;

Index: acqui/parcel.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/parcel.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- acqui/parcel.pl     9 Mar 2007 14:28:54 -0000       1.5
+++ acqui/parcel.pl     24 Apr 2007 13:54:28 -0000      1.6
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: parcel.pl,v 1.5 2007/03/09 14:28:54 tipaul Exp $
+# $Id: parcel.pl,v 1.6 2007/04/24 13:54:28 hdl Exp $
 
 #script to recieve orders
 #written by address@hidden 24/2/2000
@@ -59,9 +59,8 @@
 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;

Index: acqui/parcels.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/parcels.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- acqui/parcels.pl    9 Mar 2007 15:34:17 -0000       1.4
+++ acqui/parcels.pl    24 Apr 2007 13:54:28 -0000      1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: parcels.pl,v 1.4 2007/03/09 15:34:17 tipaul Exp $
+# $Id: parcels.pl,v 1.5 2007/04/24 13:54:28 hdl Exp $
 
 #script to show display basket of orders
 #written by address@hidden 24/2/2000
@@ -65,7 +65,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 use C4::Date;
 

Index: acqui/spent.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/spent.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- acqui/spent.pl      9 Mar 2007 15:34:17 -0000       1.3
+++ acqui/spent.pl      24 Apr 2007 13:54:28 -0000      1.4
@@ -6,7 +6,7 @@
 
 use C4::Context;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use strict;
 use CGI;
 

Index: acqui/supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- acqui/supplier.pl   9 Mar 2007 14:28:54 -0000       1.15
+++ acqui/supplier.pl   24 Apr 2007 13:54:28 -0000      1.16
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: supplier.pl,v 1.15 2007/03/09 14:28:54 tipaul Exp $
+# $Id: supplier.pl,v 1.16 2007/04/24 13:54:28 hdl Exp $
 
 #script to show display basket of orders
 #written by address@hidden 24/2/2000
@@ -47,7 +47,6 @@
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
 
 
 use C4::Bookseller;

Index: admin/admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/admin-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin/admin-home.pl 9 Mar 2007 14:30:55 -0000       1.5
+++ admin/admin-home.pl 24 Apr 2007 13:54:28 -0000      1.6
@@ -19,7 +19,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 

Index: admin/aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- admin/aqbookfund.pl 9 Mar 2007 14:30:55 -0000       1.33
+++ admin/aqbookfund.pl 24 Apr 2007 13:54:28 -0000      1.34
@@ -59,7 +59,6 @@
 use C4::Context;
 use C4::Bookfund;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Date;
 
 my $dbh = C4::Context->dbh;

Index: admin/aqbudget.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbudget.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- admin/aqbudget.pl   9 Mar 2007 14:30:55 -0000       1.25
+++ admin/aqbudget.pl   24 Apr 2007 13:54:28 -0000      1.26
@@ -47,7 +47,6 @@
 use C4::Acquisition;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Koha;
 
 my $input = new CGI;

Index: admin/authorised_values.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- admin/authorised_values.pl  18 Apr 2007 17:00:14 -0000      1.20
+++ admin/authorised_values.pl  24 Apr 2007 13:54:28 -0000      1.21
@@ -22,7 +22,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 use C4::Context;
 

Index: admin/auth_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- admin/auth_subfields_structure.pl   18 Apr 2007 17:00:14 -0000      1.11
+++ admin/auth_subfields_structure.pl   24 Apr 2007 13:54:28 -0000      1.12
@@ -20,7 +20,6 @@
 
 use strict;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use CGI;
 use C4::Context;

Index: admin/auth_tag_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- admin/auth_tag_structure.pl 18 Apr 2007 17:00:14 -0000      1.9
+++ admin/auth_tag_structure.pl 24 Apr 2007 13:54:28 -0000      1.10
@@ -24,7 +24,6 @@
 use C4::Koha;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: admin/authtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/authtypes.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- admin/authtypes.pl  18 Apr 2007 17:00:14 -0000      1.8
+++ admin/authtypes.pl  24 Apr 2007 13:54:28 -0000      1.9
@@ -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  {

Index: admin/biblio_framework.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/biblio_framework.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- admin/biblio_framework.pl   18 Apr 2007 17:00:14 -0000      1.7
+++ admin/biblio_framework.pl   24 Apr 2007 13:54:28 -0000      1.8
@@ -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  {

Index: admin/branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- admin/branches.pl   18 Apr 2007 17:00:14 -0000      1.39
+++ admin/branches.pl   24 Apr 2007 13:54:28 -0000      1.40
@@ -48,7 +48,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Koha;
 use C4::Branch;
 

Index: admin/categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- admin/categorie.pl  18 Apr 2007 17:00:14 -0000      1.26
+++ admin/categorie.pl  24 Apr 2007 13:54:28 -0000      1.27
@@ -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)address@hidden;

Index: admin/categoryitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- admin/categoryitem.pl       18 Apr 2007 17:00:14 -0000      1.14
+++ admin/categoryitem.pl       24 Apr 2007 13:54:28 -0000      1.15
@@ -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)address@hidden;

Index: admin/checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- admin/checkmarc.pl  9 Mar 2007 14:30:55 -0000       1.11
+++ admin/checkmarc.pl  24 Apr 2007 13:54:28 -0000      1.12
@@ -20,7 +20,6 @@
 
 use strict;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use CGI;
 use C4::Context;

Index: admin/cities.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/cities.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/cities.pl     18 Apr 2007 17:00:14 -0000      1.3
+++ admin/cities.pl     24 Apr 2007 13:54:28 -0000      1.4
@@ -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)address@hidden;

Index: admin/currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- admin/currency.pl   18 Apr 2007 17:00:14 -0000      1.16
+++ admin/currency.pl   24 Apr 2007 13:54:28 -0000      1.17
@@ -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)address@hidden;

Index: admin/finesrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/finesrules.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- admin/finesrules.pl 16 Apr 2007 16:54:33 -0000      1.1
+++ admin/finesrules.pl 24 Apr 2007 13:54:28 -0000      1.2
@@ -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;

Index: admin/issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- admin/issuingrules.pl       16 Apr 2007 16:54:33 -0000      1.13
+++ admin/issuingrules.pl       24 Apr 2007 13:54:28 -0000      1.14
@@ -21,11 +21,8 @@
 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;

Index: admin/itemtypecategory.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypecategory.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/itemtypecategory.pl   18 Apr 2007 17:00:14 -0000      1.4
+++ admin/itemtypecategory.pl   24 Apr 2007 13:54:28 -0000      1.5
@@ -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  {

Index: admin/itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- admin/itemtypes.pl  18 Apr 2007 17:00:14 -0000      1.27
+++ admin/itemtypes.pl  24 Apr 2007 13:54:28 -0000      1.28
@@ -45,9 +45,8 @@
 
 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)address@hidden;

Index: admin/itemtypesubcategory.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypesubcategory.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/itemtypesubcategory.pl        18 Apr 2007 17:00:14 -0000      1.4
+++ admin/itemtypesubcategory.pl        24 Apr 2007 13:54:28 -0000      1.5
@@ -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  {

Index: admin/koha2marclinks.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- admin/koha2marclinks.pl     18 Apr 2007 17:00:14 -0000      1.16
+++ admin/koha2marclinks.pl     24 Apr 2007 13:54:28 -0000      1.17
@@ -19,7 +19,6 @@
 
 use strict;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use CGI;
 use C4::Context;

Index: admin/letter.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/letter.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- admin/letter.pl     18 Apr 2007 17:00:14 -0000      1.6
+++ admin/letter.pl     24 Apr 2007 13:54:28 -0000      1.7
@@ -43,7 +43,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 sub StringSearch  {

Index: admin/marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- admin/marc_subfields_structure.pl   18 Apr 2007 17:00:14 -0000      1.42
+++ admin/marc_subfields_structure.pl   24 Apr 2007 13:54:28 -0000      1.43
@@ -19,7 +19,6 @@
 
 use strict;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use CGI;
 use C4::Context;

Index: admin/marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- admin/marctagstructure.pl   18 Apr 2007 17:00:14 -0000      1.35
+++ admin/marctagstructure.pl   24 Apr 2007 13:54:28 -0000      1.36
@@ -24,7 +24,6 @@
 use C4::Koha;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: admin/mediatype.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/mediatype.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/mediatype.pl  18 Apr 2007 17:00:14 -0000      1.4
+++ admin/mediatype.pl  24 Apr 2007 13:54:28 -0000      1.5
@@ -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  {

Index: admin/printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- admin/printers.pl   18 Apr 2007 17:00:14 -0000      1.16
+++ admin/printers.pl   24 Apr 2007 13:54:28 -0000      1.17
@@ -41,9 +41,7 @@
 use CGI;
 use C4::Context;
 use C4::Output;
-
 use C4::Auth;
-use C4::Interface::CGI::Output;
 
 sub StringSearch  {
        my ($searchstring,$type)address@hidden;

Index: admin/roadtype.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/roadtype.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/roadtype.pl   18 Apr 2007 17:00:14 -0000      1.3
+++ admin/roadtype.pl   24 Apr 2007 13:54:28 -0000      1.4
@@ -21,9 +21,8 @@
 use CGI;
 use C4::Context;
 use C4::Output;
-
 use C4::Auth;
-use C4::Interface::CGI::Output;
+
 
 sub StringSearch  {
        my ($searchstring,$type)address@hidden;

Index: admin/systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- admin/systempreferences.pl  18 Apr 2007 17:00:14 -0000      1.38
+++ admin/systempreferences.pl  24 Apr 2007 13:54:28 -0000      1.39
@@ -47,7 +47,6 @@
 use C4::Koha;
 use C4::Languages;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: admin/thesaurus.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- admin/thesaurus.pl  18 Apr 2007 17:00:14 -0000      1.16
+++ admin/thesaurus.pl  24 Apr 2007 13:54:28 -0000      1.17
@@ -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;

Index: admin/z3950servers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/z3950servers.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- admin/z3950servers.pl       18 Apr 2007 17:00:14 -0000      1.16
+++ admin/z3950servers.pl       24 Apr 2007 13:54:28 -0000      1.17
@@ -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)address@hidden;

Index: authorities/auth_finder.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- authorities/auth_finder.pl  6 Apr 2007 14:48:45 -0000       1.14
+++ authorities/auth_finder.pl  24 Apr 2007 13:54:28 -0000      1.15
@@ -21,7 +21,7 @@
 use strict;
 require Exporter;
 use CGI;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Auth;
 
 use C4::Context;

Index: authorities/authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- authorities/authorities-home.pl     6 Apr 2007 14:48:45 -0000       1.18
+++ authorities/authorities-home.pl     24 Apr 2007 13:54:28 -0000      1.19
@@ -26,7 +26,6 @@
 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

Index: authorities/authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- authorities/authorities.pl  6 Apr 2007 14:48:45 -0000       1.22
+++ authorities/authorities.pl  24 Apr 2007 13:54:29 -0000      1.23
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: authorities.pl,v 1.22 2007/04/06 14:48:45 hdl Exp $
+# $Id: authorities.pl,v 1.23 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -23,7 +23,6 @@
 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

Index: authorities/blinddetail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- authorities/blinddetail-biblio-search.pl    6 Apr 2007 14:48:45 -0000       
1.11
+++ authorities/blinddetail-biblio-search.pl    24 Apr 2007 13:54:29 -0000      
1.12
@@ -44,7 +44,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use MARC::Record;
 use C4::Koha;

Index: authorities/detail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail-biblio-search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- authorities/detail-biblio-search.pl 6 Apr 2007 14:48:45 -0000       1.5
+++ authorities/detail-biblio-search.pl 24 Apr 2007 13:54:29 -0000      1.6
@@ -44,7 +44,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use MARC::Record;
 use C4::Koha;

Index: authorities/detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- authorities/detail.pl       6 Apr 2007 14:48:45 -0000       1.8
+++ authorities/detail.pl       24 Apr 2007 13:54:29 -0000      1.9
@@ -44,7 +44,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use MARC::Record;
 use C4::Koha;

Index: barcodes/barcodes.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/barcodes.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- barcodes/barcodes.pl        9 Mar 2007 14:31:27 -0000       1.6
+++ barcodes/barcodes.pl        24 Apr 2007 13:54:29 -0000      1.7
@@ -3,7 +3,7 @@
 # script to generate items barcodes
 # written 07/04
 # by Veleda Matias - address@hidden - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - address@hidden - Physics Library UNLP Argentina and
+#    Casta�eda Sebastian - address@hidden - Physics Library UNLP Argentina 
and
 
 # This file is part of Koha.
 #
@@ -24,7 +24,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Barcodes::PrinterConfig;
 

Index: barcodes/label-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-home.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- barcodes/label-home.pl      9 Mar 2007 14:31:27 -0000       1.4
+++ barcodes/label-home.pl      24 Apr 2007 13:54:29 -0000      1.5
@@ -20,7 +20,6 @@
 use C4::Auth;
 use C4::Output;
 use C4::Labels;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: barcodes/label-item-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-item-search.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- barcodes/label-item-search.pl       29 Mar 2007 13:30:31 -0000      1.6
+++ barcodes/label-item-search.pl       24 Apr 2007 13:54:29 -0000      1.7
@@ -27,7 +27,6 @@
 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

Index: barcodes/label-manager.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-manager.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- barcodes/label-manager.pl   9 Mar 2007 14:31:27 -0000       1.5
+++ barcodes/label-manager.pl   24 Apr 2007 13:54:29 -0000      1.6
@@ -20,7 +20,6 @@
 use C4::Auth;
 use C4::Labels;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 use POSIX;
 

Index: barcodes/label-print-opus-pdf.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-print-opus-pdf.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- barcodes/label-print-opus-pdf.pl    9 Mar 2007 14:31:27 -0000       1.3
+++ barcodes/label-print-opus-pdf.pl    24 Apr 2007 13:54:29 -0000      1.4
@@ -20,7 +20,6 @@
 use C4::Labels;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use PDF::Reuse;
 use PDF::Reuse::Barcode;

Index: barcodes/label-print-pdf.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-print-pdf.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- barcodes/label-print-pdf.pl 9 Mar 2007 14:31:27 -0000       1.15
+++ barcodes/label-print-pdf.pl 24 Apr 2007 13:54:29 -0000      1.16
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: label-print-pdf.pl,v 1.15 2007/03/09 14:31:27 tipaul Exp $
+# $Id: label-print-pdf.pl,v 1.16 2007/04/24 13:54:29 hdl Exp $
 
 =head1 label-print-pdf.pl
 
@@ -36,7 +36,6 @@
 use C4::Labels;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 use PDF::Reuse;

Index: barcodes/label-print.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/label-print.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- barcodes/label-print.pl     9 Mar 2007 14:31:27 -0000       1.5
+++ barcodes/label-print.pl     24 Apr 2007 13:54:29 -0000      1.6
@@ -20,7 +20,6 @@
 use C4::Auth;
 use C4::Serials;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 use GD::Barcode::UPCE;

Index: barcodes/printerConfig.pl
===================================================================
RCS file: /cvsroot/koha/koha/barcodes/printerConfig.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- barcodes/printerConfig.pl   9 Mar 2007 14:31:27 -0000       1.4
+++ barcodes/printerConfig.pl   24 Apr 2007 13:54:29 -0000      1.5
@@ -31,7 +31,6 @@
 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.

Index: bookshelves/addbookbybiblionumber.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookshelves/addbookbybiblionumber.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- bookshelves/addbookbybiblionumber.pl        4 Apr 2007 16:46:22 -0000       
1.7
+++ bookshelves/addbookbybiblionumber.pl        24 Apr 2007 13:54:29 -0000      
1.8
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: addbookbybiblionumber.pl,v 1.7 2007/04/04 16:46:22 tipaul Exp $
+# $Id: addbookbybiblionumber.pl,v 1.8 2007/04/24 13:54:29 hdl Exp $
 
 =head1 NAME
 
@@ -62,7 +62,6 @@
 use C4::BookShelves;
 use C4::Circulation;
 use C4::Auth;
-use C4::Interface::CGI::Output;
 
 
 #use it only to debug !
@@ -122,6 +121,13 @@
 }
 
 # $Log: addbookbybiblionumber.pl,v $
+# 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.
 #

Index: bookshelves/shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookshelves/shelves.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- bookshelves/shelves.pl      4 Apr 2007 16:46:22 -0000       1.12
+++ bookshelves/shelves.pl      24 Apr 2007 13:54:29 -0000      1.13
@@ -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 @@
 
 #
 # $Log: shelves.pl,v $
+# 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.
 #

Index: C4/Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- C4/Auth.pm  6 Apr 2007 15:53:18 -0000       1.60
+++ C4/Auth.pm  24 Apr 2007 13:54:29 -0000      1.61
@@ -26,7 +26,6 @@
 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
@@ -37,7 +36,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.60 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.61 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 

Index: C4/Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- C4/Output.pm        9 Mar 2007 14:31:47 -0000       1.60
+++ C4/Output.pm        24 Apr 2007 13:54:29 -0000      1.61
@@ -21,7 +21,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Output.pm,v 1.60 2007/03/09 14:31:47 tipaul Exp $
+# $Id: Output.pm,v 1.61 2007/04/24 13:54:29 hdl Exp $
 
 # NOTE: I'm pretty sure this module is deprecated in favor of
 # templates.
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.60 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.61 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -48,10 +48,18 @@
 =cut
 
 @ISA    = qw(Exporter);
address@hidden = 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 @@
     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;

Index: catalogue/detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/detail.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- catalogue/detail.pl 9 Mar 2007 14:32:39 -0000       1.11
+++ catalogue/detail.pl 24 Apr 2007 13:54:29 -0000      1.12
@@ -15,14 +15,14 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: detail.pl,v 1.11 2007/03/09 14:32:39 tipaul Exp $
+# $Id: detail.pl,v 1.12 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 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;
 

Index: catalogue/detailprint.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/detailprint.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- catalogue/detailprint.pl    9 Mar 2007 14:32:39 -0000       1.4
+++ catalogue/detailprint.pl    24 Apr 2007 13:54:29 -0000      1.5
@@ -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;

Index: catalogue/dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/dictionary.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- catalogue/dictionary.pl     18 Apr 2007 17:00:14 -0000      1.3
+++ catalogue/dictionary.pl     24 Apr 2007 13:54:29 -0000      1.4
@@ -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 @@
        my @authresults;
        my $authnbresults;
        while ((my $authtypecode) = $sth->fetchrow) {
-               my ($curauthresults,$nbresults) = 
authoritysearch($dbh,[''],[''],[''],['contains'],
+               my ($curauthresults,$nbresults) = 
SearchAuthorities([''],[''],[''],['contains'],
                                                                                
                                address@hidden,$startfrom*$resultsperpage, 
$resultsperpage,$authtypecode);
                if (defined(@$curauthresults)) {
                        for (my $i = 0; $i < @$curauthresults ;$i++) {

Index: catalogue/ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/ISBDdetail.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- catalogue/ISBDdetail.pl     29 Mar 2007 13:30:31 -0000      1.7
+++ catalogue/ISBDdetail.pl     24 Apr 2007 13:54:29 -0000      1.8
@@ -39,7 +39,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Koha;
 use C4::Biblio;

Index: catalogue/issuehistory.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/issuehistory.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- catalogue/issuehistory.pl   4 Apr 2007 16:46:23 -0000       1.3
+++ catalogue/issuehistory.pl   24 Apr 2007 13:54:29 -0000      1.4
@@ -15,13 +15,13 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: issuehistory.pl,v 1.3 2007/04/04 16:46:23 tipaul Exp $
+# $Id: issuehistory.pl,v 1.4 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 require Exporter;
 use CGI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 use C4::Circulation;    # GetBiblioIssues
 

Index: catalogue/MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/MARCdetail.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- catalogue/MARCdetail.pl     29 Mar 2007 13:30:31 -0000      1.10
+++ catalogue/MARCdetail.pl     24 Apr 2007 13:54:29 -0000      1.11
@@ -48,7 +48,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Koha;
 use MARC::Record;

Index: catalogue/moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/moredetail.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- catalogue/moredetail.pl     18 Apr 2007 17:00:14 -0000      1.12
+++ catalogue/moredetail.pl     24 Apr 2007 13:54:29 -0000      1.13
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: moredetail.pl,v 1.12 2007/04/18 17:00:14 tipaul Exp $
+# $Id: moredetail.pl,v 1.13 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 require Exporter;
@@ -27,7 +27,6 @@
 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
 

Index: catalogue/search.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/search.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- catalogue/search.pl 16 Mar 2007 01:25:08 -0000      1.3
+++ catalogue/search.pl 24 Apr 2007 13:54:29 -0000      1.4
@@ -2,7 +2,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /cvsroot/koha/koha/catalogue/search.pl,v 1.3 2007/03/16 01:25:08 
kados Exp $
+# $Header: /cvsroot/koha/koha/catalogue/search.pl,v 1.4 2007/04/24 13:54:29 
hdl Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -145,7 +145,7 @@
 # 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

Index: catalogue/suggest.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/suggest.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- catalogue/suggest.pl        9 Mar 2007 15:35:46 -0000       1.2
+++ catalogue/suggest.pl        24 Apr 2007 13:54:29 -0000      1.3
@@ -26,7 +26,6 @@
 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

Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- cataloguing/addbiblio.pl    29 Mar 2007 13:30:31 -0000      1.22
+++ cataloguing/addbiblio.pl    24 Apr 2007 13:54:29 -0000      1.23
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 
-# $Id: addbiblio.pl,v 1.22 2007/03/29 13:30:31 tipaul Exp $
+# $Id: addbiblio.pl,v 1.23 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -23,7 +23,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Biblio;
 use C4::Search;
 use C4::Context;

Index: cataloguing/addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cataloguing/addbooks.pl     29 Mar 2007 13:30:31 -0000      1.9
+++ cataloguing/addbooks.pl     24 Apr 2007 13:54:29 -0000      1.10
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbooks.pl,v 1.9 2007/03/29 13:30:31 tipaul Exp $
+# $Id: addbooks.pl,v 1.10 2007/04/24 13:54:29 hdl Exp $
 
 #
 # Modified address@hidden 12:00 01 April 2001
@@ -38,7 +38,6 @@
 use C4::Biblio;
 use C4::Breeding;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 use C4::Koha;
 use C4::Search;

Index: cataloguing/additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/additem.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- cataloguing/additem.pl      29 Mar 2007 13:30:31 -0000      1.14
+++ cataloguing/additem.pl      24 Apr 2007 13:54:29 -0000      1.15
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: additem.pl,v 1.14 2007/03/29 13:30:31 tipaul Exp $
+# $Id: additem.pl,v 1.15 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -23,7 +23,6 @@
 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

Index: cataloguing/thesaurus_popup.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/thesaurus_popup.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cataloguing/thesaurus_popup.pl      18 Apr 2007 17:00:14 -0000      1.4
+++ cataloguing/thesaurus_popup.pl      24 Apr 2007 13:54:29 -0000      1.5
@@ -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');

Index: cataloguing/z3950_search.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/z3950_search.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cataloguing/z3950_search.pl 29 Mar 2007 13:30:31 -0000      1.3
+++ cataloguing/z3950_search.pl 24 Apr 2007 13:54:29 -0000      1.4
@@ -22,7 +22,6 @@
 
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Biblio;
 use C4::Context;
 use C4::Breeding;

Index: cataloguing/value_builder/labs_theses.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/labs_theses.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cataloguing/value_builder/labs_theses.pl    18 Apr 2007 17:00:14 -0000      
1.3
+++ cataloguing/value_builder/labs_theses.pl    24 Apr 2007 13:54:29 -0000      
1.4
@@ -21,7 +21,7 @@
 require Exporter;
 use CGI;
 
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Context;
 use C4::Auth;
 use C4::Output;

Index: cataloguing/value_builder/marc21_field_003.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/marc21_field_003.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/value_builder/marc21_field_003.pl       9 Mar 2007 15:36:10 
-0000       1.2
+++ cataloguing/value_builder/marc21_field_003.pl       24 Apr 2007 13:54:29 
-0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: marc21_field_003.pl,v 1.2 2007/03/09 15:36:10 tipaul Exp $
+# $Id: marc21_field_003.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -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;

Index: cataloguing/value_builder/marc21_field_005.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/marc21_field_005.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/value_builder/marc21_field_005.pl       9 Mar 2007 15:36:10 
-0000       1.2
+++ cataloguing/value_builder/marc21_field_005.pl       24 Apr 2007 13:54:29 
-0000      1.3
@@ -1,7 +1,7 @@
 
 #!/usr/bin/perl
 
-# $Id: marc21_field_005.pl,v 1.2 2007/03/09 15:36:10 tipaul Exp $
+# $Id: marc21_field_005.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -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;

Index: cataloguing/value_builder/marc21_field_040c.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/marc21_field_040c.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/value_builder/marc21_field_040c.pl      9 Mar 2007 15:36:10 
-0000       1.2
+++ cataloguing/value_builder/marc21_field_040c.pl      24 Apr 2007 13:54:29 
-0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: marc21_field_040c.pl,v 1.2 2007/03/09 15:36:10 tipaul Exp $
+# $Id: marc21_field_040c.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,7 +24,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Search;
 use MARC::Record;

Index: cataloguing/value_builder/marc21_field_040d.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/marc21_field_040d.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/value_builder/marc21_field_040d.pl      9 Mar 2007 15:36:10 
-0000       1.2
+++ cataloguing/value_builder/marc21_field_040d.pl      24 Apr 2007 13:54:29 
-0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: marc21_field_040d.pl,v 1.2 2007/03/09 15:36:10 tipaul Exp $
+# $Id: marc21_field_040d.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,7 +24,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Search;
 use MARC::Record;

Index: cataloguing/value_builder/unimarc_field_210c.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/unimarc_field_210c.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/value_builder/unimarc_field_210c.pl     9 Mar 2007 15:36:10 
-0000       1.2
+++ cataloguing/value_builder/unimarc_field_210c.pl     24 Apr 2007 13:54:29 
-0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: unimarc_field_210c.pl,v 1.2 2007/03/09 15:36:10 tipaul Exp $
+# $Id: unimarc_field_210c.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,12 +24,11 @@
 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 @@
 #---- 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");

Index: cataloguing/value_builder/unimarc_field_4XX.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/unimarc_field_4XX.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cataloguing/value_builder/unimarc_field_4XX.pl      18 Apr 2007 17:00:14 
-0000      1.4
+++ cataloguing/value_builder/unimarc_field_4XX.pl      24 Apr 2007 13:54:29 
-0000      1.5
@@ -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;

Index: cataloguing/value_builder/usmarc_field_952v.pl
===================================================================
RCS file: /cvsroot/koha/koha/cataloguing/value_builder/usmarc_field_952v.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/value_builder/usmarc_field_952v.pl      9 Mar 2007 15:36:10 
-0000       1.2
+++ cataloguing/value_builder/usmarc_field_952v.pl      24 Apr 2007 13:54:29 
-0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: usmarc_field_952v.pl,v 1.2 2007/03/09 15:36:10 tipaul Exp $
+# $Id: usmarc_field_952v.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -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;

Index: circ/branchoverdues.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchoverdues.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- circ/branchoverdues.pl      18 Apr 2007 14:20:54 -0000      1.6
+++ circ/branchoverdues.pl      24 Apr 2007 13:54:29 -0000      1.7
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: branchoverdues.pl,v 1.6 2007/04/18 14:20:54 tipaul Exp $
+# $Id: branchoverdues.pl,v 1.7 2007/04/24 13:54:29 hdl Exp $
 #
 # This file is part of Koha.
 #
@@ -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

Index: circ/branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- circ/branchtransfers.pl     23 Apr 2007 14:08:47 -0000      1.30
+++ circ/branchtransfers.pl     24 Apr 2007 13:54:29 -0000      1.31
@@ -28,7 +28,6 @@
 use C4::Reserves;
 use C4::Biblio;
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Branch; # GetBranches
 use C4::Koha;
 

Index: circ/circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- circ/circulation.pl 23 Apr 2007 15:21:17 -0000      1.108
+++ circ/circulation.pl 24 Apr 2007 13:54:29 -0000      1.109
@@ -28,9 +28,13 @@
 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 @@
   Date_to_Days
 );
 
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
-use C4::Reserves;
 
 #
 # PARAMETERS READING

Index: circ/overdue.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/overdue.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/overdue.pl     9 Mar 2007 15:37:12 -0000       1.2
+++ circ/overdue.pl     24 Apr 2007 13:54:29 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: overdue.pl,v 1.2 2007/03/09 15:37:12 tipaul Exp $
+# $Id: overdue.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -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;

Index: circ/reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/reserve.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- circ/reserve.pl     9 Mar 2007 14:34:32 -0000       1.4
+++ circ/reserve.pl     24 Apr 2007 13:54:29 -0000      1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: reserve.pl,v 1.4 2007/03/09 14:34:32 tipaul Exp $
+# $Id: reserve.pl,v 1.5 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -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');

Index: circ/returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- circ/returns.pl     23 Apr 2007 15:21:17 -0000      1.51
+++ circ/returns.pl     24 Apr 2007 13:54:29 -0000      1.52
@@ -27,18 +27,17 @@
 
 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;
 

Index: circ/selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- circ/selectbranchprinter.pl 18 Apr 2007 17:00:14 -0000      1.19
+++ circ/selectbranchprinter.pl 24 Apr 2007 13:54:29 -0000      1.20
@@ -23,7 +23,6 @@
 use C4::Output;
 use C4::Auth;
 use C4::Print;
-use C4::Interface::CGI::Output;
 use C4::Koha;
 use C4::Branch; # GetBranches
 

Index: circ/stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/stats.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/stats.pl       9 Mar 2007 15:37:12 -0000       1.2
+++ circ/stats.pl       24 Apr 2007 13:54:29 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: stats.pl,v 1.2 2007/03/09 15:37:12 tipaul Exp $
+# $Id: stats.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 #written 14/1/2000
 #script to display reports
@@ -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;
 

Index: export/export_filtered.pl
===================================================================
RCS file: /cvsroot/koha/koha/export/export_filtered.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- export/export_filtered.pl   9 Mar 2007 15:37:12 -0000       1.2
+++ export/export_filtered.pl   24 Apr 2007 13:54:29 -0000      1.3
@@ -22,7 +22,6 @@
 use strict;
 require Exporter;
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Output;    # contains gettemplate
 use C4::Biblio;
 use CGI;

Index: export/export.pl
===================================================================
RCS file: /cvsroot/koha/koha/export/export.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- export/export.pl    9 Mar 2007 15:37:12 -0000       1.3
+++ export/export.pl    24 Apr 2007 13:54:29 -0000      1.4
@@ -22,7 +22,6 @@
 use strict;
 require Exporter;
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Output;    # contains gettemplate
 use C4::Biblio;
 use CGI;

Index: export/marc.pl
===================================================================
RCS file: /cvsroot/koha/koha/export/marc.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- export/marc.pl      9 Mar 2007 15:37:12 -0000       1.9
+++ export/marc.pl      24 Apr 2007 13:54:29 -0000      1.10
@@ -17,14 +17,13 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: marc.pl,v 1.9 2007/03/09 15:37:12 tipaul Exp $
+# $Id: marc.pl,v 1.10 2007/04/24 13:54:29 hdl Exp $
 
 use C4::Branch; # GetBranches
 use strict;
 require Exporter;
 
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Output;  # contains gettemplate
 use C4::Biblio;
 use CGI;

Index: installer/InstallAuth.pm
===================================================================
RCS file: /cvsroot/koha/koha/installer/InstallAuth.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- installer/InstallAuth.pm    9 Mar 2007 15:37:25 -0000       1.2
+++ installer/InstallAuth.pm    24 Apr 2007 13:54:29 -0000      1.3
@@ -25,14 +25,13 @@
 
 require Exporter;
 use C4::Context;
-use C4::Output;    # to get the template
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Koha;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.2 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.3 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 

Index: installer/install.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer/install.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- installer/install.pl        13 Apr 2007 16:33:54 -0000      1.6
+++ installer/install.pl        24 Apr 2007 13:54:29 -0000      1.7
@@ -5,7 +5,7 @@
 # use Install;
 use InstallAuth;
 use C4::Context;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Languages;
 
 use strict; # please develop with the strict pragma

Index: members/boraccount.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/boraccount.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- members/boraccount.pl       23 Apr 2007 13:10:08 -0000      1.6
+++ members/boraccount.pl       24 Apr 2007 13:54:29 -0000      1.7
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: boraccount.pl,v 1.6 2007/04/23 13:10:08 hdl Exp $
+# $Id: boraccount.pl,v 1.7 2007/04/24 13:54:29 hdl Exp $
 
 #writen 11/1/2000 by address@hidden
 #script to display borrowers account details
@@ -26,7 +26,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Date;
 use CGI;
 use C4::Members;

Index: members/borrowers_details.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/borrowers_details.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- members/borrowers_details.pl        23 Apr 2007 13:10:08 -0000      1.4
+++ members/borrowers_details.pl        24 Apr 2007 13:54:29 -0000      1.5
@@ -2,7 +2,7 @@
 # NOTE: This file uses standard 8-space tabs
 #       DO NOT SET TAB SIZE TO 4
 
-# $Id: borrowers_details.pl,v 1.4 2007/04/23 13:10:08 hdl Exp $
+# $Id: borrowers_details.pl,v 1.5 2007/04/24 13:54:29 hdl Exp $
 
 #script to set up screen for modification of borrower details
 #written 20/12/99 by address@hidden
@@ -29,7 +29,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
 use C4::Koha;

Index: members/deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/deletemem.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- members/deletemem.pl        23 Apr 2007 13:10:08 -0000      1.13
+++ members/deletemem.pl        24 Apr 2007 13:54:29 -0000      1.14
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.13 2007/04/23 13:10:08 hdl Exp $
+# $Id: deletemem.pl,v 1.14 2007/04/24 13:54:29 hdl Exp $
 
 #script to delete items
 #written 2/5/00
@@ -28,7 +28,6 @@
 
 use CGI;
 use C4::Context;
-use C4::Interface::CGI::Output;
 use C4::Output;
 use C4::Circulation;
 use C4::Auth;

Index: members/guarantor_search.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/guarantor_search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- members/guarantor_search.pl 23 Apr 2007 13:10:08 -0000      1.4
+++ members/guarantor_search.pl 24 Apr 2007 13:54:29 -0000      1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: guarantor_search.pl,v 1.4 2007/04/23 13:10:08 hdl Exp $
+# $Id: guarantor_search.pl,v 1.5 2007/04/24 13:54:29 hdl Exp $
 
 # script to find a guarantor
 
@@ -24,7 +24,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 
 #op

Index: members/mancredit.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/mancredit.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- members/mancredit.pl        23 Apr 2007 13:10:08 -0000      1.8
+++ members/mancredit.pl        24 Apr 2007 13:54:29 -0000      1.9
@@ -24,7 +24,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 
 use C4::Members;

Index: members/maninvoice.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/maninvoice.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- members/maninvoice.pl       23 Apr 2007 13:10:08 -0000      1.8
+++ members/maninvoice.pl       24 Apr 2007 13:54:29 -0000      1.9
@@ -24,7 +24,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
 use C4::Accounts;

Index: members/memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- members/memberentry.pl      23 Apr 2007 13:10:08 -0000      1.42
+++ members/memberentry.pl      24 Apr 2007 13:54:29 -0000      1.43
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.42 2007/04/23 13:10:08 hdl Exp $
+# $Id: memberentry.pl,v 1.43 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -31,7 +31,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Members;
 use C4::Koha;
 use C4::Date;

Index: members/member-flags.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member-flags.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- members/member-flags.pl     18 Apr 2007 17:00:14 -0000      1.9
+++ members/member-flags.pl     24 Apr 2007 13:54:29 -0000      1.10
@@ -13,7 +13,7 @@
 use C4::Members;
 #use C4::Acquisitions;
 
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $input = new CGI;
 

Index: members/member-password.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member-password.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- members/member-password.pl  18 Apr 2007 17:00:14 -0000      1.8
+++ members/member-password.pl  24 Apr 2007 13:54:29 -0000      1.9
@@ -7,7 +7,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Members;
 use C4::Circulation;

Index: members/member-picupload.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member-picupload.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/member-picupload.pl 9 Mar 2007 14:56:55 -0000       1.2
+++ members/member-picupload.pl 24 Apr 2007 13:54:29 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: member-picupload.pl,v 1.2 2007/03/09 14:56:55 tipaul Exp $
+# $Id: member-picupload.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # script to upload a picture to a borrowerimages directory.
 # checks to see if its either displaying the upload form
@@ -31,8 +31,6 @@
 use C4::Output;
 use CGI;
 
-use C4::Interface::CGI::Output;
-use C4::Interface::CGI::Template;
 
 my $input = new CGI;
 my $name = $input->param('name');

Index: members/member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- members/member.pl   23 Apr 2007 13:10:08 -0000      1.17
+++ members/member.pl   24 Apr 2007 13:54:29 -0000      1.18
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: member.pl,v 1.17 2007/04/23 13:10:08 hdl Exp $
+# $Id: member.pl,v 1.18 2007/04/24 13:54:29 hdl Exp $
 
 #script to do a borrower enquiery/brin up borrower details etc
 #written 20/12/99 by address@hidden
@@ -26,7 +26,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
 

Index: members/members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- members/members-home.pl     11 Mar 2007 01:19:30 -0000      1.5
+++ members/members-home.pl     24 Apr 2007 13:54:29 -0000      1.6
@@ -19,7 +19,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: members/moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- members/moremember.pl       24 Apr 2007 09:07:53 -0000      1.36
+++ members/moremember.pl       24 Apr 2007 13:54:29 -0000      1.37
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: moremember.pl,v 1.36 2007/04/24 09:07:53 tipaul Exp $
+# $Id: moremember.pl,v 1.37 2007/04/24 13:54:29 hdl Exp $
 
 =head1 moremember.pl
 
@@ -33,14 +33,12 @@
 =cut
 
 use strict;
+use CGI;
+use Date::Manip;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Interface::CGI::Template;
-use CGI;
 use C4::Members;
-use Date::Manip;
 use C4::Date;
 use C4::Reserves;
 use C4::Circulation;

Index: members/pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/pay.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- members/pay.pl      23 Apr 2007 13:10:08 -0000      1.11
+++ members/pay.pl      24 Apr 2007 13:54:29 -0000      1.12
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: pay.pl,v 1.11 2007/04/23 13:10:08 hdl Exp $
+# $Id: pay.pl,v 1.12 2007/04/24 13:54:29 hdl Exp $
 
 =head1 pay.pl
 
@@ -99,8 +99,8 @@
     my $numberofnotify = scalar(@notify);
     for ( my $j = 0 ; $j < scalar(@notify) ; $j++ ) {
         my @loop_pay;
-        my ( $numaccts, $accts, $total ) =
-          GetBorNotifyAcctRecord( '', \%bor, $notify[$j] );
+        my ( $total , $accts, $numaccts) =
+          GetBorNotifyAcctRecord( $borrowernumber, $notify[$j] );
         for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
             my %line;
             if ( $accts->[$i]{'amountoutstanding'} > 0 ) {
@@ -140,7 +140,7 @@
         borrowernumber => $borrowernumber,
         total          => sprintf( "%.2f", $total )
     );
-    print "Content-Type: text/html\n\n", $template->output;
+    output_html_with_http_headers $input, $cookie, $template->output;
 
 }
 else {

Index: members/readingrec.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/readingrec.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- members/readingrec.pl       23 Apr 2007 13:10:08 -0000      1.4
+++ members/readingrec.pl       24 Apr 2007 13:54:29 -0000      1.5
@@ -23,7 +23,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
 

Index: opac/opac-account.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- opac/opac-account.pl        23 Apr 2007 13:10:08 -0000      1.14
+++ opac/opac-account.pl        24 Apr 2007 13:54:29 -0000      1.15
@@ -19,13 +19,11 @@
 # script to display borrowers account details in the opac
 
 use strict;
-use C4::Output;
 use CGI;
 use C4::Members;
 use C4::Circulation;
 use C4::Auth;
-use C4::Interface::CGI::Output;
-
+use C4::Output;
 use C4::Date;
 
 my $query = new CGI;

Index: opac/opac-addbookbybiblionumber.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- opac/opac-addbookbybiblionumber.pl  4 Apr 2007 16:46:23 -0000       1.7
+++ opac/opac-addbookbybiblionumber.pl  24 Apr 2007 13:54:29 -0000      1.8
@@ -3,7 +3,7 @@
 #script to provide bookshelf management
 # WARNING: This file uses 4-character tabs!
 #
-# $Header: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.7 
2007/04/04 16:46:23 tipaul Exp $
+# $Header: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.8 
2007/04/24 13:54:29 hdl Exp $
 #
 # Copyright 2000-2002 Katipo Communications
 #
@@ -25,11 +25,10 @@
 use strict;
 use C4::Biblio;
 use CGI;
-use C4::Output;
 use C4::BookShelves;
 use C4::Circulation;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query        = new CGI;
 my $biblionumber = $query->param('biblionumber');

Index: opac/opac-alert-subscribe.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-alert-subscribe.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- opac/opac-alert-subscribe.pl        9 Mar 2007 15:12:54 -0000       1.3
+++ opac/opac-alert-subscribe.pl        24 Apr 2007 13:54:29 -0000      1.4
@@ -17,14 +17,13 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-alert-subscribe.pl,v 1.3 2007/03/09 15:12:54 tipaul Exp $
+# $Id: opac-alert-subscribe.pl,v 1.4 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 use CGI;
 use C4::Auth;
 use C4::Date;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Koha;
 use C4::Letters;

Index: opac/opac-authoritiesdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-authoritiesdetail.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- opac/opac-authoritiesdetail.pl      6 Apr 2007 14:48:45 -0000       1.4
+++ opac/opac-authoritiesdetail.pl      24 Apr 2007 13:54:29 -0000      1.5
@@ -43,7 +43,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use MARC::Record;
 use C4::Koha;

Index: opac/opac-authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-authorities-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- opac/opac-authorities-home.pl       6 Apr 2007 14:48:45 -0000       1.5
+++ opac/opac-authorities-home.pl       24 Apr 2007 13:54:29 -0000      1.6
@@ -26,7 +26,6 @@
 use C4::Context;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::AuthoritiesMarc;
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 

Index: opac/opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- opac/opac-basket.pl 9 Mar 2007 15:12:54 -0000       1.9
+++ opac/opac-basket.pl 24 Apr 2007 13:54:29 -0000      1.10
@@ -15,14 +15,14 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-basket.pl,v 1.9 2007/03/09 15:12:54 tipaul Exp $
+# $Id: opac-basket.pl,v 1.10 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 require Exporter;
 use CGI;
 use C4::Biblio;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query = new CGI;
 

Index: opac/opac-browser.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-browser.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- opac/opac-browser.pl        9 Mar 2007 15:47:41 -0000       1.2
+++ opac/opac-browser.pl        24 Apr 2007 13:54:29 -0000      1.3
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-browser.pl,v 1.2 2007/03/09 15:47:41 tipaul Exp $
+# $Id: opac-browser.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 =head1 opac-tags_subject.pl
 
@@ -30,7 +30,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Biblio;
 use C4::Koha;       # use getitemtypeinfo

Index: opac/opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- opac/opac-detail.pl 23 Apr 2007 13:10:08 -0000      1.34
+++ opac/opac-detail.pl 24 Apr 2007 13:54:29 -0000      1.35
@@ -17,14 +17,14 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-detail.pl,v 1.34 2007/04/23 13:10:08 hdl Exp $
+# $Id: opac-detail.pl,v 1.35 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 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::Amazon;
 use C4::Review;

Index: opac/opac-detailprint.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detailprint.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- opac/opac-detailprint.pl    9 Mar 2007 15:12:54 -0000       1.4
+++ opac/opac-detailprint.pl    24 Apr 2007 13:54:29 -0000      1.5
@@ -21,11 +21,10 @@
 use strict;
 require Exporter;
 use C4::Context;
-use C4::Output;    # contains gettemplate
 use CGI;
 use C4::Biblio;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Date;
 
 my $query = new CGI;

Index: opac/opac-dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-dictionary.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- opac/opac-dictionary.pl     18 Apr 2007 17:00:15 -0000      1.6
+++ opac/opac-dictionary.pl     24 Apr 2007 13:54:29 -0000      1.7
@@ -19,7 +19,6 @@
 
 use strict;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use CGI;
 use C4::Search;

Index: opac/opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- opac/opac-ISBDdetail.pl     23 Apr 2007 13:10:08 -0000      1.19
+++ opac/opac-ISBDdetail.pl     24 Apr 2007 13:54:29 -0000      1.20
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-ISBDdetail.pl,v 1.19 2007/04/23 13:10:08 hdl Exp $
+# $Id: opac-ISBDdetail.pl,v 1.20 2007/04/24 13:54:29 hdl Exp $
 
 =head1 NAME
 
@@ -47,7 +47,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use MARC::Record;
 use C4::Biblio;

Index: opac/opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- opac/opac-main.pl   23 Apr 2007 13:10:08 -0000      1.26
+++ opac/opac-main.pl   24 Apr 2007 13:54:29 -0000      1.27
@@ -15,13 +15,13 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-main.pl,v 1.26 2007/04/23 13:10:08 hdl Exp $
+# $Id: opac-main.pl,v 1.27 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 require Exporter;
 use CGI;
 use C4::Auth;    # get_template_and_user
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::BookShelves;
 use C4::Languages;           # getTranslatedLanguages
 use C4::Branch;         # GetBranches

Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- opac/opac-MARCdetail.pl     29 Mar 2007 13:30:32 -0000      1.16
+++ opac/opac-MARCdetail.pl     24 Apr 2007 13:54:29 -0000      1.17
@@ -44,7 +44,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use MARC::Record;
 use C4::Biblio;

Index: opac/opac-passwd.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-passwd.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- opac/opac-passwd.pl 4 Apr 2007 16:46:23 -0000       1.5
+++ opac/opac-passwd.pl 24 Apr 2007 13:54:29 -0000      1.6
@@ -27,7 +27,7 @@
 use Digest::MD5 qw(md5_base64);
 use C4::Circulation;
 
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;

Index: opac/opac-readingrecord.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- opac/opac-readingrecord.pl  23 Apr 2007 13:10:08 -0000      1.13
+++ opac/opac-readingrecord.pl  24 Apr 2007 13:54:29 -0000      1.14
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-readingrecord.pl,v 1.13 2007/04/23 13:10:08 hdl Exp $
+# $Id: opac-readingrecord.pl,v 1.14 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 require Exporter;
@@ -27,7 +27,7 @@
 use C4::Date;
 use C4::Members;
 
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(

Index: opac/opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- opac/opac-reserve.pl        23 Apr 2007 14:08:47 -0000      1.32
+++ opac/opac-reserve.pl        24 Apr 2007 13:54:29 -0000      1.33
@@ -23,7 +23,7 @@
 use C4::Koha;
 use C4::Circulation;
 use C4::Reserves;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Date;
 use C4::Context;
 use C4::Branch; # GetBranches

Index: opac/opac-review.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-review.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- opac/opac-review.pl 4 Apr 2007 16:46:23 -0000       1.5
+++ opac/opac-review.pl 24 Apr 2007 13:54:29 -0000      1.6
@@ -22,7 +22,7 @@
 use CGI;
 use C4::Auth;
 use C4::Koha;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Circulation;
 use C4::Review;
 use C4::Biblio;

Index: opac/opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- opac/opac-search.pl 16 Mar 2007 01:25:09 -0000      1.40
+++ opac/opac-search.pl 24 Apr 2007 13:54:29 -0000      1.41
@@ -3,7 +3,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /cvsroot/koha/koha/opac/opac-search.pl,v 1.40 2007/03/16 01:25:09 
kados Exp $
+# $Header: /cvsroot/koha/koha/opac/opac-search.pl,v 1.41 2007/04/24 13:54:29 
hdl Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -148,7 +148,7 @@
 # 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

Index: opac/opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- opac/opac-sendbasket.pl     9 Mar 2007 15:12:54 -0000       1.11
+++ opac/opac-sendbasket.pl     24 Apr 2007 13:54:29 -0000      1.12
@@ -23,7 +23,7 @@
 use MIME::Base64;
 use C4::Biblio;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Biblio;
 
 my $query = new CGI;

Index: opac/opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- opac/opac-serial-issues.pl  9 Mar 2007 15:12:54 -0000       1.9
+++ opac/opac-serial-issues.pl  24 Apr 2007 13:54:29 -0000      1.10
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-serial-issues.pl,v 1.9 2007/03/09 15:12:54 tipaul Exp $
+# $Id: opac-serial-issues.pl,v 1.10 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 use CGI;
@@ -27,7 +27,6 @@
 use C4::Serials;
 use C4::Letters;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: opac/opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- opac/opac-shelves.pl        17 Apr 2007 08:52:19 -0000      1.11
+++ opac/opac-shelves.pl        24 Apr 2007 13:54:29 -0000      1.12
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-shelves.pl,v 1.11 2007/04/17 08:52:19 tipaul Exp $
+# $Id: opac-shelves.pl,v 1.12 2007/04/24 13:54:29 hdl Exp $
 
 =head1 NAME
 
@@ -70,7 +70,7 @@
 use C4::BookShelves;
 use C4::Circulation;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query = new CGI;
 
@@ -229,6 +229,13 @@
 
 #
 # $Log: opac-shelves.pl,v $
+# Revision 1.12  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.11  2007/04/17 08:52:19  tipaul
 # circulation cleaning continued: bufixing
 #

Index: opac/opac-showreviews.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-showreviews.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- opac/opac-showreviews.pl    4 Apr 2007 16:46:23 -0000       1.5
+++ opac/opac-showreviews.pl    24 Apr 2007 13:54:29 -0000      1.6
@@ -20,7 +20,7 @@
 use CGI;
 use C4::Auth;
 use C4::Koha;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Circulation;
 use C4::Review;
 use C4::Biblio;

Index: opac/opac-suggestions.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- opac/opac-suggestions.pl    9 Mar 2007 15:12:54 -0000       1.7
+++ opac/opac-suggestions.pl    24 Apr 2007 13:54:29 -0000      1.8
@@ -19,7 +19,7 @@
 require Exporter;
 use CGI;
 use C4::Auth;    # get_template_and_user
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Suggestions;
 
 my $input           = new CGI;

Index: opac/opac-tags_subject.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-tags_subject.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- opac/opac-tags_subject.pl   9 Mar 2007 15:47:41 -0000       1.2
+++ opac/opac-tags_subject.pl   24 Apr 2007 13:54:29 -0000      1.3
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-tags_subject.pl,v 1.2 2007/03/09 15:47:41 tipaul Exp $
+# $Id: opac-tags_subject.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 =head1 opac-tags_subject.pl
 
@@ -30,7 +30,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Biblio;
 use C4::Koha;       # use getitemtypeinfo

Index: opac/opac-topissues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-topissues.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- opac/opac-topissues.pl      9 Mar 2007 15:47:41 -0000       1.2
+++ opac/opac-topissues.pl      24 Apr 2007 13:54:29 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: opac-topissues.pl,v 1.2 2007/03/09 15:47:41 tipaul Exp $
+# $Id: opac-topissues.pl,v 1.3 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,14 +20,13 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-use C4::Auth;
 use CGI;
+use C4::Auth;
 use C4::Context;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
 use C4::Branch;
-use C4::Interface::CGI::Output;
 use Date::Manip;
 
 =head1 NAME

Index: opac/opac-userdetails.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- opac/opac-userdetails.pl    4 Apr 2007 16:46:23 -0000       1.14
+++ opac/opac-userdetails.pl    24 Apr 2007 13:54:29 -0000      1.15
@@ -24,7 +24,7 @@
 use C4::Koha;
 use C4::Circulation;
 
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Date;
 use C4::Members;
 

Index: opac/opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- opac/opac-user.pl   23 Apr 2007 14:08:47 -0000      1.28
+++ opac/opac-user.pl   24 Apr 2007 13:54:29 -0000      1.29
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-user.pl,v 1.28 2007/04/23 14:08:47 tipaul Exp $
+# $Id: opac-user.pl,v 1.29 2007/04/24 13:54:29 hdl Exp $
 
 use strict;
 require Exporter;
@@ -26,7 +26,7 @@
 use C4::Circulation;
 use C4::Reserves;
 use C4::Members;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Biblio;
 use C4::Date;
 use C4::Letters;

Index: opac/opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- opac/opac-userupdate.pl     4 Apr 2007 16:46:23 -0000       1.16
+++ opac/opac-userupdate.pl     24 Apr 2007 13:54:29 -0000      1.17
@@ -26,7 +26,7 @@
 use C4::Context;
 use C4::Koha;
 use C4::Circulation;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Date;
 use C4::Members;
 

Index: reports/acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- reports/acquisitions_stats.pl       4 Apr 2007 16:46:23 -0000       1.14
+++ reports/acquisitions_stats.pl       24 Apr 2007 13:54:29 -0000      1.15
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: acquisitions_stats.pl,v 1.14 2007/04/04 16:46:23 tipaul Exp $
+# $Id: acquisitions_stats.pl,v 1.15 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -28,7 +28,6 @@
 
 use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
 
 =head1 NAME

Index: reports/bor_issues_top.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/bor_issues_top.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- reports/bor_issues_top.pl   4 Apr 2007 16:46:23 -0000       1.11
+++ reports/bor_issues_top.pl   24 Apr 2007 13:54:29 -0000      1.12
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: bor_issues_top.pl,v 1.11 2007/04/04 16:46:23 tipaul Exp $
+# $Id: bor_issues_top.pl,v 1.12 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,16 +20,15 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-use C4::Auth;
 use CGI;
+use C4::Auth;
+use C4::Output;
 use C4::Context;
 use C4::Branch; # GetBranches
-use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
-use Date::Manip;
 use C4::Members;
+use Date::Manip;
 
 =head1 NAME
 

Index: reports/borrowers_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- reports/borrowers_out.pl    4 Apr 2007 16:46:23 -0000       1.9
+++ reports/borrowers_out.pl    24 Apr 2007 13:54:29 -0000      1.10
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: borrowers_out.pl,v 1.9 2007/04/04 16:46:23 tipaul Exp $
+# $Id: borrowers_out.pl,v 1.10 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,16 +20,14 @@
 # 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::Koha;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Circulation;
-use Date::Manip;
 use C4::Members;
+use Date::Manip;
 
 =head1 NAME
 

Index: reports/borrowers_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_stats.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- reports/borrowers_stats.pl  4 Apr 2007 16:46:23 -0000       1.13
+++ reports/borrowers_stats.pl  24 Apr 2007 13:54:29 -0000      1.14
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: borrowers_stats.pl,v 1.13 2007/04/04 16:46:23 tipaul Exp $
+# $Id: borrowers_stats.pl,v 1.14 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,14 +20,13 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-use C4::Auth;
 use CGI;
+use C4::Auth;
 use C4::Context;
 use C4::Branch; # GetBranches
-use C4::Output;
 use C4::Koha;
 use C4::Acquisition;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Circulation;
 
 =head1 NAME

Index: reports/catalogue_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/catalogue_out.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- reports/catalogue_out.pl    4 Apr 2007 16:46:23 -0000       1.8
+++ reports/catalogue_out.pl    24 Apr 2007 13:54:29 -0000      1.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: catalogue_out.pl,v 1.8 2007/04/04 16:46:23 tipaul Exp $
+# $Id: catalogue_out.pl,v 1.9 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,13 +20,12 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-use C4::Auth;
 use CGI;
+use C4::Auth;
 use C4::Context;
 use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
 use Date::Manip;
 

Index: reports/catalogue_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/catalogue_stats.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- reports/catalogue_stats.pl  18 Apr 2007 14:19:52 -0000      1.21
+++ reports/catalogue_stats.pl  24 Apr 2007 13:54:29 -0000      1.22
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: catalogue_stats.pl,v 1.21 2007/04/18 14:19:52 tipaul Exp $
+# $Id: catalogue_stats.pl,v 1.22 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -26,7 +26,6 @@
 use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
 
 =head1 NAME

Index: reports/cat_issues_top.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/cat_issues_top.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- reports/cat_issues_top.pl   4 Apr 2007 16:46:23 -0000       1.13
+++ reports/cat_issues_top.pl   24 Apr 2007 13:54:29 -0000      1.14
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: cat_issues_top.pl,v 1.13 2007/04/04 16:46:23 tipaul Exp $
+# $Id: cat_issues_top.pl,v 1.14 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -26,7 +26,6 @@
 use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
 use Date::Manip;
 use C4::Members;

Index: reports/inventory.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/inventory.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- reports/inventory.pl        4 Apr 2007 16:46:23 -0000       1.5
+++ reports/inventory.pl        24 Apr 2007 13:54:29 -0000      1.6
@@ -22,7 +22,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Biblio;
 use C4::Date;
 

Index: reports/issues_avg_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/issues_avg_stats.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- reports/issues_avg_stats.pl 4 Apr 2007 16:46:23 -0000       1.8
+++ reports/issues_avg_stats.pl 24 Apr 2007 13:54:29 -0000      1.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: issues_avg_stats.pl,v 1.8 2007/04/04 16:46:23 tipaul Exp $
+# $Id: issues_avg_stats.pl,v 1.9 2007/04/24 13:54:29 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -26,7 +26,6 @@
 use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
 use Date::Calc qw(Delta_Days);
 

Index: reports/issues_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/issues_stats.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- reports/issues_stats.pl     18 Apr 2007 14:19:52 -0000      1.17
+++ reports/issues_stats.pl     24 Apr 2007 13:54:30 -0000      1.18
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: issues_stats.pl,v 1.17 2007/04/18 14:19:52 tipaul Exp $
+# $Id: issues_stats.pl,v 1.18 2007/04/24 13:54:30 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,9 +24,8 @@
 use CGI;
 use C4::Context;
 use C4::Branch; # GetBranches
-use C4::Output;
 use C4::Koha;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Circulation;
 use Date::Manip;
 

Index: reports/manager.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/manager.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- reports/manager.pl  4 Apr 2007 16:46:23 -0000       1.7
+++ reports/manager.pl  24 Apr 2007 13:54:30 -0000      1.8
@@ -22,7 +22,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Circulation;
 
 

Index: reports/reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/reports-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- reports/reports-home.pl     9 Mar 2007 15:13:36 -0000       1.5
+++ reports/reports-home.pl     24 Apr 2007 13:54:30 -0000      1.6
@@ -20,7 +20,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: reports/reservereport.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/reservereport.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- reports/reservereport.pl    9 Mar 2007 15:13:36 -0000       1.11
+++ reports/reservereport.pl    24 Apr 2007 13:54:30 -0000      1.12
@@ -30,7 +30,6 @@
 use C4::Output;
 use C4::Branch; # GetBranches
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Koha;
 
 

Index: reports/stats.print.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/stats.print.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reports/stats.print.pl      9 Mar 2007 15:13:36 -0000       1.3
+++ reports/stats.print.pl      24 Apr 2007 13:54:30 -0000      1.4
@@ -5,7 +5,6 @@
 use C4::Output;
 
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use Date::Manip;
 use C4::Stats;

Index: reports/stats.screen.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/stats.screen.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reports/stats.screen.pl     9 Mar 2007 15:13:36 -0000       1.3
+++ reports/stats.screen.pl     24 Apr 2007 13:54:30 -0000      1.4
@@ -19,7 +19,6 @@
 use CGI;
 use C4::Output;
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use Date::Manip;
 use C4::Stats;

Index: reserve/request.pl
===================================================================
RCS file: /cvsroot/koha/koha/reserve/request.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- reserve/request.pl  23 Apr 2007 14:08:47 -0000      1.12
+++ reserve/request.pl  24 Apr 2007 13:54:30 -0000      1.13
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.12 2007/04/23 14:08:47 tipaul Exp $
+# $Id: request.pl,v 1.13 2007/04/24 13:54:30 hdl Exp $
 
 #writen 2/1/00 by address@hidden
 # Copyright 2000-2002 Katipo Communications
@@ -32,7 +32,6 @@
 use List::MoreUtils qw/uniq/;
 use Date::Calc qw/Today Date_to_Days/;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Auth;
 use C4::Reserves;
 use C4::Biblio;

Index: reviews/reviewswaiting.pl
===================================================================
RCS file: /cvsroot/koha/koha/reviews/reviewswaiting.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- reviews/reviewswaiting.pl   23 Apr 2007 13:10:08 -0000      1.4
+++ reviews/reviewswaiting.pl   24 Apr 2007 13:54:30 -0000      1.5
@@ -19,7 +19,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Review;
 use C4::Members;

Index: serials/acqui-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/acqui-search.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- serials/acqui-search.pl     9 Mar 2007 15:14:25 -0000       1.8
+++ serials/acqui-search.pl     24 Apr 2007 13:54:30 -0000      1.9
@@ -17,13 +17,12 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: acqui-search.pl,v 1.8 2007/03/09 15:14:25 tipaul Exp $
+# $Id: acqui-search.pl,v 1.9 2007/04/24 13:54:30 hdl Exp $
 
 use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Bookfund;
 
 my $query = new CGI;

Index: serials/acqui-search-result.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/acqui-search-result.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- serials/acqui-search-result.pl      9 Mar 2007 15:14:25 -0000       1.8
+++ serials/acqui-search-result.pl      24 Apr 2007 13:54:30 -0000      1.9
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: acqui-search-result.pl,v 1.8 2007/03/09 15:14:25 tipaul Exp $
+# $Id: acqui-search-result.pl,v 1.9 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -45,7 +45,6 @@
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
 
 
 use C4::Acquisition;

Index: serials/checkexpiration.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/checkexpiration.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- serials/checkexpiration.pl  9 Mar 2007 15:47:41 -0000       1.2
+++ serials/checkexpiration.pl  24 Apr 2007 13:54:30 -0000      1.3
@@ -16,7 +16,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: checkexpiration.pl,v 1.2 2007/03/09 15:47:41 tipaul Exp $
+# $Id: checkexpiration.pl,v 1.3 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -48,7 +48,6 @@
 use C4::Auth;
 use C4::Serials; # GetExpirationDate
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use Date::Calc qw/Today Date_to_Days/;
 

Index: serials/claims.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/claims.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/claims.pl   9 Mar 2007 15:14:25 -0000       1.4
+++ serials/claims.pl   24 Apr 2007 13:54:30 -0000      1.5
@@ -7,7 +7,6 @@
 use C4::Acquisition;
 use C4::Output;
 use C4::Bookseller;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Letters;
 

Index: serials/distributedto.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/distributedto.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- serials/distributedto.pl    9 Mar 2007 15:14:25 -0000       1.6
+++ serials/distributedto.pl    24 Apr 2007 13:54:30 -0000      1.7
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: distributedto.pl,v 1.6 2007/03/09 15:14:25 tipaul Exp $
+# $Id: distributedto.pl,v 1.7 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -53,7 +53,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 use C4::Serials;
 use C4::Members;

Index: serials/lateissues-excel.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/lateissues-excel.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/lateissues-excel.pl 9 Mar 2007 15:14:25 -0000       1.3
+++ serials/lateissues-excel.pl 24 Apr 2007 13:54:30 -0000      1.4
@@ -6,7 +6,6 @@
 use C4::Serials;
 use C4::Acquisition;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 # use Date::Manip;

Index: serials/member-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/member-search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/member-search.pl    23 Apr 2007 13:10:08 -0000      1.4
+++ serials/member-search.pl    24 Apr 2007 13:54:30 -0000      1.5
@@ -24,7 +24,7 @@
 use strict;
 use CGI;
 use C4::Auth;       # get_template_and_user
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Members;    # BornameSearch
 
 my $query          = new CGI;

Index: serials/receipt.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/receipt.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- serials/receipt.pl  9 Mar 2007 15:47:41 -0000       1.2
+++ serials/receipt.pl  24 Apr 2007 13:54:30 -0000      1.3
@@ -17,13 +17,12 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: receipt.pl,v 1.2 2007/03/09 15:47:41 tipaul Exp $
+# $Id: receipt.pl,v 1.3 2007/04/24 13:54:30 hdl Exp $
 
 use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: serials/reorder_members.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/reorder_members.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/reorder_members.pl  9 Mar 2007 15:14:25 -0000       1.3
+++ serials/reorder_members.pl  24 Apr 2007 13:54:30 -0000      1.4
@@ -6,13 +6,12 @@
 # printed out
 use strict;
 use CGI;
-use C4::Koha;
 use C4::Auth;
-use C4::Date;
+use C4::Context;
 use C4::Output;
+use C4::Koha;
+use C4::Date;
 use C4::Acquisition;
-use C4::Interface::CGI::Output;
-use C4::Context;
 use C4::Serials;
 
 my $query = new CGI;

Index: serials/routing.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/routing.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/routing.pl  23 Apr 2007 13:10:08 -0000      1.4
+++ serials/routing.pl  24 Apr 2007 13:54:30 -0000      1.5
@@ -32,7 +32,7 @@
 use C4::Date;
 use C4::Output;
 use C4::Acquisition;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Context;
 
 use C4::Members;

Index: serials/routing-preview.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/routing-preview.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- serials/routing-preview.pl  23 Apr 2007 14:08:47 -0000      1.7
+++ serials/routing-preview.pl  24 Apr 2007 13:54:30 -0000      1.8
@@ -12,7 +12,6 @@
 use C4::Acquisition;
 use C4::Reserves;
 use C4::Circulation;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Members;
 use C4::Biblio;

Index: serials/serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/serial-issues.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- serials/serial-issues.pl    9 Mar 2007 15:14:25 -0000       1.7
+++ serials/serial-issues.pl    24 Apr 2007 13:54:30 -0000      1.8
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: serial-issues.pl,v 1.7 2007/03/09 15:14:25 tipaul Exp $
+# $Id: serial-issues.pl,v 1.8 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -49,7 +49,6 @@
 use C4::Date;
 use C4::Serials;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: serials/serials-collection.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/serials-collection.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- serials/serials-collection.pl       9 Mar 2007 15:47:41 -0000       1.2
+++ serials/serials-collection.pl       24 Apr 2007 13:54:30 -0000      1.3
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: serials-collection.pl,v 1.2 2007/03/09 15:47:41 tipaul Exp $
+# $Id: serials-collection.pl,v 1.3 2007/04/24 13:54:30 hdl Exp $
 
 use strict;
 use CGI;
@@ -27,7 +27,6 @@
 use C4::Serials;
 use C4::Letters;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 

Index: serials/serials-edit.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/serials-edit.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/serials-edit.pl     17 Apr 2007 08:52:35 -0000      1.4
+++ serials/serials-edit.pl     24 Apr 2007 13:54:30 -0000      1.5
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: serials-edit.pl,v 1.4 2007/04/17 08:52:35 tipaul Exp $
+# $Id: serials-edit.pl,v 1.5 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -70,7 +70,6 @@
 use C4::Biblio;
 use C4::Koha;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Serials;
 

Index: serials/serials-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/serials-home.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- serials/serials-home.pl     9 Mar 2007 15:14:25 -0000       1.10
+++ serials/serials-home.pl     24 Apr 2007 13:54:30 -0000      1.11
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: serials-home.pl,v 1.10 2007/03/09 15:14:25 tipaul Exp $
+# $Id: serials-home.pl,v 1.11 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -46,7 +46,6 @@
 use C4::Auth;
 use C4::Serials;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 my $query         = new CGI;

Index: serials/serials-recieve.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/serials-recieve.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- serials/serials-recieve.pl  29 Mar 2007 13:30:32 -0000      1.7
+++ serials/serials-recieve.pl  24 Apr 2007 13:54:30 -0000      1.8
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: serials-recieve.pl,v 1.7 2007/03/29 13:30:32 tipaul Exp $
+# $Id: serials-recieve.pl,v 1.8 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -70,7 +70,6 @@
 use C4::Biblio;
 use C4::Koha;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Serials;
 use C4::Branch; # GetBranches

Index: serials/statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/statecollection.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/statecollection.pl  9 Mar 2007 15:47:41 -0000       1.3
+++ serials/statecollection.pl  24 Apr 2007 13:54:30 -0000      1.4
@@ -15,14 +15,13 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: statecollection.pl,v 1.3 2007/03/09 15:47:41 tipaul Exp $
+# $Id: statecollection.pl,v 1.4 2007/04/24 13:54:30 hdl Exp $
 
 use strict;
 use CGI;
 use C4::Auth;
 use C4::Date;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Serials;
 

Index: serials/subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-add.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- serials/subscription-add.pl 9 Mar 2007 15:14:25 -0000       1.11
+++ serials/subscription-add.pl 24 Apr 2007 13:54:30 -0000      1.12
@@ -17,16 +17,15 @@
 
 use strict;
 use CGI;
+use Date::Manip;
 use C4::Koha;
 use C4::Auth;
 use C4::Date;
-use C4::Output;
 use C4::Acquisition;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Context;
 use C4::Branch; # GetBranches
 use C4::Serials;
-use Date::Manip;
 use C4::Letters;
 
 my $query = new CGI;

Index: serials/subscription-bib-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-bib-search.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- serials/subscription-bib-search.pl  29 Mar 2007 13:30:32 -0000      1.7
+++ serials/subscription-bib-search.pl  24 Apr 2007 13:54:30 -0000      1.8
@@ -54,7 +54,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Search;
 use C4::Biblio;
 

Index: serials/subscription-copy.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-copy.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- serials/subscription-copy.pl        9 Mar 2007 15:14:25 -0000       1.2
+++ serials/subscription-copy.pl        24 Apr 2007 13:54:30 -0000      1.3
@@ -3,16 +3,15 @@
 
 use strict;
 use CGI;
+use Date::Manip;
+
 use C4::Koha;
 use C4::Auth;
 use C4::Date;
 use C4::Output;
 use C4::Acquisition;
-use C4::Interface::CGI::Output;
 use C4::Context;
-
 use C4::Serials;
-use Date::Manip;
 
 my $query = new CGI;
 my $subscriptionid = $query->param('subscriptionid');

Index: serials/subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-detail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- serials/subscription-detail.pl      9 Mar 2007 15:14:25 -0000       1.6
+++ serials/subscription-detail.pl      24 Apr 2007 13:54:30 -0000      1.7
@@ -22,7 +22,6 @@
 use C4::Date;
 use C4::Serials;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use Date::Manip;
 

Index: serials/subscription-renew.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/subscription-renew.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- serials/subscription-renew.pl       9 Mar 2007 15:14:25 -0000       1.7
+++ serials/subscription-renew.pl       24 Apr 2007 13:54:30 -0000      1.8
@@ -18,7 +18,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: subscription-renew.pl,v 1.7 2007/03/09 15:14:25 tipaul Exp $
+# $Id: subscription-renew.pl,v 1.8 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -56,7 +56,6 @@
 use C4::Context;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Serials;
 
 my $query = new CGI;

Index: serials/viewalerts.pl
===================================================================
RCS file: /cvsroot/koha/koha/serials/viewalerts.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- serials/viewalerts.pl       9 Mar 2007 15:14:25 -0000       1.5
+++ serials/viewalerts.pl       24 Apr 2007 13:54:30 -0000      1.6
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: viewalerts.pl,v 1.5 2007/03/09 15:14:25 tipaul Exp $
+# $Id: viewalerts.pl,v 1.6 2007/04/24 13:54:30 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -20,12 +20,10 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Interface::CGI::Template;
 use C4::Koha;
 use C4::Letters;
 use C4::Serials;

Index: suggestion/acceptorreject.pl
===================================================================
RCS file: /cvsroot/koha/koha/suggestion/acceptorreject.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- suggestion/acceptorreject.pl        9 Mar 2007 15:14:34 -0000       1.5
+++ suggestion/acceptorreject.pl        24 Apr 2007 13:54:30 -0000      1.6
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: acceptorreject.pl,v 1.5 2007/03/09 15:14:34 tipaul Exp $
+# $Id: acceptorreject.pl,v 1.6 2007/04/24 13:54:30 hdl Exp $
 
 =head1 NAME
 
@@ -70,7 +70,7 @@
 use CGI;
 
 use C4::Auth;    # get_template_and_user
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Suggestions;
 use C4::Koha;    # GetAuthorisedValue
 

Index: tools/barcodes.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/barcodes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/barcodes.pl   9 Mar 2007 15:14:47 -0000       1.2
+++ tools/barcodes.pl   24 Apr 2007 13:54:30 -0000      1.3
@@ -3,7 +3,7 @@
 # script to generate items barcodes
 # written 07/04
 # by Veleda Matias - address@hidden - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - address@hidden - Physics Library UNLP Argentina and
+#    Casta�eda Sebastian - address@hidden - Physics Library UNLP Argentina 
and
 
 # This file is part of Koha.
 #
@@ -24,7 +24,6 @@
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 use C4::Context;

Index: tools/breeding.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/breeding.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/breeding.pl   9 Mar 2007 15:47:55 -0000       1.2
+++ tools/breeding.pl   24 Apr 2007 13:54:30 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: breeding.pl,v 1.2 2007/03/09 15:47:55 tipaul Exp $
+# $Id: breeding.pl,v 1.3 2007/04/24 13:54:30 hdl Exp $
 
 # Script for handling import of MARC data into Koha db
 #   and Z39.50 lookups
@@ -32,17 +32,14 @@
 # standard or CPAN modules used
 use CGI;
 use DBI;
+use MARC::File::USMARC;
 
 # Koha modules used
 use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
+use C4::Auth;
 use C4::Input;
-use C4::Biblio;
-use MARC::File::USMARC;
-
 use C4::Output;
-use C4::Auth;
+use C4::Biblio;
 use C4::Breeding;
 
 #------------------
@@ -103,6 +100,13 @@
 #---------------
 # log cleared, as marcimport is (almost) rewritten from scratch.
 # $Log: breeding.pl,v $
+# Revision 1.3  2007/04/24 13:54:30  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.2  2007/03/09 15:47:55  tipaul
 # rel_3_0 moved to HEAD (introducing new files)
 #

Index: tools/cleanborrowers.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/cleanborrowers.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tools/cleanborrowers.pl     23 Apr 2007 13:10:08 -0000      1.4
+++ tools/cleanborrowers.pl     24 Apr 2007 13:54:30 -0000      1.5
@@ -17,7 +17,7 @@
 #
 #   Written by Antoine Farnault address@hidden on Nov. 2006.
 
-# $Id: cleanborrowers.pl,v 1.4 2007/04/23 13:10:08 hdl Exp $
+# $Id: cleanborrowers.pl,v 1.5 2007/04/24 13:54:30 hdl Exp $
 
 =head1 cleanborrowers.pl
 
@@ -36,7 +36,7 @@
 use strict;
 use CGI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 
 use C4::Members;               # GetBorrowersWhoHavexxxBorrowed.

Index: tools/exceptionHolidays.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/exceptionHolidays.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/exceptionHolidays.pl  9 Mar 2007 15:14:47 -0000       1.3
+++ tools/exceptionHolidays.pl  24 Apr 2007 13:54:30 -0000      1.4
@@ -5,7 +5,6 @@
 
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 use C4::Calendar;

Index: tools/export.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/export.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tools/export.pl     29 Mar 2007 13:30:32 -0000      1.4
+++ tools/export.pl     24 Apr 2007 13:54:30 -0000      1.5
@@ -16,12 +16,11 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: export.pl,v 1.4 2007/03/29 13:30:32 tipaul Exp $
+# $Id: export.pl,v 1.5 2007/04/24 13:54:30 hdl Exp $
 
 use strict;
 require Exporter;
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Output;  # contains gettemplate
 use C4::Biblio;  # GetMarcBiblio GetXmlBiblio
 use CGI;

Index: tools/holidays.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/holidays.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tools/holidays.pl   9 Mar 2007 15:14:47 -0000       1.4
+++ tools/holidays.pl   24 Apr 2007 13:54:30 -0000      1.5
@@ -21,7 +21,6 @@
 
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 use C4::Calendar;

Index: tools/import.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/import.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tools/import.pl     9 Mar 2007 15:14:47 -0000       1.4
+++ tools/import.pl     24 Apr 2007 13:54:30 -0000      1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: import.pl,v 1.4 2007/03/09 15:14:47 tipaul Exp $
+# $Id: import.pl,v 1.5 2007/04/24 13:54:30 hdl Exp $
 
 # Script for handling import of MARC data into Koha db
 #   and Z39.50 lookups
@@ -31,18 +31,14 @@
 
 # standard or CPAN modules used
 use CGI;
-use DBI;
+use MARC::File::USMARC;
 
 # Koha modules used
 use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
+use C4::Auth;
 use C4::Input;
-use C4::Biblio;
-use MARC::File::USMARC;
-
 use C4::Output;
-use C4::Auth;
+use C4::Biblio;
 use C4::Breeding;
 
 #------------------
@@ -101,6 +97,13 @@
 #---------------
 # log cleared, as marcimport is (almost) rewritten from scratch.
 # $Log: import.pl,v $
+# Revision 1.5  2007/04/24 13:54:30  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.4  2007/03/09 15:14:47  tipaul
 # rel_3_0 moved to HEAD
 #

Index: tools/inventory.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/inventory.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tools/inventory.pl  4 Apr 2007 16:46:23 -0000       1.4
+++ tools/inventory.pl  24 Apr 2007 13:54:30 -0000      1.5
@@ -22,7 +22,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Biblio;
 use C4::Date;
 use C4::Koha;

Index: tools/itemslost.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/itemslost.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/itemslost.pl  4 Apr 2007 16:46:23 -0000       1.3
+++ tools/itemslost.pl  24 Apr 2007 13:54:30 -0000      1.4
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-#$Id: itemslost.pl,v 1.3 2007/04/04 16:46:23 tipaul Exp $
+#$Id: itemslost.pl,v 1.4 2007/04/24 13:54:30 hdl Exp $
 
 =head1 itemslost
 
@@ -26,7 +26,7 @@
 use strict;
 use CGI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Biblio;    # GetLostItems
 use C4::Koha;                  # GetItemTypes
 use C4::Branch; # GetBranches

Index: tools/koha-news.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/koha-news.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/koha-news.pl  9 Mar 2007 15:14:47 -0000       1.3
+++ tools/koha-news.pl  24 Apr 2007 13:54:30 -0000      1.4
@@ -2,7 +2,7 @@
 
 # Script to manage the opac news.
 # written 11/04
-# Castañeda, Carlos Sebastian - address@hidden - Physics Library UNLP Argentina
+# Casta�eda, Carlos Sebastian - address@hidden - Physics Library UNLP 
Argentina
 # Modified to include news to KOHA intranet - address@hidden NEU library 
-Cyprus
 # Copyright 2000-2002 Katipo Communications
 #
@@ -27,7 +27,6 @@
 use C4::Koha;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::NewsChannels;
 use C4::Languages;
 use Date::Calc qw/Date_to_Days Today/;

Index: tools/letter.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/letter.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/letter.pl     18 Apr 2007 17:00:15 -0000      1.3
+++ tools/letter.pl     24 Apr 2007 13:54:30 -0000      1.4
@@ -43,7 +43,6 @@
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 sub StringSearch  {

Index: tools/newHolidays.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/newHolidays.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/newHolidays.pl        9 Mar 2007 15:14:47 -0000       1.3
+++ tools/newHolidays.pl        24 Apr 2007 13:54:30 -0000      1.4
@@ -5,7 +5,6 @@
 
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 
 
 use C4::Calendar;

Index: tools/overduerules.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/overduerules.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tools/overduerules.pl       9 Mar 2007 15:14:47 -0000       1.5
+++ tools/overduerules.pl       24 Apr 2007 13:54:30 -0000      1.6
@@ -21,11 +21,8 @@
 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
 use C4::Letters;
 

Index: tools/printerConfig.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/printerConfig.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/printerConfig.pl      9 Mar 2007 15:14:47 -0000       1.3
+++ tools/printerConfig.pl      24 Apr 2007 13:54:30 -0000      1.4
@@ -22,16 +22,14 @@
 require Exporter;
 
 use strict;
-
 use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-
 use PDF::API2;
 use PDF::API2::Page;
 use PDF::API2::PDF::Utils;
-use C4::Interface::CGI::Output;
+
+use C4::Context;
+use C4::Output;
+use C4::Auth;
 
 # This function returns the path to deal with the correct files, considering
 # templates set and language.

Index: tools/tools-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/tools-home.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/tools-home.pl 9 Mar 2007 15:14:47 -0000       1.3
+++ tools/tools-home.pl 24 Apr 2007 13:54:30 -0000      1.4
@@ -18,7 +18,7 @@
 use strict;
 use CGI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(

Index: tools/viewlog.pl
===================================================================
RCS file: /cvsroot/koha/koha/tools/viewlog.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/viewlog.pl    9 Mar 2007 15:47:55 -0000       1.2
+++ tools/viewlog.pl    24 Apr 2007 13:54:30 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: viewlog.pl,v 1.2 2007/03/09 15:47:55 tipaul Exp $
+# $Id: viewlog.pl,v 1.3 2007/04/24 13:54:30 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,7 +24,7 @@
 use CGI;
 use C4::Context;
 use C4::Koha;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Log;
 use Date::Manip;
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]