6 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
238fabc4ab |
Bug 28617: Remove kohalib.pl and rely on PERL5LIB
The purpose of this script was to load the relevant Koha lib for the different scripts (installation, cronjob, CLI, etc.) However it is not used consistently and we prefer to rely on PERL5LIB. From bug 28617 comment 6 from Galen: """ Time marches on, and one of the motivations for having kohalib.pl - making it possible to install Koha without setting a single environment variable - has been obviated by the vast improvements in the ease of installing Koha. Consequently, I think kohalib.pl can go away. """ Test plan: confirm that the changes make sense and that kohalib.pl can be removed safely. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> |
|||
9d6d641d1f |
Bug 17600: Standardize our EXPORT_OK
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> |
|||
d2e189ca1c |
Bug 22600: Set 'commandline' interface appropriately
This patch change Koha::Cron to be a more generic Koha::Script class and update all commanline driven scripts to use it. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> |
|||
Mark Tompsett
|
d5986c9b97 |
Bug 19040: Refactor GetMarcBiblio parameters
Change parameters to a hashref. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Looks good to me. Two calls in migration_tools/22_to_30 still in old style. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> |
||
ed03edddbd |
Bug 18277: Remove GetBiblionumberFromItemnumber - create_analytical_rel.pl
I have no idea how to test this patch, see bug 5528, or simply read the code. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> |
|||
Jared Camins-Esakov
|
f09e2ca27e |
Bug 5528: Analytic records support
Display links to parent biblios, show linked items in holdings, allow holds on linked items. This uses MARC to maintain relationships. Sponsored by the Mississippi Department of Archives and History and RapidRadio Solution. Originally developed by Savitra Sirohi and Amit Gupta at OSSLabs, with UNIMARC support added by Zeno Tajoli. Commits squashed and merge conflicts resolved by Chris Cormack from Catalyst. Respect for NORMARC and some small framework portability fixes made by Jared Camins-Esakov of C & P Bibliography Services. IMPORTANT NOTE: A bug in the 773 coding for MARC21 was corrected from the original OSS Labs code. The 773s generated by the pre-release code did not have the first indicator set to '0', which means that they were not supposed to display. Going forward, the first indicator will be set correctly, but existing records created with this code will no longer appear (they appeared before only due to another bug). To correct this, you could globally (or, to make sure you only modify records created with the Analytics tool, for records with 773$0) change the first indicator of the 773 from blank to '0'. == Background == An analytic record for an item is a more detailed, monographic biblio for an item attached to a serial record . This is often used for special issues of a journal that are released as books on their own (assigned an ISBN, as well as an ISSN/volume/issue). It is important for researchers to be able to search for these items both as issues of the serial, and as monographs. It is equally important for the library to not have duplicate item records for the item in question to have to keep synchronized. == Establishing relationships == Analytical records are connected to items belonging to parent or host bibliographic records. This can be accomplished by: * From an analytical bibliographic record linking to an host item by providing the item barcode as input * From a host item by using option "analyze", this creates a new empty bibliographic record with field 773 (MARC21) populated * Running a new CLI script that establishes a relationship between the analytical record and the host item identified by the barcode in the analytical record's 773$o (MARC21) == Connecting Records == The relationships are maintained in the MARC records, we have not used database tables at all. == MARC Representation == In MARC21/NORMARC we have used: * 773$9 to store the Koha item number of the host item * 773$0 to store the Koha biblio number of the host bibliographic record The above fields are used to display the relationships in various screens in the OPAC and the staff interface. Additionally, when populating field 773 with host item's details, we have used following MARC 21 mapping: * 'a' <= 100/110/111 $a (author main) * 'b' <= 250$a (edition) * 'd' <= 260$a, 260$b, 260$c (place, publisher, year) * 'o' <= barcode * 't' <= 245$a (title) * 'w' <= (003)001 --> if no 001 is available, we can populate biblionumber * 'x' <= 022$a (issn) * 'z' <= 020$a (isbn) In UNIMARC, this code uses: * 461$9 to store the Koha item number of the host item * 461$0 to store the Koha biblio number of the host bibliographic record When populating field 461 in UNIMARC, the following mapping is used: * 't' <= 200$a (title) == Treatment of Holds == A key requirement was to allow holds to be placed on host items from the analytical record. We have accomplished this by allowing holds on specific copies only. Biblio level holds are not allowed. This ensures that holds are placed on specific items that are relevant to the analytical record. == Deleting host items with linked analytical records == As we have not used database tables to maintain relationships, we had to use search to find out if any linked analytical records are present. If 1 or more analytical are present, we do not allow deletion of items. This is similar to what we see when we try to delete authority records. == Importing analytical records == Analytical records can be imported using bulkmarcimport or the GUI tools. The new CLI script can be executed after the import to establish relationships with host items. The script will establish relationships using the host item's barcode, the barcode must be present in 773$o of the analytical record. == What if there are two or more copies of the host item? == The current design will require that there be two host (773) fields, one for each copy. == What if there is no barcode available for the host item? == It is still possible to establish a relationship, by populating 773$9 with the host's item number. However the CLI script uses barcode in 773$o to establish relationships so it won't work where barcodes are unavailable. Also from an analytical record, it is possible to establish a relationship to a host item by providing the barcode as input, this option will not be available as well. Commits that added the following features were squashed by Chris Cormack (this is not a list of every commit): * Display links to host records from biblio detail screens * Support for UNIMARC, respecting the system preference 'marcflavor' * Support holds from the OPAC * Ability to link to items belong to host records from a analytical record * Display items belonging to host records in the moredetail page * Ability to edit items belonging to host records, also ability to delink from them * Move get host items code into a C4 routine, also calling the new routine in related perl scripts * Move host field population to a C4 routine, all changes in pl files to call new routine * Allow only specific copy holds for analytical records plus changes to use new C4 routines * Support for holds on items linked via host records * Storing bibnumber and itemnumber in subfields 0 and 9, plus other mapping changes * New command line script that establishes relationships between analytical records and host items and bibs. The script looks for host field (MARC21 773) in records, and based on barcode in subfield 'o' populates host bibnumber in subfield '0' and host itemnumber in subfield '9'. The script can be run after an import of analytical records, it can also be run in the crontab to maintain the relationships * Ability to create analytical records from items, to view linked analytics, and prevent deletion of items that have linked analytics * New template for catalogue/detail.pl (NOTE: not a new template file, just a new way of displaying analytics), template displays linked analytics and allows creation of analytical records * New zebra index for item number in host fields. This index will be used to display links to analytical records from host records * Display title of host record instead of the phrase host record * Using detail.tmpl for analytics tab instead of a new template file * Improved qualification info prepration in Prephostmarcfield * Check for linked analytics before deleting item * Display link to host record and more meaningful anchor text for edit item link * Analytical record: Unimarc index in record.abs and help in create_analytical_rel.pl * Adding a sys pref that controls display of options to create analytical relationships * Add host entry in XSLT stylesheet in staff item detail * Added host record support to OPAC detail XSLT * Adding 773$0 and 773$9 to all frameworks * Adding 773 subfields 0 and 9 to default marc framework via updatedatabase.pl * Display create analytics and used in links in catalog detail * Fixed problem where analytical records not showing in OPAC search results because GetMarcBiblio now needs a flag to add item records * Fixed problem where analytics count was set to 1 for all records, not just those with analytics * Fixed catalogue detail page not to show analytics counts if count is 0 Conflicts: installer/data/mysql/updatedatabase.pl koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt kohaversion.pl Co-author: Savitra Sirohi <savitra.sirohi@osslabs.biz> Co-author: Zeno Tajoli <tajoli@cilea.it> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> |