Attachment #18433 for bug #8064

View | Details | Raw Unified | Return to bug 8064
Collapse All | Expand All




#!/usr/bin/perl


# Copyright 2009 BibLibre
# Parts Copyright Catalyst IT 2011
#

# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use CGI;
use C4::Output;
use C4::Auth;

use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/;

my $input = new CGI;
my @biblionumbers = $input->param('biblionumber');
my $merge = $input->param('merge');

my @errors;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "cataloguing/merge.tt",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,

if ($merge) {

    my $dbh = C4::Context->dbh;
    my $sth;

    # Creating a new record from the html code
    my $record = TransformHtmlToMarc( $input );
    my $ref_biblionumber = $input->param('ref_biblionumber');
    @biblionumbers = grep { $_ != $ref_biblionumber } @biblionumbers;

    # prepare report
    my @report_records;
    my $report_fields_str = $input->param('report_fields');
    $report_fields_str ||= C4::Context->preference('MergeReportFields');
    my @report_fields;
    foreach my $field_str (split /,/, $report_fields_str) {
        if ($field_str =~ /(\d{3})([0-9a-z]*)/) {
            my ($field, $subfields) = ($1, $2);
            push @report_fields, {
                tag => $field,
                subfields => [ split //, $subfields ]
            }
        }
    }

    # Rewriting the leader
    $record->leader(GetMarcBiblio($ref_biblionumber)->leader());

    my $frameworkcode = $input->param('frameworkcode');
    my @notmoveditems;

    # Modifying the reference record
    ModBiblio($record, $ref_biblionumber, $frameworkcode);

    # Moving items from the other record to the reference record
    foreach my $biblionumber (@biblionumbers) {
        my $itemnumbers = get_itemnumbers_of($biblionumber);
        foreach my $itemnumber (@{ $itemnumbers->{$biblionumber} }) {
            my $res = MoveItemFromBiblio($itemnumber, $biblionumber, $ref_biblionumber);
            if (not defined $res) {
                push @notmoveditems, $itemnumber;
            }
        }
    }
    }
    # If some items could not be moved :
    if (scalar(@notmoveditems) > 0) {
        my $itemlist = join(' ',@notmoveditems);
        push @errors, { code => "CANNOT_MOVE", value => $itemlist };
    }

    my $sth_subscription = $dbh->prepare("
        UPDATE subscription SET biblionumber = ? WHERE biblionumber = ?
    ");
    my $sth_subscriptionhistory = $dbh->prepare("
        UPDATE subscriptionhistory SET biblionumber = ? WHERE biblionumber = ?
    ");
    my $sth_serial = $dbh->prepare("
        UPDATE serial SET biblionumber = ? WHERE biblionumber = ?
    ");

    my $report_header = {};
    foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {
        # build report
        my $marcrecord = GetMarcBiblio($biblionumber);
        my %report_record = (
            biblionumber => $biblionumber,
            fields => {},
        );
        foreach my $field (@report_fields) {
            my @marcfields = $marcrecord->field($field->{tag});
            foreach my $marcfield (@marcfields) {
                my $tag = $marcfield->tag();
                my %subfields;
                if (scalar @{$field->{subfields}}) {
                    foreach my $subfield (@{$field->{subfields}}) {
                        my @values = $marcfield->subfield($subfield);
                        $report_header->{ $tag . $subfield } = 1;
                        push @{ $report_record{fields}->{$tag . $subfield} }, @values;
                    }
                } elsif ($field->{tag} gt '009') {
                    my @marcsubfields = $marcfield->subfields();
                    foreach my $marcsubfield (@marcsubfields) {
                        my ($code, $value) = @$marcsubfield;
                        $report_header->{ $tag . $code } = 1;
                        push @{ $report_record{fields}->{ $tag . $code } }, $value;
                    }
                } else {
                    $report_header->{ $tag . '@' } = 1;
                    push @{ $report_record{fields}->{ $tag .'@' } }, $marcfield->data();
                }
            }
        }
        push @report_records, \%report_record;
    }

    foreach my $biblionumber (@biblionumbers) {
        # Moving subscriptions from the other record to the reference record
        my $subcount = CountSubscriptionFromBiblionumber($biblionumber);
        if ($subcount > 0) {
            $sth_subscription->execute($ref_biblionumber, $biblionumber);
            $sth_subscriptionhistory->execute($ref_biblionumber, $biblionumber);
        }

        # Moving serials
        $sth_serial->execute($ref_biblionumber, $biblionumber);

        # Moving orders (orders linked to items of frombiblio have already been moved by MoveItemFromBiblio)
        my @allorders = GetOrdersByBiblionumber($frombiblio);
        my @tobiblioitem = GetBiblioItemByBiblioNumber ($tobiblio);
        my $tobiblioitem_biblioitemnumber = $tobiblioitem [0]-> {biblioitemnumber };
        foreach my $myorder (@allorders) {
            $myorder->{'biblionumber'} = $tobiblio;
            ModOrder ($myorder);
        # TODO : add error control (in ModOrder?)
        }

        # Deleting the other records
        if (scalar(@errors) == 0) {
            # Move holds
            MergeHolds($dbh, $ref_biblionumber, $biblionumber);
            my $error = DelBiblio($biblionumber);
            push @errors, $error if ($error);
        }
    }

    # Parameters
    $template->param(
        result => 1,
        report_records => \@report_records,
        report_header => $report_header,
        ref_biblionumber => $input->param('ref_biblionumber')
    );

#-------------------------
# Show records to merge
#-------------------------
} else {
    my $ref_biblionumber = $input->param('ref_biblionumber');

    if ($ref_biblionumber) {
        my $framework = $input->param('frameworkcode');
        $framework //= GetFrameworkCode($ref_biblionumber);

        # Getting MARC Structure
        my $tagslib = GetMarcStructure(1, $framework);

        # Creating a loop for display
        my @records;
        foreach my $biblionumber (@biblionumbers) {
            my $marcrecord = GetMarcBiblio($biblionumber);
            my $frameworkcode = GetFrameworkCode($biblionumber);
            my $record = {
                biblionumber => $biblionumber,
                record => $marcrecord,
                frameworkcode => $frameworkcode,
                display => _createMarcHash($marcrecord, $tagslib),
            };
            if ($ref_biblionumber and $ref_biblionumber == $biblionumber) {
                $record->{reference} = 1;
                $template->param(ref_record => $record);
                unshift @records, $record;
            if ($frameworkcode1 ne $frameworkcode2) {
                $framework = $input->param('frameworkcode')
                  or push @errors, "Famework not selected.";
            } else {
                push @records, $record;
            }
        }

        my ($biblionumbertag) = GetMarcFromKohaField('biblio.biblionumber');
            my $tagslib = GetMarcStructure(1, $framework);

            my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];

            # Creating a loop for display
            my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);
            my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);

        # Parameters
        $template->param(
            ref_biblionumber => $ref_biblionumber,
            records => \@records,
            framework => $framework,
            biblionumbertag => $biblionumbertag,
            MergeReportFields => C4::Context->preference('MergeReportFields'),
        );
    }
    else {
        my @records;
        foreach my $biblionumber (@biblionumbers) {
            my $frameworkcode = GetFrameworkCode($biblionumber);
            my $record = {
                biblionumber => $biblionumber,
                data => GetBiblioData($biblionumber),
                frameworkcode => $frameworkcode,
            };
            push @records, $record;
        }
        else {

        # Ask the user to choose which record will be the kept
        $template->param(
            choosereference => 1,
            records => \@records,
        );

        my $frameworks = getframeworks;
        my @frameworkselect;
        foreach my $thisframeworkcode ( keys %$frameworks ) {
            my %row = (
                value         => $thisframeworkcode,
                frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
            );
            push @frameworkselect, \%row;
                my $frameworks = getframeworks;
                my @frameworkselect;
                foreach my $thisframeworkcode ( keys %$frameworks ) {
                    my %row = (
                        value         => $thisframeworkcode,
                        frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
                    );
                    if ($frameworkcode1 eq $thisframeworkcode){
                        $row{'selected'} = 1;
                        }
                    push @frameworkselect, \%row;
                }
                $template->param(
                    frameworkselect => \@frameworkselect,
                    frameworkcode1 => $frameworkcode1,
                    frameworkcode2 => $frameworkcode2,
                );
            }
        }
        $template->param(
            frameworkselect => \@frameworkselect,
        );
    }
}


# Functions
# ------------------------
sub _createMarcHash {
    my $record = shift;
    my $tagslib = shift;
    my $hash = {};
    my @array;
    my @fields = $record->fields();


    foreach my $field (@fields) {
        my $fieldtag = $field->tag();
        if ($fieldtag < 10) {
            if ($tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0) {
                push @{ $hash->{fields} }, {
            field => [
                    {
                    tag => $fieldtag,
                    key => createKey(),
                    value => $field->data(),
                    }
                ]
                };
            }
        } else {
            if ($fieldtag ne '995' and defined $tagslib->{$fieldtag}) {
                my @subfields = $field->subfields();
                my @subfield_array;
                foreach my $subfield (@subfields) {
                    if (defined $tagslib->{$fieldtag}->{@$subfield[0]}->{tab}
                    and $tagslib->{$fieldtag}->{@$subfield[0]} ne ''
                    and $tagslib->{$fieldtag}->{@$subfield[0]}->{tab} >= 0) {
                        push @subfield_array, {
                            subtag => @$subfield[0],
                            subkey => createKey(),
                            value => @$subfield[1],
                        };
                    }
                }

                if (defined $tagslib->{$fieldtag} and $fieldtag ne '995') {
                    push @{ $hash->{fields} }, {
                        tag => $fieldtag,
                        key => createKey(),
                        indicator1 => $field->indicator(1),
                        indicator2 => $field->indicator(2),
                        subfield   => [@subfield_array],
                    };
                    subfield   => [@subfield_array],
                }
            }
            };
        }

    }
    }
    return $hash;

}


Lines 427-429 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
427	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');	427	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');
428	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo');	428	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo');
429	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');	429	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
		430	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('MergeReportFields','','Displayed fields for deleted MARC records after merge',NULL,'Free');




}





$DBversion = "3.13.00.XXX";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
    $dbh->do("
        INSERT INTO systempreferences (variable,value,explanation,options,type)
        VALUES('MergeReportFields','','Displayed fields for deleted MARC records after merge',NULL,'Free');
    ");
    print "Upgrade to $DBversion done (Add system preference 'MergeReportFields')\n";
    SetVersion($DBversion);
}


=head1 FUNCTIONS

=head2 TableExists($table)




            - pref: NotesBlacklist
              class: multi
            - note fields in title notes separator (OPAC record details) and in the description separator (Staff client record details). The fields should appear separated with commas and according with the Koha MARC format (eg 3.. for UNIMARC, 5.. for MARC21)
        -
            - pref: MergeReportFields
            - "fields to display for deleted records after merge"
            - "<br />example: '001,245ab,600'"
            - "displays:"
            - "<ul>"
            - "<li>value of 001</li>"
            - "<li>subfields a and b of fields 245</li>"
            - "<li>all subfields of fields 600</li>"




<script type="text/javascript">
//<![CDATA[

[% UNLESS (result) %]
  [% IF (choosereference) %]
    function changeFramework(fw) {
        $("#frameworkcode").val(fw);
    }
  [% ELSE %]
    function check_mandatory () {
        var missing = {
            'fields': [],
            'subfields': []
        };
        for (tag in tagslib) {
            if (tag == '000' || tag == '001')
                continue;
            if (tagslib[tag].mandatory == 1) {
                if ($("#resultul span.field:contains("+ tag +")").length == 0) {
                    missing.fields.push(tag);
                }
            }
            for (subfieldcode in tagslib[tag]) {
                if (subfieldcode == 'lib' || subfieldcode == 'mandatory'
                || subfieldcode == 'repeatable' || subfieldcode == 'tab') {
                    continue;
                }
                if (tagslib[tag][subfieldcode].mandatory == 1 && tagslib[tag][subfieldcode].tab >= 0) {
                    var fields = $("#resultul span.field:contains("+ tag +")");
                    $(fields).each(function() {
                        var subfields = $(this).parent().find("span.subfield:contains("+ subfieldcode +")");
                        if (subfields.length == 0) {
                            missing.subfields.push( {
                                'tag': tag,
                                'subfieldcode': subfieldcode
                            } );
                        }
                    });
                }
            }
        }

        return missing;
    }

    // When submiting the form
    function mergeformsubmit() {
        var missing = check_mandatory();
        var alert_msg = '';
        var error = 0;
        if (missing.fields.length > 0) {
            alert_msg += _("Following required fields are missing:") + "\n";
            for (var i in missing.fields) {
                alert_msg += "\t- " + missing.fields[i] + "\n";
                error ++;
            }
            alert_msg += "\n";
        }
        if (missing.subfields.length > 0) {
            alert_msg += _("Following required subfields are missing:") + "\n";
            for (var i in missing.subfields) {
                var subfield = missing.subfields[i];
                alert_msg += "\t- " + subfield.tag + "$" + subfield.subfieldcode + "\n";
                error ++;
            }
        }

        if (error != 0) {
            alert(alert_msg);
            return false;
        } else {
            $("#tabs").remove();
        }
    }

    $(document).ready(function(){
        // Creating tabs
        $("#tabs").tabs();

        // Getting marc structure via ajax
        tagslib = [];
        $.getJSON("/cgi-bin/koha/cataloguing/merge_ajax.pl", {frameworkcode : "[% framework %]" }, function(json) {
            tagslib = json;
        });


        // Toggle a field / subfield
        function toggleField(pField) {
            // Getting the key of the clicked checkbox
            var ckid   = $(pField).attr("id");
            var tab    = ckid.split('_');
            var source = tab[1]; // From which record the click came from
            var key    = tab[2];
            var type   = $(pField).attr("class");

            // Getting field/subfield
            var field;
            var subfield;
            if (type == "subfieldpick") {
                field = $(pField).parent().parent().parent().find("span.field").text();
                subfield = $(pField).parent().find("span.subfield").text();
            } else {
                field = $(pField).parent().find("span.field").text();
            }

            // If the field has just been checked
            if (pField.checked) {
                // We check for repeatability
                var canbeadded = true;
                if (type == "subfieldpick") {
                    var repeatable = 1;
                    var alreadyexists = 0;
                    if (tagslib[field] && tagslib[field][subfield]) {
                        // Note : we can't use the dot notation here (tagslib.021)
                        // because the key is a number
                        repeatable = tagslib[field][subfield].repeatable;
                        if (repeatable == 0) {
                            canbeadded = false;
                            $("#resultul span.field:contains(" + field + ")")
                            .each(function() {
                                if ($(this).parent()
                                    .find("span.subfield:contains(" + subfield + ")")
                                    .length == 0)
                                {
                                    canbeadded = true;
                                }
                            });
                        }
                    }
                } else {
                    if (tagslib[field]) {
                        repeatable = tagslib[field].repeatable;
                        alreadyexists = $("#resultul span.field:contains(" + field + ")");
                        if (repeatable == 0 && alreadyexists.length != 0) {
                            canbeadded = false;
                        }
                    }
                }
                // If the field is not repeatable, we check if it already exists in the result table
                if (canbeadded == false) {
                    var field_or_subfield = (type == "subfieldpick") ? _("subfield") : _("field");
                    alert(_("The " + field_or_subfield + " is non-repeatable and already exists in the destination record. Therefore, you cannot add it."));
                    pField.checked = 0;
                } else {
                    // Cloning the field or subfield we picked
                    var clone = $(pField).parent().clone();

                    // Removing the checkboxes from it
                    $(clone).find("input.subfieldpick, input.fieldpick").each(function() {
                        $(this).remove();
                    });
                    $(clone).find('label').each(function() {
                        $(this).replaceWith($(this).contents());
                    });

                    // If we are a subfield
                    if (type == "subfieldpick") {
                        // then we need to find who is our parent field...
                        fieldkey = $(pField).parent().parent().parent().attr("id");

                        // Find where to add the subfield

                        // First, check if the field is not already in the destination record
                        if ($("#resultul li#" + fieldkey).length > 0) { 
                            // If so, we add our field to it
                            $("#resultul li#" + fieldkey + " ul").append(clone);
                        } else {
                            // If not, we add the subfield to the first matching field
                            var where = 0;
                            $("#resultul li span.field").each(function() {
                                if (where == 0 && $(this).text() == field) {
                                    where = this;
                                }
                            });

                            // If there is no matching field in the destination record
                            if (where == 0) {
                                // TODO:
                                // We select the whole field and removing non-selected subfields, instead of...

                                // Alerting the user
                                alert(_("This subfield cannot be added: there is no " + field + " field in the destination record."));
                                pField.checked = false;

                            } else {
                                $(where).nextAll("ul").append(clone);
                            }
                        }
                    } else {
                        // If we are a field
                        var where = 0;
                        // Find where to add the field
                        $("#resultul li span.field").each(function() {
                            if (where == 0 && $(this).text() > field) {
                                where = this;
                            }
                        });
                        if (where) {
                            $(where).parent().before(clone);
                        } else {
                            $("#resultul").prepend(clone);
                        }
                    }
                }
            } else {
                // Else, we remove it from the results tab
                $("ul#resultul li#k" + key).remove();
            }
        }

        // Check all checkboxes in first tab, and uncheck all others to avoid
        // inconsistencies from a page refresh.
        $('#tabs div#tabrecord[% ref_biblionumber %]').find('input[type="checkbox"]').attr('checked', true);
        $('#tabs > div:not("#tabrecord[% ref_biblionumber %]")').find('input[type="checkbox"]').removeAttr('checked');

        // When a field is checked / unchecked 
        $('input.fieldpick').click(function() {
            toggleField(this);
            // (un)check all subfields
            var ischecked = this.checked;
            $(this).parent().find("input.subfieldpick").each(function() {
                this.checked = ischecked;
            });
        });

        // When a field or subfield is checked / unchecked
        $("input.subfieldpick").click(function() {
            toggleField(this);
        });

    // When a field or subfield is checked / unchecked
    $("input.subfieldpick").click(function() {
	toggleField(this);
    });
  [% END %]
[% END %]

function changeFramework(fw) {
    $("#Frameworks").val(fw);
}

//]]>
</script>


<h1>Merging records</h1>
[% IF ( result ) %]
    [% IF ( errors.size ) %]
        [% FOREACH error IN errors %]
            <div class="dialog alert">
	    <div class="dialog alert">

                [% IF error.code == 'CANNOT_MOVE' %]
                    The following items could not be moved from the old record to the new one: [% error.value %]
                [% ELSE %]
                    [% error %]
                [% END %]
                <br />
                Therefore, the record to be merged has not been deleted.
            </div>
        [% END %]

    [% ELSE %]
        <p>The merge was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% ref_biblionumber %]">Click here to see the merged record.</a></p>
        <h3>Report</h3>
        <table>
            <thead>
                <tr>
                    <th>Biblionumber</th>
                    [% FOREACH key IN report_header.keys.sort %]
                        [% tag = key.substr(0, 3) %]
                        [% code = key.substr(3, 1) %]
                        [% IF code == '@' %]
                            [% header = tag %]
                        [% ELSE %]
                            [% header = tag _ '$' _ code %]
                        [% END %]
                        <th>[% header %]</th>
                    [% END %]
                </tr>
            </thead>
            <tbody>
                [% FOREACH record IN report_records %]
                    <tr>
                        <td>
                            [% record.biblionumber %]
                            [% IF loop.first %]
                                (record kept)
                            [% END %]
                        </td>
                        [% FOREACH key IN report_header.keys.sort %]
                            <td>
                                [% values = record.fields.$key %]
                                [% IF values %]
                                    [% FOREACH value IN record.fields.$key %]
                                        [% value %]
                                        [% UNLESS loop.last %]<br />[% END %]
                                    [% END %]
                                [% END %]
                            </td>
                        [% END %]
                    </tr>
                [% END %]
            </tbody>
        </table>
    [% END %]

[% ELSE %]

<p>Please choose which record will be the reference for the merge. The record chosen as reference will be kept, and the other will be deleted.</p>
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">
    <fieldset class="rows">
    <legend>Merge reference</legend>
    <ol>
        [% FOREACH record IN records %]
            <li class="radio">
                [% IF loop.first %]
                    <input type="radio" value="[% record.biblionumber %]" checked="checked" id="ref_biblionumber[% record.biblionumber %]" name="ref_biblionumber" onclick="changeFramework('[% record.frameworkcode %]')" />
                [% ELSE %]
                    <input type="radio" value="[% record.biblionumber %]" id="ref_biblionumber[% record.biblionumber %]" name="ref_biblionumber" onclick="changeFramework('[% record.frameworkcode %]')" />
                [% END %]
                <label for="ref_biblionumber[% record.biblionumber %]">
                    [% record.data.title %]
                    [% FOREACH subtitle IN record.subtitles %]
                        [% subtitle.subfield %]
                    [% END %]
                    (<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">[% record.biblionumber %]</a>)
                </label>
            </li>
        [% END %]

        [% IF frameworkselect.size %]
            <li>
                <label for="frameworkcode">Using framework:</label>
                <select name="frameworkcode" id="frameworkcode">
                    <option value="">Default</option>
                    [% FOREACH frameworkcode IN frameworkselect %]
                        [% IF ( frameworkcode.selected ) %]
                            <option value="[% frameworkcode.value %]" selected="selected">
                        [% ELSE %]
                            <option value="[% frameworkcode.value %]">
                        [% END %]
                            [% frameworkcode.frameworktext %]
                        </option>
                    [% END %]
                </select>
            </li>
        [% END %]
    </ol>

    [% FOREACH record IN records %]
        <input type="hidden" name="biblionumber" value="[% record.biblionumber %]" />
    [% END %]
    <fieldset class="action">
        <input type="submit" value="Next" />
    </fieldset>
	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />
	<fieldset class="action"><input type="submit" value="Next" /></fieldset>
    </fieldset>
</form>
[% ELSE %]
[% IF ( errors.size ) %]
    <div class="dialog alert">
        [% FOREACH error IN errors %]
            <p>[% error %]</p>
        [% END %]
                    Number of records provided for merging: [% error.value %]. Currently only 2 records can be merged at a time.
                [% ELSE %]
                    [% error %]
                [% END %]

            </p>
	[% END %]
    </div>
[% ELSE %]
<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()">

<div id="tabs" class="toptabs">
<h2>Source records</h2>
    <ul>
        [% FOREACH record IN records %]
            <li>
                <a href="#tabrecord[% record.biblionumber %]">
                    [% record.biblionumber %]
                    [% IF record.reference %](ref)[% END %]
                </a>
            </li>
        [% END %]
    </ul>
    [% IF ( records.size ) %]
        [% FOREACH record IN records %]
            <div id="tabrecord[% record.biblionumber %]">
                <div class="record">
                    <ul id="ulrecord[% record.biblionumber %]">
                        [% FOREACH field IN record.display.fields %]
                          [% IF field.tag != biblionumbertag %]
                            <li id="k[% field.key %]">
                                [% IF (record.reference) %]
                                    <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% record.biblionumber %]_[% field.key %]" />
                                [% ELSE %]
                                    <input type="checkbox" class="fieldpick" id="rec_[% record.biblionumber %]_[% field.key %]" />
                                [% END %]
                                <label for="rec_[% record.biblionumber %]_[% field.key %]"><span class="field">[% field.tag %]</span></label>

                                <input type="hidden" name="tag_[% field.tag %]_indicator1_[% field.key %]" value="[% field.indicator1 %]" />
                                <input type="hidden" name="tag_[% field.tag %]_indicator2_[% field.key %]" value="[% field.indicator2 %]" />
                                [% IF ( field.value ) %]
                                    / [% field.value %]
                                    <input type="hidden" name="tag_[% field.tag %]_code_00_[% field.key %]" value="00" />
                                    <input type="hidden" name="tag_[% field.tag %]_subfield_00_[% field.key %]" value="[% field.value %]" />
                                [% END %]

                                [% IF ( field.subfield.size ) %]
                                    <ul>
                                        [% FOREACH subfield IN field.subfield %]
                                            <li id="k[% subfield.subkey %]">
                                                [% IF (record.reference) %]
                                                    <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% record.biblionumber %]_[% subfield.subkey %]" />
                                                [% ELSE %]
                                                    <input type="checkbox" class="subfieldpick" id="rec_[% record.biblionumber %]_[% subfield.subkey %]" />
                                                [% END %]
                                                <label for="rec_[% record.biblionumber %]_[% subfield.subkey %]"><span class="subfield">[% subfield.subtag %]</span> / [% subfield.value %]</label>
                                                <input type="hidden" name="tag_[% field.tag %]_code_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.subtag %]" />
                                                <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% subfield.key %]_[% subfield.subkey %]" value="[% subfield.value |html%]" />
                                            </li>
                                        [% END %]
                                    </ul>
                                [% END %]
                            </li>
                          [% END %]
                        [% END %]
                    </ul>
                </div><!-- /div.record -->
            </div><!-- /div#tabrecordXXX -->
        [% END %]
    [% END %]

			<input type="hidden" name="tag_[% fiel.tag %]_indicator1_[% fiel.key %]" value="[% fiel.indicator1 %]" />
			<input type="hidden" name="tag_[% fiel.tag %]_indicator2_[% fiel.key %]" value="[% fiel.indicator2 %]" />
			[% IF ( fiel.value ) %] / [% fiel.value %]
			<input type="hidden" name="tag_[% fiel.tag %]_code_00_[% fiel.key %]" value="00" />
			<input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value |html%]" />
			[% END %]

			[% IF ( fiel.subfield ) %]
			    <ul>
				[% FOREACH subfiel IN fiel.subfield %]
				    <li id="k[% subfiel.subkey %]">
					<input type="checkbox" class="subfieldpick" id="rec_2_[% subfiel.subkey %]" />
					<span class="subfield">[% subfiel.subtag %]</span> / [% subfiel.value %]
				    <input type="hidden" name="tag_[% subfiel.tag %]_code_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.subtag %]" />
				    <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value |html%]" />
				    </li>
				[% END %]
			    </ul>
			[% END %]
		    [% END %]
		    </li>
		[% END %]
		</ul>
	    </div>
	    <!-- /div.record -->




	[% END %]
    </div><!-- /div#tabrecord2 -->
</div> <!-- // #tabs -->
</div>
<div class="yui-u">
<div id="result">
    <h2>Destination record</h2>
    <div style="border:1px solid #E8E8E8;padding:1em;margin-top:2em;">
        <ul id="resultul">
          [% FOREACH field IN ref_record.display.fields %]
            [% IF field.tag != biblionumbertag %]
              <li id="k[% field.key %]">
                <span class="field">[% field.tag %]</span>
                <input type="hidden" name="tag_[% field.tag %]_indicator1_[% field.key %]" value="[% field.indicator1 %]" />
                <input type="hidden" name="tag_[% field.tag %]_indicator2_[% field.key %]" value="[% field.indicator2 %]" />
                [% IF ( field.value ) %]
                  / [% field.value %]
                  <input type="hidden" name="tag_[% field.tag %]_code_00_[% field.key %]" value="00" />
                  <input type="hidden" name="tag_[% field.tag %]_subfield_00_[% field.key %]" value="[% field.value |html%]" />
                [% END %]

                [% IF ( field.subfield ) %]
                  <ul>
                    [% FOREACH subfield IN field.subfield %]
                      <li id="k[% subfield.subkey %]">
                        <span class="subfield">[% subfield.subtag %]</span> / [% subfield.value %]
                        <input type="hidden" name="tag_[% field.tag %]_code_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.subtag %]" />
                        <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.value |html%]" />
                      </li>
                    [% END %]
                  </ul>
                [% END %]
              </li>
            [% END %]
          [% END %]
        </ul>
</div>
</div> <!-- // #result -->
</div> <!-- .yui-u -->

<input type="hidden" name="ref_biblionumber" value="[% ref_biblionumber %]" />
[% FOREACH record IN records %]
    <input type="hidden" name="biblionumber" value="[% record.biblionumber %]" />
[% END %]
<input type="hidden" name="frameworkcode" value="[% framework %]" />

<fieldset class="action">
    <input type="submit" name="merge" value="Merge" />
    <label for="report_fields">Fields to display in report:</label>
    <input type="text" name="report_fields" id="report_fields" value="[% MergeReportFields %]" />
    <span class="hint">(Example: "001,245ab,600")
</fieldset>
</div>
</form>
[% END %]




     * This function checks if the adequate number of records are checked for merging
     */
    function MergeItems() {
        var checkboxes = $("input:checkbox:checked");
        if (checkboxes.length > 0) {
            var params = [];
            $(checkboxes).each(function() {
                params.push('biblionumber=' + $(this).val());
            });
            var url = '/cgi-bin/koha/cataloguing/merge.pl?' + params.join('&');
            location.href = url;
        } else {
            alert(_("You must select at least one record"));
        }
        return false;
    }

    /**
- 

Return to bug 8064

Lines 6984-6989 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+14 lines)
6984	}	6984	}
6985		6985
6986		6986
		6987
		6988
		6989
		6990	$DBversion = "3.13.00.XXX";
		6991	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
		6992	$dbh->do("
		6993	INSERT INTO systempreferences (variable,value,explanation,options,type)
		6994	VALUES('MergeReportFields','','Displayed fields for deleted MARC records after merge',NULL,'Free');
		6995	");
		6996	print "Upgrade to $DBversion done (Add system preference 'MergeReportFields')\n";
		6997	SetVersion($DBversion);
		6998	}
		6999
		7000
6987	=head1 FUNCTIONS	7001	=head1 FUNCTIONS
6988		7002
6989	=head2 TableExists($table)	7003	=head2 TableExists($table)

Lines 176-178 Cataloging: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (+9 lines)
176	- pref: NotesBlacklist	176	- pref: NotesBlacklist
177	class: multi	177	class: multi
178	- note fields in title notes separator (OPAC record details) and in the description separator (Staff client record details). The fields should appear separated with commas and according with the Koha MARC format (eg 3.. for UNIMARC, 5.. for MARC21)	178	- note fields in title notes separator (OPAC record details) and in the description separator (Staff client record details). The fields should appear separated with commas and according with the Koha MARC format (eg 3.. for UNIMARC, 5.. for MARC21)
		179	-
		180	- pref: MergeReportFields
		181	- "fields to display for deleted records after merge"
		182	- "<br />example: '001,245ab,600'"
		183	- "displays:"
		184	- "<ul>"
		185	- "<li>value of 001</li>"
		186	- "<li>subfields a and b of fields 245</li>"
		187	- "<li>all subfields of fields 600</li>"

Lines 1-6 Link Here

(-)a/cataloguing/merge.pl (-162 / +197 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2		2
3
4	# Copyright 2009 BibLibre	3	# Copyright 2009 BibLibre
5	# Parts Copyright Catalyst IT 2011	4	# Parts Copyright Catalyst IT 2011
6	#	5	#
Lines 19-26 Link Here
19	# with Koha; if not, write to the Free Software Foundation, Inc.,	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
20	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21		20
22	use strict;	21	use Modern::Perl;
23	#use warnings; FIXME - Bug 2505	22
24	use CGI;	23	use CGI;
25	use C4::Output;	24	use C4::Output;
26	use C4::Auth;	25	use C4::Auth;
Lines 32-45 use C4::Reserves qw/MergeHolds/; Link Here
32	use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/;	31	use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/;
33		32
34	my $input = new CGI;	33	my $input = new CGI;
35	my @biblionumber = $input->param('biblionumber');	34	my @biblionumbers = $input->param('biblionumber');
36	my $merge = $input->param('merge');	35	my $merge = $input->param('merge');
37		36
38	my @errors;	37	my @errors;
39		38
40	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	39	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
41	{	40	{
42	template_name => "cataloguing/merge.tmpl",	41	template_name => "cataloguing/merge.tt",
43	query => $input,	42	query => $input,
44	type => "intranet",	43	type => "intranet",
45	authnotrequired => 0,	44	authnotrequired => 0,
Lines 53-218 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
53	if ($merge) {	52	if ($merge) {
54		53
55	my $dbh = C4::Context->dbh;	54	my $dbh = C4::Context->dbh;
56	my $sth;
57		55
58	# Creating a new record from the html code	56	# Creating a new record from the html code
59	my $record = TransformHtmlToMarc( $input );	57	my $record = TransformHtmlToMarc( $input );
60	my $tobiblio = $input->param('biblio1');	58	my $ref_biblionumber = $input->param('ref_biblionumber');
61	my $frombiblio = $input->param('biblio2');	59	@biblionumbers = grep { $_ != $ref_biblionumber } @biblionumbers;
		60
		61	# prepare report
		62	my @report_records;
		63	my $report_fields_str = $input->param('report_fields');
		64	$report_fields_str \|\|= C4::Context->preference('MergeReportFields');
		65	my @report_fields;
		66	foreach my $field_str (split /,/, $report_fields_str) {
		67	if ($field_str =~ /(\d{3})([0-9a-z]*)/) {
		68	my ($field, $subfields) = ($1, $2);
		69	push @report_fields, {
		70	tag => $field,
		71	subfields => [ split //, $subfields ]
		72	}
		73	}
		74	}
62		75
63	# Rewriting the leader	76	# Rewriting the leader
64	$record->leader(GetMarcBiblio($tobiblio)->leader());	77	$record->leader(GetMarcBiblio($ref_biblionumber)->leader());
65		78
66	my $frameworkcode = $input->param('frameworkcode');	79	my $frameworkcode = $input->param('frameworkcode');
67	my @notmoveditems;	80	my @notmoveditems;
68		81
69	# Modifying the reference record	82	# Modifying the reference record
70	ModBiblio($record, $tobiblio, $frameworkcode);	83	ModBiblio($record, $ref_biblionumber, $frameworkcode);
71		84
72	# Moving items from the other record to the reference record	85	# Moving items from the other record to the reference record
73	# Also moving orders from the other record to the reference record, only if the order is linked to an item of the other record	86	foreach my $biblionumber (@biblionumbers) {
74	my $itemnumbers = get_itemnumbers_of($frombiblio);	87	my $itemnumbers = get_itemnumbers_of($biblionumber);
75	foreach my $itloop ($itemnumbers->{$frombiblio}) {	88	foreach my $itemnumber (@{ $itemnumbers->{$biblionumber} }) {
76	foreach my $itemnumber (@$itloop) {	89	my $res = MoveItemFromBiblio($itemnumber, $biblionumber, $ref_biblionumber);
77	my $res = MoveItemFromBiblio($itemnumber, $frombiblio, $tobiblio);	90	if (not defined $res) {
78	if (not defined $res) {	91	push @notmoveditems, $itemnumber;
79	push @notmoveditems, $itemnumber;	92	}
80	}	93	}
81	}	94	}
82	}
83	# If some items could not be moved :	95	# If some items could not be moved :
84	if (scalar(@notmoveditems) > 0) {	96	if (scalar(@notmoveditems) > 0) {
85	my $itemlist = join(' ',@notmoveditems);	97	my $itemlist = join(' ',@notmoveditems);
86	push @errors, { code => "CANNOT_MOVE", value => $itemlist };	98	push @errors, { code => "CANNOT_MOVE", value => $itemlist };
87	}	99	}
88		100
89	# Moving subscriptions from the other record to the reference record	101	my $sth_subscription = $dbh->prepare("
90	my $subcount = CountSubscriptionFromBiblionumber($frombiblio);	102	UPDATE subscription SET biblionumber = ? WHERE biblionumber = ?
91	if ($subcount > 0) {	103	");
92	$sth = $dbh->prepare("UPDATE subscription SET biblionumber = ? WHERE biblionumber = ?");	104	my $sth_subscriptionhistory = $dbh->prepare("
93	$sth->execute($tobiblio, $frombiblio);	105	UPDATE subscriptionhistory SET biblionumber = ? WHERE biblionumber = ?
94		106	");
95	$sth = $dbh->prepare("UPDATE subscriptionhistory SET biblionumber = ? WHERE biblionumber = ?");	107	my $sth_serial = $dbh->prepare("
96	$sth->execute($tobiblio, $frombiblio);	108	UPDATE serial SET biblionumber = ? WHERE biblionumber = ?
97		109	");
		110
		111	my $report_header = {};
		112	foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {
		113	# build report
		114	my $marcrecord = GetMarcBiblio($biblionumber);
		115	my %report_record = (
		116	biblionumber => $biblionumber,
		117	fields => {},
		118	);
		119	foreach my $field (@report_fields) {
		120	my @marcfields = $marcrecord->field($field->{tag});
		121	foreach my $marcfield (@marcfields) {
		122	my $tag = $marcfield->tag();
		123	my %subfields;
		124	if (scalar @{$field->{subfields}}) {
		125	foreach my $subfield (@{$field->{subfields}}) {
		126	my @values = $marcfield->subfield($subfield);
		127	$report_header->{ $tag . $subfield } = 1;
		128	push @{ $report_record{fields}->{$tag . $subfield} }, @values;
		129	}
		130	} elsif ($field->{tag} gt '009') {
		131	my @marcsubfields = $marcfield->subfields();
		132	foreach my $marcsubfield (@marcsubfields) {
		133	my ($code, $value) = @$marcsubfield;
		134	$report_header->{ $tag . $code } = 1;
		135	push @{ $report_record{fields}->{ $tag . $code } }, $value;
		136	}
		137	} else {
		138	$report_header->{ $tag . '@' } = 1;
		139	push @{ $report_record{fields}->{ $tag .'@' } }, $marcfield->data();
		140	}
		141	}
		142	}
		143	push @report_records, \%report_record;
98	}	144	}
99		145
100	# Moving serials	146	foreach my $biblionumber (@biblionumbers) {
101	$sth = $dbh->prepare("UPDATE serial SET biblionumber = ? WHERE biblionumber = ?");	147	# Moving subscriptions from the other record to the reference record
102	$sth->execute($tobiblio, $frombiblio);	148	my $subcount = CountSubscriptionFromBiblionumber($biblionumber);
103		149	if ($subcount > 0) {
104	# TODO : Moving reserves	150	$sth_subscription->execute($ref_biblionumber, $biblionumber);
		151	$sth_subscriptionhistory->execute($ref_biblionumber, $biblionumber);
		152	}
105		153
106	# Moving orders (orders linked to items of frombiblio have already been moved by MoveItemFromBiblio)	154	# Moving serials
107	my @allorders = GetOrdersByBiblionumber($frombiblio);	155	$sth_serial->execute($ref_biblionumber, $biblionumber);
108	my @tobiblioitem = GetBiblioItemByBiblioNumber ($tobiblio);	156
109	my $tobiblioitem_biblioitemnumber = $tobiblioitem [0]-> {biblioitemnumber };	157	# Moving orders (orders linked to items of frombiblio have already been moved by MoveItemFromBiblio)
110	foreach my $myorder (@allorders) {	158	my @allorders = GetOrdersByBiblionumber($frombiblio);
111	$myorder->{'biblionumber'} = $tobiblio;	159	my @tobiblioitem = GetBiblioItemByBiblioNumber ($tobiblio);
112	ModOrder ($myorder);	160	my $tobiblioitem_biblioitemnumber = $tobiblioitem [0]-> {biblioitemnumber };
113	# TODO : add error control (in ModOrder?)	161	foreach my $myorder (@allorders) {
114	}	162	$myorder->{'biblionumber'} = $tobiblio;
		163	ModOrder ($myorder);
		164	# TODO : add error control (in ModOrder?)
		165	}
115		166
116	# Deleting the other record	167	# Deleting the other records
117	if (scalar(@errors) == 0) {	168	if (scalar(@errors) == 0) {
118	# Move holds	169	# Move holds
119	MergeHolds($dbh,$tobiblio,$frombiblio);	170	MergeHolds($dbh, $ref_biblionumber, $biblionumber);
120	my $error = DelBiblio($frombiblio);	171	my $error = DelBiblio($biblionumber);
121	push @errors, $error if ($error);	172	push @errors, $error if ($error);
		173	}
122	}	174	}
123		175
124	# Parameters	176	# Parameters
125	$template->param(	177	$template->param(
126	result => 1,	178	result => 1,
127	biblio1 => $input->param('biblio1')	179	report_records => \@report_records,
		180	report_header => $report_header,
		181	ref_biblionumber => $input->param('ref_biblionumber')
128	);	182	);
129		183
130	#-------------------------	184	#-------------------------
131	# Show records to merge	185	# Show records to merge
132	#-------------------------	186	#-------------------------
133	} else {	187	} else {
134	my $mergereference = $input->param('mergereference');	188	my $ref_biblionumber = $input->param('ref_biblionumber');
135	my $biblionumber = $input->param('biblionumber');	189
136		190	if ($ref_biblionumber) {
137	if (scalar(@biblionumber) != 2) {	191	my $framework = $input->param('frameworkcode');
138	push @errors, { code => "WRONG_COUNT", value => scalar(@biblionumber) };	192	$framework //= GetFrameworkCode($ref_biblionumber);
139	}	193
140	else {	194	# Getting MARC Structure
141	my $data1 = GetBiblioData($biblionumber[0]);	195	my $tagslib = GetMarcStructure(1, $framework);
142	my $record1 = GetMarcBiblio($biblionumber[0]);	196
143		197	# Creating a loop for display
144	my $data2 = GetBiblioData($biblionumber[1]);	198	my @records;
145	my $record2 = GetMarcBiblio($biblionumber[1]);	199	foreach my $biblionumber (@biblionumbers) {
146		200	my $marcrecord = GetMarcBiblio($biblionumber);
147	# Checks if both records use the same framework	201	my $frameworkcode = GetFrameworkCode($biblionumber);
148	my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);	202	my $record = {
149	my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);	203	biblionumber => $biblionumber,
150		204	record => $marcrecord,
151		205	frameworkcode => $frameworkcode,
152	my $subtitle1 = GetRecordValue('subtitle', $record1, $frameworkcode1);	206	display => _createMarcHash($marcrecord, $tagslib),
153	my $subtitle2 = GetRecordValue('subtitle', $record2, $frameworkcode1);	207	};
154		208	if ($ref_biblionumber and $ref_biblionumber == $biblionumber) {
155	if ($mergereference) {	209	$record->{reference} = 1;
156		210	$template->param(ref_record => $record);
157	my $framework;	211	unshift @records, $record;
158	if ($frameworkcode1 ne $frameworkcode2) {
159	$framework = $input->param('frameworkcode')
160	or push @errors, "Famework not selected.";
161	} else {	212	} else {
162	$framework = $frameworkcode1;	213	push @records, $record;
163	}	214	}
		215	}
164		216
165	# Getting MARC Structure	217	my ($biblionumbertag) = GetMarcFromKohaField('biblio.biblionumber');
166	my $tagslib = GetMarcStructure(1, $framework);
167
168	my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];
169
170	# Creating a loop for display
171	my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);
172	my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);
173		218
174	# Parameters	219	# Parameters
175	$template->param(	220	$template->param(
176	biblio1 => $mergereference,	221	ref_biblionumber => $ref_biblionumber,
177	biblio2 => $notreference,	222	records => \@records,
178	mergereference => $mergereference,	223	framework => $framework,
179	record1 => @record1,	224	biblionumbertag => $biblionumbertag,
180	record2 => @record2,	225	MergeReportFields => C4::Context->preference('MergeReportFields'),
181	framework => $framework,	226	);
182	);	227	}
		228	else {
		229	my @records;
		230	foreach my $biblionumber (@biblionumbers) {
		231	my $frameworkcode = GetFrameworkCode($biblionumber);
		232	my $record = {
		233	biblionumber => $biblionumber,
		234	data => GetBiblioData($biblionumber),
		235	frameworkcode => $frameworkcode,
		236	};
		237	push @records, $record;
183	}	238	}
184	else {
185
186	# Ask the user to choose which record will be the kept	239	# Ask the user to choose which record will be the kept
187	$template->param(	240	$template->param(
188	choosereference => 1,	241	choosereference => 1,
189	biblio1 => $biblionumber[0],	242	records => \@records,
190	biblio2 => $biblionumber[1],	243	);
191	title1 => $data1->{'title'},	244
192	subtitle1 => $subtitle1,	245	my $frameworks = getframeworks;
193	title2 => $data2->{'title'},	246	my @frameworkselect;
194	subtitle2 => $subtitle2	247	foreach my $thisframeworkcode ( keys %$frameworks ) {
		248	my %row = (
		249	value => $thisframeworkcode,
		250	frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
195	);	251	);
196	if ($frameworkcode1 ne $frameworkcode2) {	252	push @frameworkselect, \%row;
197	my $frameworks = getframeworks;
198	my @frameworkselect;
199	foreach my $thisframeworkcode ( keys %$frameworks ) {
200	my %row = (
201	value => $thisframeworkcode,
202	frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
203	);
204	if ($frameworkcode1 eq $thisframeworkcode){
205	$row{'selected'} = 1;
206	}
207	push @frameworkselect, \%row;
208	}
209	$template->param(
210	frameworkselect => \@frameworkselect,
211	frameworkcode1 => $frameworkcode1,
212	frameworkcode2 => $frameworkcode2,
213	);
214	}
215	}	253	}
		254	$template->param(
		255	frameworkselect => \@frameworkselect,
		256	);
216	}	257	}
217	}	258	}
218		259
Lines 232-288 exit; Link Here
232	# Functions	273	# Functions
233	# ------------------------	274	# ------------------------
234	sub _createMarcHash {	275	sub _createMarcHash {
235	my $record = shift;	276	my $record = shift;
236	my $tagslib = shift;	277	my $tagslib = shift;
		278	my $hash = {};
237	my @array;	279	my @array;
238	my @fields = $record->fields();	280	my @fields = $record->fields();
239		281
240
241	foreach my $field (@fields) {	282	foreach my $field (@fields) {
242	my $fieldtag = $field->tag();	283	my $fieldtag = $field->tag();
243	if ($fieldtag < 10) {	284	if ($fieldtag < 10) {
244	if ($tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0) {	285	if ($tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0) {
245	push @array, {	286	push @{ $hash->{fields} }, {
246	field => [
247	{
248	tag => $fieldtag,	287	tag => $fieldtag,
249	key => createKey(),	288	key => createKey(),
250	value => $field->data(),	289	value => $field->data(),
251	}
252	]
253	};	290	};
254	}	291	}
255	} else {	292	} else {
256	my @subfields = $field->subfields();	293	if ($fieldtag ne '995' and defined $tagslib->{$fieldtag}) {
257	my @subfield_array;	294	my @subfields = $field->subfields();
258	foreach my $subfield (@subfields) {	295	my @subfield_array;
259	if ($tagslib->{$fieldtag}->{@$subfield[0]}->{'tab'} >= 0) {	296	foreach my $subfield (@subfields) {
260	push @subfield_array, {	297	if (defined $tagslib->{$fieldtag}->{@$subfield[0]}->{tab}
261	subtag => @$subfield[0],	298	and $tagslib->{$fieldtag}->{@$subfield[0]} ne ''
262	subkey => createKey(),	299	and $tagslib->{$fieldtag}->{@$subfield[0]}->{tab} >= 0) {
263	value => @$subfield[1],	300	push @subfield_array, {
264	};	301	subtag => @$subfield[0],
265	}	302	subkey => createKey(),
266		303	value => @$subfield[1],
267	}	304	};
		305	}
		306	}
268		307
269	if ($tagslib->{$fieldtag}->{'tab'} >= 0 && $fieldtag ne '995') {	308	if (defined $tagslib->{$fieldtag} and $fieldtag ne '995') {
270	push @array, {	309	push @{ $hash->{fields} }, {
271	field => [	310	tag => $fieldtag,
272	{	311	key => createKey(),
273	tag => $fieldtag,	312	indicator1 => $field->indicator(1),
274	key => createKey(),	313	indicator2 => $field->indicator(2),
275	indicator1 => $field->indicator(1),	314	subfield => [@subfield_array],
276	indicator2 => $field->indicator(2),	315	};
277	subfield => [@subfield_array],
278	}	316	}
279	]	317	}
280	};
281	}	318	}
282
283	}
284	}	319	}
285	return [@array];	320	return $hash;
286		321
287	}	322	}
288		323

Lines 36-49 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-9 / +12 lines)
36	* This function checks if the adequate number of records are checked for merging	36	* This function checks if the adequate number of records are checked for merging
37	*/	37	*/
38	function MergeItems() {	38	function MergeItems() {
39	var checkboxes = $("input:checkbox:checked");	39	var checkboxes = $("input:checkbox:checked");
40	var nbCheckbox = checkboxes.length;	40	if (checkboxes.length > 0) {
41	if (nbCheckbox != 2) {	41	var params = [];
42	alert(_("Two records must be selected for merging."));	42	$(checkboxes).each(function() {
43	} else {	43	params.push('biblionumber=' + $(this).val());
44	location.href='/cgi-bin/koha/cataloguing/merge.pl?biblionumber=' + checkboxes[0].value + '&biblionumber=' + checkboxes[1].value;	44	});
45	}	45	var url = '/cgi-bin/koha/cataloguing/merge.pl?' + params.join('&');
46	return false;	46	location.href = url;
		47	} else {
		48	alert(_("You must select at least one record"));
		49	}
		50	return false;
47	}	51	}
48		52
49	/**	53	/**
50	-