From dfb62f1493e746ae655aa36071e41437326e0c28 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Mon, 25 Jul 2011 10:54:34 +0200 Subject: [PATCH] Bug 5725 : Batch Modifications for Biblios commit 66282fed94564969f0368e27c7231116a2d1c0fe Author: Chris Cormack Date: Tue Feb 22 08:43:24 2011 +1300 Bug 5725 : Follow up fixing permissions thanks to Paul Poulain commit 4d0241aea5be13b00abbc6100dc98ec87f816081 Author: Paul Poulain Date: Mon Jan 10 17:22:31 2011 +0100 Bug 5725 follow up Owen noticed the batchedit was not working. This was because we made a patch months ago to change the GetBiblio API (the 1st returned arg is useless) This patch is not in main trunk, resulting in the error owen has noticed. This patch goes back to official API (even if it is clumsy : the patch we did does not apply anymore) commit 19b3e0ecc57af1c2151340328bf06e26882b7863 Author: Paul Poulain Date: Wed Dec 15 20:47:21 2010 +0100 Bug 5725 : MT #2991 (Feature) Batch biblio modifications This patch add a new feature of batch biblio modifications, it permit to select biblios from basket, and modify fields of them setting Rebased to fix whitespace issues. Bug 5725 follow-up Fixes adresses comments 28 and 29 (from Owen) * add a link to tools-home * display the biblios before defining rules * add some help/change some wording * fixes result "Status" column (was a H:T:P => T:T glitch) and put the message on the top I also removed an unused variable Bug 5725 follow-upd, deal with leader As Owen comment 33 notices, leader update was not working. This patch fixes the problem (and fix a few reindenting glitches as well) Additional fixes for Bug 5725 - Batch modifications for Biblios - Correcting page title - Adding breadcrums - Adding sidebar menu (matching other batch mod pages) - Showing "loading" graphic during AJAX operations - Adding empty option to list of MARC tags so that onchange event will fire when the user is choosing 000 - Other structural markup changes --- C4/Biblio.pm | 101 ++++++++ installer/data/mysql/updatedatabase.pl | 8 +- koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 6 + .../intranet-tmpl/prog/en/modules/basket/basket.tt | 7 + .../prog/en/modules/tools/batchedit.tt | 257 ++++++++++++++++++++ .../prog/en/modules/tools/tools-home.tt | 5 + koha-tmpl/intranet-tmpl/prog/img/loading-small.gif | Bin 0 -> 1652 bytes tools/batchedit.pl | 221 +++++++++++++++++ 8 files changed, 604 insertions(+), 1 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/img/loading-small.gif create mode 100755 tools/batchedit.pl diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 4a9735f..1d40b7b 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -133,6 +133,7 @@ BEGIN { &TransformHtmlToXml &PrepareItemrecordDisplay &GetNoZebraIndexes + &BatchModField ); } @@ -3879,6 +3880,106 @@ sub GetHolds { } +=head3 BatchModField + + Mod subfields in field record + + returns 1,$record if succeed + returns 0,$record if Action was not processed + returns -1 if no record + returns -2 if no action done on record + +=cut + +sub BatchModField { + my ( $record, $field, $subfield, $action, $condval, $nocond, $repval ) = @_; + + return -1 unless $record; + $condval=NormalizeString($condval); + my $condition=qr/$condval/; + + if($action eq "add"){ + for my $rfield ($record->field($field)){ + $rfield->add_subfields( $subfield => $repval ); + } + return 1; + }elsif($action eq "addfield"){ + my $new_field = MARC::Field->new($field,'','', + $subfield => $repval); + $record->insert_fields_ordered($new_field); + return 1; + } else { + my $done=0; + if ($field eq '000') { + my $value=$record->leader(); + if ($value=~ s/$condition/$repval/){ + $record->leader($repval); + $done=1; + } + if ( $nocond eq 'true'){ + $record->leader($repval); + $done=1; + } + } + for my $rfield ($record->field($field)) { + if ($subfield && $subfield ne "@"){ + my @subfields = $rfield->subfields(); + my @subfields_to_add; + foreach my $subf (@subfields) { + if ($subf->[0] eq $subfield){ + $subf->[1]=NormalizeString($subf->[1]); + if ( $action eq "mod" ) { + if ( $nocond ne "true" && $subf->[1] =~ s/$condition/$repval/) { + $done=1; + } + if ($nocond eq "true"){ + $subf->[1] = $repval; + $done=1; + } + } elsif ( $action eq "del" ) { + if ( $subf->[1] =~ m/$condition/ || $nocond eq "true" ) { + $done=1; + next; + } + } + } + push @subfields_to_add,@$subf; + } + if ($done){ + if (@subfields_to_add){ + $rfield->replace_with(MARC::Field->new($rfield->tag,$rfield->indicator(1),$rfield->indicator(2),@subfields_to_add)); + } + else { + my $count= $record->delete_field($rfield); + } + } + } + else { + if ($action eq "del"){ + my $count=$record->delete_field($rfield); + $done=1; + } + else { + if ($field < 10){ + my $value=$record->field($field)->data(); + if ($value=~ s/$condition/$repval/){ + $record->field($field)->update($value); + $done=1; + + } + if ( $nocond eq 'true'){ + $record->field($field)->update($repval); + $done=1; + } + } + } + } + } + return ($done,$record); + } + return -2; +} + 1; __END__ diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e3309a2..57c0d4e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4364,7 +4364,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $DBversion = "3.05.00.004"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { - $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewerPhoto',1,'If ON, photo of reviewer will be shown beside comments in OPAC',NULL,'YesNo');"); + $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewerPhoto',1,'If ON, photo of reviewer will be shown beside comments in OPAC',NULL,'YesNo')"); print "Upgrade to $DBversion done (Add syspref ShowReviewerPhoto)\n"; SetVersion($DBversion); } @@ -4435,6 +4435,12 @@ $DBversion = "3.05.00.010"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("CREATE INDEX priorityfoundidx ON reserves (priority,found)"); print "Create an index on reserves to speed up holds awaiting pickup report bug 5866\n"; +} + +$DBversion = "3.05.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ( 13, 'batchedit', 'Batch editing biblios')"); + print "Upgrade to $DBversion done (batch edit permission)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js index 3a09f64..63d2e3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js @@ -438,4 +438,10 @@ $(document).ready(function(){ if(basketcount){ updateBasket(basketcount); } }); +function batchEdit(){ + var valCookie = readCookie(nameCookie); + var strCookie = nameParam + "=" + valCookie; + var loc = CGIBIN + "tools/batchedit.pl?" + strCookie; + window.opener.location = loc; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 0896075..ceab3cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -86,6 +86,13 @@ function placeHold () { [% IF ( verbose ) %]Brief Display[% ELSE %]More Details[% END %] + [% IF ( CAN_user_tools_batchedit ) %] +
  • + + Batch Edit + +
    • + [% END %]
  • Send diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tt new file mode 100644 index 0000000..31c84d1 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tt @@ -0,0 +1,257 @@ +[% INCLUDE 'doc-head-open.inc' %] +Koha › Tools › Batch record of modification +[% INCLUDE 'doc-head-close.inc' %] + +[% UNLESS ( modsuccess ) %] + + +[% END %] + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'cat-search.inc' %] + + + +
    +
    +
    +
    + +
    +[% IF ( moddone ) %] +
    All operations processed
    +[% END %] + +[% UNLESS ( bib_list ) %] +

    Batch record modification

    +
    +
    +
    + Use a file of biblionumbers +
      +
      2. +
    +
    +
    +
    +
    +

    Reminder: You can also add records to your cart and reach this page from the cart.

    +
    +
    +
    +
    + Or enter records one by one +
      +
    1. + + +
      2. +
    + +
    +[% ELSE %] +

    List of records:

    + + + + [% IF ( moddone ) %] [% END %] + + + [% FOREACH biblioinfo IN biblioinfos %] + + + + + [% IF ( moddone ) %] + [% IF ( biblioinfo.OK ) %] + + [% END %] + + [% END %] +
    BiblionumberTitleAuthorStatus
    [% biblioinfo.biblionumber %][% biblionumber = biblioinfo.biblionumber %] [% INCLUDE 'biblio-default-view.inc' %][% IF ( biblioinfo.title ) %][% biblioinfo.title |html %][% ELSE %]No title[% END %][% biblioinfo.author %] + [% ELSE %] + + [% END %] + [% IF ( biblioinfo.OK ) %]OK[% END %] + [% IF ( biblioinfo.No_Actions ) %]Nothing done[% END %] + [% IF ( biblioinfo.Actions_Failed ) %] + Some actions failed. List follow :
      [% FOREACH failed_action IN biblioinfo.failed_actions %]
    • [% failed_action.action %]
      • [% END %]
    + [% END %] +
    +[% END %] + +[% UNLESS ( moddone ) %] + + [% IF ( bib_list ) %] +
    +

    Modification rules:

    + + + + + + + + + + + + + + + + + + +
    FieldSubfieldActionCondition ValueValue 
    + + + + + + + + + + +
    + +
    (don't forget to click "Add" button on the right of the previous form before submitting)
    +
    +
    + [% ELSE %] +
    + + [% END %] +[% END %] +
    +
    +
    + [% INCLUDE 'tools-menu.inc' %] +
    +
    +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 10f1d6d..f218202 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -103,6 +103,11 @@
    Modify items in a batch
    [% END %] + [% IF ( CAN_user_tools_batchedit ) %] +
    Batch biblio modification
    +
    Modify biblios in a batch
    + [% END %] + [% IF ( CAN_user_tools_export_catalog ) %]
    Export bibliographic and holdings
    Export bibliographic and holdings data
    diff --git a/koha-tmpl/intranet-tmpl/prog/img/loading-small.gif b/koha-tmpl/intranet-tmpl/prog/img/loading-small.gif new file mode 100644 index 0000000000000000000000000000000000000000..79ea508aa675a47ce0a4a488ed91b7467ab8a4b0 GIT binary patch literal 1652 zcmZ9MYfMvT9LA3nI&Ot>v4dKm<&@rgETz{YTj+%zTBNdCCMX@3*;+tUgffv4Md?Nj zAQe#rLB~x%iNF{N8wTdrC@3f@Dk?56wpy(=o2{&@%xcFmj#EA`D!tfPG>0ud)53)@)`=QM9Bi#Vmk=c@Fe1hoban9;VD8eoNEK) z#FcU>odI)b(^OGHSPDA~meAs^%OU1ZO4&}$IKTtdY}nH5VJKA)RjprB^ZLKYG*_AP z0<2!nsVioY!@cK;ApQJ8{=%aS<^6>A)TSbYh==G;9Xe3KW5&R|aEQfV2!wB zdQQJThMzBmsPxZKjsGL!0auimutj7Spf2H*GZxxFowEA7Y$fa+mX+v}C3dhe9to+~ z3W)C4sOe5-gyq%;h!Ux(Gjkt<45?HhAp))pCF%r;tbo{TPEm}I!eVo`kuYc;IKcfK zDgI6fYCe(oW`LYq^h@*U4dPwm){29?Bc$q{ehKJ{k8DrzW6V})6;xH?2oqe`pZ>Lrq-rvvJiB2l>{>Z1{_X@ z)xOR`tz3YyAxuPkY}<%fzzMZ-YsBQJpz-G1a`V88GE0yB@IZ2>xoPZefn#a8om1+i z^}gH2`xDC0ucrGZUn(^BlQaHWnwMQMg){tw3?Dx!oq*@Kgu)SKUoSWS%QNDu1fDEo zV1U~2$u=Mca6!|1+sq*!)*be%(_Bg%QW#j?Rbw|65_0a%c33--EPc9_<{owD-Wt2} za1wGuClofFH}kKJKKu1lDI3GsgNMB7uuv<)2EYLxaELempnEmJE!CfM;KY^P(Mr`e zB7i#iu9>=_*%jr5m5RqlGTY<>s+i_7!l2RVy=47$V&@4YnyeqM%;=iLsaT5-`G&jk z?rG^as$UcCib!yXA50_akMP{i2KyEUagQK}Vd@^_WXui>_P<&limI>N?Mt+DB`&Si zJgktDviypbiSZ7uv8=v_U;8XK@%P&u_6qs(WE8Cq*ZOEAkIPxL!$s*J50Mbwhr@zk z7FDDY_#dE>4%05Ej={`OxfI^P!k`x7(A17b8Dd)t%T4#H%A2cPl@Hv9$oY8e5^9;zz;{+YYy4=(bAdMv#kETy+ zc3l|vIdqHCzOZrL+Msd4fbJQi6sTpT#!3lfh|w*GP8FaFpg{k!c!e-b0JCMlzJCFD Ci6N~3 literal 0 HcmV?d00001 diff --git a/tools/batchedit.pl b/tools/batchedit.pl new file mode 100755 index 0000000..73609b9 --- /dev/null +++ b/tools/batchedit.pl @@ -0,0 +1,221 @@ +#!/usr/bin/perl + + +# Copyright 2010 SARL BibLibre +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA + +use CGI; +use strict; +use C4::Output; +use C4::Auth; +use C4::Branch; +use C4::Koha; +use C4::Biblio; +use C4::Context; +use C4::Debug; +use JSON; + +my $input = new CGI; +my $dbh = C4::Context->dbh; + +my $filefh = $input->param('uploadfile'); +my $recordslist = $input->param('recordslist'); +my $bib_list = $input->param('bib_list'); +my @biblionumbers; + +#retrieve the list of biblionumber, from a file, a list entered manually or the basket +if ($filefh) { + while ( my $biblionumber = <$filefh> ) { + $biblionumber =~ s/[\r\n]*$//g; + push @biblionumbers, $biblionumber if $biblionumber; + } +} elsif ($recordslist) { + push @biblionumbers, split( /\s\n/, $recordslist ); +} elsif ($bib_list) { + push @biblionumbers, split('/', $bib_list); +} + +my $op = $input->param('op'); +my ($template, $loggedinuser, $cookie); + +my $frameworkcode=""; +my $tagslib = &GetMarcStructure(1,$frameworkcode); +my %report_actions; + +# if this script is called by ajax, buid an ajax/xml answer +if($input->param('field') and not defined $op){ + ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "acqui/ajax.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => "batchedit" }, + }); + + + my $tag = $input->param('field'); + my $subfield = $input->param('subfield'); + + if($input->param('subfield')){ + my $branches = GetBranchesLoop(); + + my @authorised_values; + if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { + if ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "branches" ) { + foreach my $thisbranch (@$branches) { + push @authorised_values, { + code => $thisbranch->{value}, + value => $thisbranch->{branchname}, + }; + # $value = $thisbranch->{value} if $thisbranch->{selected}; + } + }elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { + my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description"); + $sth->execute(); + while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) { + push @authorised_values, { + code => $itemtype, + value => $description, + }; + } + + }else { + # Getting the fields where the item location is + my ($location_field, $location_subfield) = GetMarcFromKohaField('items.location', $frameworkcode); + + # Getting the name of the authorised values' category for item location + my $item_location_category = $tagslib->{$location_field}->{$location_subfield}->{'authorised_value'}; + # Are we dealing with item location ? + my $item_location = ($tagslib->{$tag}->{$subfield}->{authorised_value} eq $item_location_category) ? 1 : 0; + + # If so, we sort by authorised_value, else by libelle + my $orderby = $item_location ? 'authorised_value' : 'lib'; + + my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY $orderby"); + + $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value}); + + + while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { + push @authorised_values, { + code => $value, + value => ($item_location) ? $value . " - " . $lib : $lib, + }; + + } + } + } + $template->param('return' => to_json(\@authorised_values)); + }else{ + my @modifiablesubf; + + foreach my $subfield (sort keys %{$tagslib->{$tag}}) { + next if subfield_is_koha_internal_p($subfield); + next if $subfield eq "@"; + next if ($tagslib->{$tag}->{$subfield}->{'tab'} eq "10"); + my %subfield_data; + $subfield_data{subfield} = $subfield; + push @modifiablesubf, \%subfield_data; + } + $template->param('return' => to_json(\@modifiablesubf)); + } + + + output_html_with_http_headers $input, $cookie, $template->output; + exit; +}else{ +# standard call (via web browser) + ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "tools/batchedit.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => "batchedit" }, + }); + + $template->param( bib_list => join('/', @biblionumbers)); + # if no $op, just display the form + if(!defined $op) { + my @modifiablefields; + + foreach my $tag (sort keys %{$tagslib}) { + my %subfield_data; + foreach my $subfield (sort keys %{$tagslib->{$tag}}) { + next if $subfield_data{tag}; + next if subfield_is_koha_internal_p($subfield); + next if ($tagslib->{$tag}->{$subfield}->{'tab'} eq "10"); + + $subfield_data{tag} = $tag; + + push @modifiablefields, \%subfield_data; + } + } + $template->param(marcfields => \@modifiablefields, + ); + + }else{ + my @fields = $input->param('field'); + my @subfields = $input->param('subfield'); + my @actions = $input->param('action'); + my @condvals = $input->param('condval'); + my @nocondvals = $input->param('nocondval'); + my @repvals = $input->param('repval'); + foreach my $biblionumber ( @biblionumbers ){ + my $record = GetMarcBiblio($biblionumber); + my ($count, $biblio) = GetBiblio($biblionumber); + my @failed_actions; + for(my $i = 0 ; $i < scalar(@fields) ; $i++ ){ + my $field = $fields[$i]; + my $subfield = $subfields[$i]; + my $action = $actions[$i]; + my $condval = $condvals[$i]; + my $nocond = $nocondvals[$i]; + my $repval = $repvals[$i]; + my ($result,$record) = BatchModField($record, $field, $subfield, $action, $condval, $nocond, $repval); + push @failed_actions, {action=>"$field $subfield $action ".($nocond eq "true"?"all":$condval)." $repval"} if ($result<=0); + } + if (@failed_actions == scalar(@fields)){ + $report_actions{$biblionumber}->{status}="No_Actions"; + } + elsif (@failed_actions>0 and @failed_actions < scalar(@fields)){ + $report_actions{$biblionumber}->{status}="Actions_Failed"; + $report_actions{$biblionumber}->{failed_actions}=\@failed_actions; + } + elsif (@failed_actions == 0){ + $report_actions{$biblionumber}->{status}="OK"; + } + ModBiblio($record, $biblionumber, $biblio->{frameworkcode}); + } + $template->param('moddone' => 1); + } + +} + +my @biblioinfos; + +for my $biblionumber (@biblionumbers){ + my ($count,$biblio) = GetBiblio($biblionumber); + if (defined $op){ + $biblio->{$report_actions{$biblionumber}->{status}}=1; + $biblio->{failed_actions}=$report_actions{$biblionumber}->{failed_actions}; + } + push @biblioinfos, $biblio; +} + +$template->param(biblioinfos => \@biblioinfos); +output_html_with_http_headers $input, $cookie, $template->output; +exit; -- 1.7.5.4