Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Jonathan Druart	189bde4a1d	Bug 21831: Allow move all fields even if destination field is different Tests exist in t/SimpleMARC.t to prove that it works and it is possible. I do not remember what I wrote this limitation. Signed-off-by: Jon Knight <j.p.knight@lboro.ac.uk> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Nick Clemens	284226a496	Bug 13560: Add an 'Add' option for marc modification templates Add/Update would update a field or create new if it existed, but didn't allow for creating new if the field existed. This patchset splits the options to 'Add & Update' so that 'Add' will always add a field and 'Update' will operate as it always has To test: 1 - Have a record with a known existing field (make a copy) 2 - Define a marc modification template that 'Add/update' on that field 3 - Define an 'Add/Update' on a field that doesn't exist 4 - Batch modify the copy of record using the above template 5 - Verify the existing field was updated 6 - Verify the non-existing field was updated 7 - Apply patch and update database 8 - Make another copy 9 - Modify the copy with the same template as above 10 - Should match initial modification 11 - Add a new rule to add a new field 12 - Modify using the updated template 13 - Ensure your new field is created 14 - Test various options in the modification tool 15 - prove t/db_dependent/MarcModificationTemplates.t Signed-off-by: Victor Grousset <victor.grousset@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	7 years ago
Jonathan Druart	3755a38acf	Bug 20144: [sql_modes] Set default value for marc_modification_template_actions Cannot be empty strings. Fix for: Data truncated for column 'conditional' Data truncated for column 'conditional_comparison' Incorrect integer value: '' for column 'conditional_regex' t/db_dependent/MarcModificationTemplates.t Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Jonathan Druart	bdf85f5e39	Bug 19069: Fix 'does not match' behaviour in MARC modification template The "does not match" condition does not behave as expected. We want it to process the action if the subfield exists and that the value does not match a given pattern. Test plan: Be creative and write different template actions using the "does not match" condition. Using the "Batch record modification" and the "Show MARC" popup, confirm that the processed record is the one you are expecting. Signed-off-by: Jon Knight <J.P.Knight@lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Jonathan Druart	017699c345	Bug 16011: $VERSION - Remove the $VERSION init Mainly a perl -p -i -e 's/^.3.07.00.049.\n//' */.pm Then some adjustements Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Jonathan Druart	3830d78d46	Bug 16011: $VERSION - remove use vars $VERSION perl -p -i -e 's/^(use vars .)\$VERSION\s?(.)/$1$2/' */.pm Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Nick Clemens	771e63f5bf	Bug 15669: Alphabetize marc modification templates This patch sorts the modification templates when getting them from the database This affects the pages below: tools/batch_record_modification.pl tools/marc_modification.pl tools/stage-marc-import.pl To test: 1 - Add some marc modification templates in a non alpha order (Shoes, Hats, Cats) 2 - visit the pages above and note the templates are in order added 3 - apply patch 4 - visit the three pages and note correct order 5 - verify all tools continue to work as expected Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Jonathan Druart	f189696bb7	Bug 14098: Implement the copy_and_replace action for MTT This patch implements the copy and replace action for the marc modification templates. Instead of copying a field/subfield, it will erase the destination fields/subfields. Test plan: Find it yourself. Compare the differences between the copy and the copy_and_replace actions. The easier way to test is to 1/ create a complete record, 2/create some modification templates and 3/ use the batch record modification with the "preview" function. QA note: I kept the same tests as "copy" and, if no change were expected, I noted them "(same as copy)", to be sure this new action won't introduce regression on these tests. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Jonathan Druart	b969aa3fa3	Bug 11413: Fix field_numbers This fix is a global fix for the MarcModificationTemplate feature. Some unit tests were missing and some behaviors were wrong. For instance, if you tried to update a non existent field, the script crashed. The following line was completely stupid: if $from_field ne $to_subfield The field_number equals 1 if the user wants to update the first field and 0 for all fields. The field_numbers (note the s) variable contains the field numbers to update. This array is filled if a condition exists (field exists or field equals). Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Jonathan Druart	f76b5c8141	Bug 11413: Fix return for ModifyRecordWithTemplate Make sure the ModifyRecordWithTemplate routine returns undef. This patch also removes a warning if GetModificationTemplates is called without parameter. Verify prove t/db_dependent/MarcModificationTemplates.t returns green. Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	11 years ago
Jonathan Druart	6d2e5f58f2	Bug 11413: Change the field number logic This patch series is a bugfix for the Marc modification templates tool. Bug description: If you want to do an action (delete/update/move/...) on a multivalued field and if a condition is defined on the same field, it is highly probable the resulted record will not be what you expect. For example: Deleting All (or the first) fields 650 if 245$a="Bad title" works with the current code. BUT if you want to delete All (or the first) fields 650 with a condition on 650$9=42, and if at least one field matches the condition : - if you have selected all, all fields 650 will be deleted, even the ones who do not match the condition. - if you have selected first, the first 650 field will be deleted, even if it does not match the condition. The expected behavior is to delete the fields matching the condition (and not all the 650 fields). What this patch does: This patch introduces 2 changes in the logic of Koha::SimpleMARC. The first change is a change of the prototypes for the 2 routines field_exists and field_equals. Now they return the "field number" of the matching fields. The second change is the type of the "n" parameter for all routines using it in Koha::SimpleMARC. Before this patch, the "n" parameter was a boolean in most cases. If 0, the action was done on all fields, if 1 on the first one only. Now it is possible to specify the "field numbers" (so the array of field numbers which is returned by field_exists or field_equals) for all routines which had the n parameter. Test plan for the patch series: Note: This test plan describes a specific example, feel free to create your own one. 0/ Define a marc modification template with the following action: Delete field 245 if 245$9 = 42 1/ choose and export a record with several 245 fields. For ex: 245 $a The art of computer programming $c Donald E. Knuth. $9 41 245 $a Bad title $c Bad author $9 42 2/ import it using the Stage MARC for import tool. 3/ verify the imported record does not contain any 245 field. 4/ apply all the patches from this bug report 5/ do again steps 2 and 3 6/ verify the imported record contains only one 245 field, the one with 245$9=41 7/ verify the unit tests passed: prove t/SimpleMARC.t prove t/db_dependent/MarcModificationTemplates.t Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	11 years ago
Marcel de Rooy	44cb93d77d	Bug 11319: [QA follow-up] Remove a warning from GetModificationTemplates Removes this warning: Use of uninitialized value $template_id in string eq at C4/MarcModificationTemplates.pm line 84. GetModificationTemplates has no template_id if called from marc_modification_templates.pl without operation (first click from interface) and from tools/stage-marc-import.pl. Slightly adjusted the POD lines accordingly. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Jonathan Druart	c48639ee27	Bug 11319: Koha::SimpleMARC should take a hashref for parameters In order to avoid a long list of parameters, it should be better to pass all of them into a hashref. This patch does not add or modify a behavior. Test plan: Verify the unit tests still pass - prove t/SimpleMARC.t - prove t/db_dependent/MarcModificationTemplates.t Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	11 years ago
Colin Campbell	11faf9fde8	Bug 11479: Remove experimental given/when keywords Replace constructs using given and when by if/else feature now generates compilation warnings in 5.18 and is liable to change behaviour. This patch: * replaces the construct with if/else * reformats the if branching using perltidy to remove the now redundant indent To test: [1] Verify that prove -v t/db_dependent/MarcModificationTemplates.t passes. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Galen Charlton	b062847364	Bug 8015: (follow-up) don't require userenv Core routines probably should never assume that they're running with a valid userenv defined. Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Kyle Hall	083f90cc44	Bug 8015: (follow-up) remove references to C4::Koha::Log Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Jonathan Druart	5d170aa268	Bug 8015: Add unit tests for SimpleMARC and MarcModificationTemplates routines Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Bug 8015: Fix complains from qa tools Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Bug 8015: Get rid of the eval in ModifyRecordWithTemplate This patch removes the use of eval in the C4::MarcModificationTemplates::ModifyRecordWithTemplate routine. Now this routine call the wanted modification routine with the list of parameters. This call is done only if the condition is respected. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Bug 8015: Get rid of eval for evaluating =~ m// Koha::SimpleMarc::field_equals uses eval in order to check if a string matches a pattern. Now this eval is removed and the "regex" variable does not contain the regex separated character (/ or \|). Regression: Before this patch, the user was able to user a modifier. Now it is not possible. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Bug 8015: Get rid of the eval for substitution Before this patch, the regex substitution was contain into only one variable (e.g. my $regex = "/foo/bar/i"). Now each member of the regex is stored into a field in the marc_modification_template_actions sql table. In order to avoid a complex code, only modifiers i and g are take into account. Note: If you already add the mmta table, you have to drop it. This patch also adds a foreign key from mmta to mmt tables. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Bug 8015: FIX ui issue Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Bug 8015: The template name is a required field Test plan: Try to add a template with an empty string as name. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Kyle Hall	7362776897	Bug 8015: (follow-up) fix various issues (squashed patch) Bug 8015: Fix template capitalization amd other template issues Signed-off-by: Leila <koha.aixmarseille@gmail.com> Bug 8015: Fix error where field object is returned instead of field value for fields without subfields Signed-off-by: Leila <koha.aixmarseille@gmail.com> Bug 8015: Fix bad ordering on function parameters Signed-off-by: Leila <koha.aixmarseille@gmail.com> Bug 8015: Escape escape characters for strings Signed-off-by: Leila <koha.aixmarseille@gmail.com> Bug 8015: Fix bad parameter list for direct external call to update_field Signed-off-by: Leila <koha.aixmarseille@gmail.com> Bug 8015: Fix problem with moving existing subfield value to nonexistent field/subfield Signed-off-by: Leila <koha.aixmarseille@gmail.com> Bug 8015: FIX QA issues This patch fixes some stuffs failing qa tests: POD, indentation (tabs), perlcritic Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Kyle Hall	b38f0213fe	Bug 8015: (follow-up) move from the Koha to the C4 namespace Signed-off-by: Leila <koha.aixmarseille@gmail.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	12 years ago
Kyle Hall	622430cfb5	Bug 8015: Add MARC Modifications Templates The MARC Modification Templates system gives Koha users the power to make alterations to MARC records automatically while staging MARC records for import. This tool is useful for altering MARC records from various venders work with your MARC framework. The system essentially allows one to create a basic script using actions to Copy, Move, Add, Update and Delete fields. Each action can also have an optional condition to check the value or existance of another field. The Copy & Move actions also support Regular Expressions, which can be used to automatically modify field values during the copy/move. An example would be to strip out the '$' character in field 020$c. Furthermore, the value for an update can include variables that change each time the template is used. Currently, the system supports two variables, __BRANCHCODE__ which is replaced with the branchcode of the library currently using the template, and __CURRENTDATE__ which is replaced with the current date in ISO format ( YYYY-MM-DD ). At its simplist, it can perform functions such as: Copy field 092$a to 952$c At its most complex it can run actions like: Copy field 020$c to 020$c using RegEx s/\$// if 020$c equals RegEx m/^\$/ Signed-off-by: Leila <koha.aixmarseille@gmail.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	12 years ago

19 Commits (68a92c02dfbafa9eea73516cb29ba5e6a311a730)