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

(-)a/C4/AuthoritiesMarc.pm (-14 / +31 lines)
Lines 266-275 sub SearchAuthorities { Link Here
266
        
266
        
267
        ##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
267
        ##Here we have to extract MARC record and $authid from ZEBRA AUTHORITIES
268
        my $rec=$oAResult->record($counter);
268
        my $rec=$oAResult->record($counter);
269
        my $marcdata=$rec->raw();
270
        my $authrecord;
271
        my $separator=C4::Context->preference('authoritysep');
269
        my $separator=C4::Context->preference('authoritysep');
272
        $authrecord = MARC::File::USMARC::decode($marcdata);
270
        my $authrecord = eval {
271
            if (C4::Context->config('zebra_auth_index_mode') eq 'dom') {
272
                MARC::Record->new_from_xml(
273
                  $rec->raw(),
274
                  'UTF-8'
275
                );
276
            } else {
277
                MARC::Record->new_from_usmarc($rec->raw());
278
            }
279
        };
280
281
        if ( !defined $authrecord or !defined $authrecord->field('001') ) {
282
            $counter++;
283
            next;
284
        }
285
273
        my $authid=$authrecord->field('001')->data();
286
        my $authid=$authrecord->field('001')->data();
274
        my %newline;
287
        my %newline;
275
        $newline{authid} = $authid;
288
        $newline{authid} = $authid;
Lines 847-861 sub FindDuplicateAuthority { Link Here
847
    my $query='at:'.$authtypecode.' ';
860
    my $query='at:'.$authtypecode.' ';
848
    my $filtervalues=qr([\001-\040\!\'\"\`\#\$\%\&\*\+,\-\./:;<=>\?\@\(\)\{\[\]\}_\|\~]);
861
    my $filtervalues=qr([\001-\040\!\'\"\`\#\$\%\&\*\+,\-\./:;<=>\?\@\(\)\{\[\]\}_\|\~]);
849
    if ($record->field($auth_tag_to_report)) {
862
    if ($record->field($auth_tag_to_report)) {
850
      foreach ($record->field($auth_tag_to_report)->subfields()) {
863
        foreach ($record->field($auth_tag_to_report)->subfields()) {
851
        $_->[1]=~s/$filtervalues/ /g; $query.= " $op he:\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/);
864
            $_->[1]=~s/$filtervalues/ /g; $query.= " $op he:\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/);
852
      }
865
        }
853
    }
866
    }
854
    my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
867
    my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
855
    # there is at least 1 result => return the 1st one
868
    # there is at least 1 result => return the 1st one
856
    if (!defined $error && @{$results} ) {
869
    if (!defined $error && @{$results} ) {
857
      my $marcrecord = MARC::File::USMARC::decode($results->[0]);
870
        my $marcrecord = MARC::Record->new_from_xml(
858
      return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
871
            $results->[0]
872
        );
873
        return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
859
    }
874
    }
860
    # no result, returns nothing
875
    # no result, returns nothing
861
    return;
876
    return;
Lines 1452-1464 sub merge { Link Here
1452
    }
1467
    }
1453
    my $z=0;
1468
    my $z=0;
1454
    while ( $z<$count ) {
1469
    while ( $z<$count ) {
1455
        my $rec;
1470
        my $marcrecordzebra= MARC::Record->new_from_xml(
1456
        $rec=$oResult->record($z);
1471
            $oResult->record($z)->raw(),
1457
        my $marcdata = $rec->raw();
1472
            'UTF-8'
1458
        my $marcrecordzebra= MARC::Record->new_from_usmarc($marcdata);
1473
        );
1459
        my ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField( "biblio.biblionumber", '' );
1474
        my ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField( "biblio.biblionumber", '' );
1460
        my $i = ($biblionumbertagfield < 10) ? $marcrecordzebra->field($biblionumbertagfield)->data : $marcrecordzebra->subfield($biblionumbertagfield, $biblionumbertagsubfield);
1475
        my $i = ($biblionumbertagfield < 10)
1461
        my $marcrecorddb=GetMarcBiblio($i);
1476
            ? $marcrecordzebra->field( $biblionumbertagfield )->data
1477
            : $marcrecordzebra->subfield( $biblionumbertagfield, $biblionumbertagsubfield );
1478
        my $marcrecorddb = GetMarcBiblio($i);
1462
        push @reccache, $marcrecorddb;
1479
        push @reccache, $marcrecorddb;
1463
        $z++;
1480
        $z++;
1464
    }
1481
    }
(-)a/C4/Context.pm (-23 / +19 lines)
Lines 706-713 sub Zconn { Link Here
706
        $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
706
        $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
707
707
708
        $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
708
        $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
709
        $context->{ Zconn }->{ $server }->option(
710
            preferredRecordSyntax => C4::Context->preference("marcflavour") );
711
        return $context->{"Zconn"}->{$server};
709
        return $context->{"Zconn"}->{$server};
712
    }
710
    }
713
}
711
}
Lines 731-744 sub _new_Zconn { Link Here
731
729
732
    my $tried=0; # first attempt
730
    my $tried=0; # first attempt
733
    my $Zconn; # connection object
731
    my $Zconn; # connection object
734
    $server = "biblioserver" unless $server;
732
    my $elementSetName;
735
    $syntax = "usmarc" unless $syntax;
733
734
    $server //= "biblioserver";
735
    $syntax //= "XML";
736
737
    if ( ($server eq 'biblioserver' and $context->{'config'}->{'zebra_bib_index_mode'} eq 'grs1')
738
        or ($server eq 'authorityserver' and $context->{'config'}->{'zebra_auth_index_mode'} eq 'grs1')) {
739
740
        $elementSetName = 'F';
741
        $syntax = 'usmarc';
742
743
    } else {
744
745
        $elementSetName = 'marcxml';
746
        $syntax = 'XML';
747
    }
736
748
737
    my $host = $context->{'listen'}->{$server}->{'content'};
749
    my $host = $context->{'listen'}->{$server}->{'content'};
738
    my $servername = $context->{"config"}->{$server};
750
    my $servername = $context->{"config"}->{$server};
739
    my $user = $context->{"serverinfo"}->{$server}->{"user"};
751
    my $user = $context->{"serverinfo"}->{$server}->{"user"};
740
    my $password = $context->{"serverinfo"}->{$server}->{"password"};
752
    my $password = $context->{"serverinfo"}->{$server}->{"password"};
741
 $auth = 1 if($user && $password);   
753
    $auth = 1 if($user && $password);
742
    retry:
754
    retry:
743
    eval {
755
    eval {
744
        # set options
756
        # set options
Lines 750-756 sub _new_Zconn { Link Here
750
        $o->option(cqlfile=> $context->{"server"}->{$server}->{"cql2rpn"});
762
        $o->option(cqlfile=> $context->{"server"}->{$server}->{"cql2rpn"});
751
        $o->option(cclfile=> $context->{"serverinfo"}->{$server}->{"ccl2rpn"});
763
        $o->option(cclfile=> $context->{"serverinfo"}->{$server}->{"ccl2rpn"});
752
        $o->option(preferredRecordSyntax => $syntax);
764
        $o->option(preferredRecordSyntax => $syntax);
753
        $o->option(elementSetName => "F"); # F for 'full' as opposed to B for 'brief'
765
        $o->option(elementSetName => $elementSetName);
754
        $o->option(databaseName => ($servername?$servername:"biblios"));
766
        $o->option(databaseName => ($servername?$servername:"biblios"));
755
767
756
        # create a new connection object
768
        # create a new connection object
Lines 765-787 sub _new_Zconn { Link Here
765
        }
777
        }
766
778
767
    };
779
    };
768
#     if ($@) {
780
769
#         # Koha manages the Zebra server -- this doesn't work currently for me because of permissions issues
770
#         # Also, I'm skeptical about whether it's the best approach
771
#         warn "problem with Zebra";
772
#         if ( C4::Context->preference("ManageZebra") ) {
773
#             if ($@->code==10000 && $tried==0) { ##No connection try restarting Zebra
774
#                 $tried=1;
775
#                 warn "trying to restart Zebra";
776
#                 my $res=system("zebrasrv -f $ENV{'KOHA_CONF'} >/koha/log/zebra-error.log");
777
#                 goto "retry";
778
#             } else {
779
#                 warn "Error ", $@->code(), ": ", $@->message(), "\n";
780
#                 $Zconn="error";
781
#                 return $Zconn;
782
#             }
783
#         }
784
#     }
785
    return $Zconn;
781
    return $Zconn;
786
}
782
}
787
783
(-)a/C4/Installer/PerlDependencies.pm (-2 / +2 lines)
Lines 462-468 our $PERL_DEPS = { Link Here
462
    'MARC::Record' => {
462
    'MARC::Record' => {
463
        'usage'    => 'Core',
463
        'usage'    => 'Core',
464
        'required' => '1',
464
        'required' => '1',
465
        'min_ver'  => '2'
465
        'min_ver'  => '2.0.6'
466
    },
466
    },
467
    'Locale::Currency::Format' => {
467
    'Locale::Currency::Format' => {
468
        'usage'    => 'Core',
468
        'usage'    => 'Core',
Lines 487-493 our $PERL_DEPS = { Link Here
487
    'MARC::File::XML' => {
487
    'MARC::File::XML' => {
488
        'usage'    => 'Core',
488
        'usage'    => 'Core',
489
        'required' => '1',
489
        'required' => '1',
490
        'min_ver'  => '0.88'
490
        'min_ver'  => '1.0.1'
491
    },
491
    },
492
    'XML::SAX::Writer' => {
492
    'XML::SAX::Writer' => {
493
        'usage'    => 'Core',
493
        'usage'    => 'Core',
(-)a/C4/Search.pm (-33 / +60 lines)
Lines 144-151 sub FindDuplicate { Link Here
144
    my @results;
144
    my @results;
145
    if (!defined $error) {
145
    if (!defined $error) {
146
        foreach my $possible_duplicate_record (@{$searchresults}) {
146
        foreach my $possible_duplicate_record (@{$searchresults}) {
147
            my $marcrecord =
147
            my $marcrecord = eval {
148
            MARC::Record->new_from_usmarc($possible_duplicate_record);
148
                if ( C4::Context->config('zebra_bib_index_mode') eq 'dom') {
149
                    MARC::Record->new_from_xml(
150
                        $possible_duplicate_record,
151
                        'UTF-8'
152
                    );
153
                } else {
154
                    MARC::Record->new_from_usmarc(
155
                        $possible_duplicate_record
156
                    );
157
                }
158
            };
159
149
            my $result = TransformMarcToKoha( $dbh, $marcrecord, '' );
160
            my $result = TransformMarcToKoha( $dbh, $marcrecord, '' );
150
161
151
            # FIXME :: why 2 $biblionumber ?
162
            # FIXME :: why 2 $biblionumber ?
Lines 289-298 sub SimpleSearch { Link Here
289
            }
300
            }
290
301
291
            for my $j ( $first_record .. $last_record ) {
302
            for my $j ( $first_record .. $last_record ) {
292
                my $record =
303
                my $record = eval {
293
                  $tmpresults[ $i - 1 ]->record( $j - 1 )->raw()
304
                  $tmpresults[ $i - 1 ]->record( $j - 1 )->raw()
294
                  ;    # 0 indexed
305
                  ;    # 0 indexed
295
                push @{$results}, $record;
306
                };
307
                push @{$results}, $record if defined $record;
296
            }
308
            }
297
        }
309
        }
298
    );
310
    );
Lines 446-451 sub getRecords { Link Here
446
                else {
458
                else {
447
                    $times = $size;
459
                    $times = $size;
448
                }
460
                }
461
449
                for ( my $j = $offset ; $j < $times ; $j++ ) {
462
                for ( my $j = $offset ; $j < $times ; $j++ ) {
450
                    my $records_hash;
463
                    my $records_hash;
451
                    my $record;
464
                    my $record;
Lines 455-461 sub getRecords { Link Here
455
                        my ( $term, $occ ) = $results[ $i - 1 ]->term($j);
468
                        my ( $term, $occ ) = $results[ $i - 1 ]->term($j);
456
469
457
                 # here we create a minimal MARC record and hand it off to the
470
                 # here we create a minimal MARC record and hand it off to the
458
                 # template just like a normal result ... perhaps not ideal, but
471
                 # template just like a normal result ... serhaps not ideal, but
459
                 # it works for now
472
                 # it works for now
460
                        my $tmprecord = MARC::Record->new();
473
                        my $tmprecord = MARC::Record->new();
461
                        $tmprecord->encoding('UTF-8');
474
                        $tmprecord->encoding('UTF-8');
Lines 488-494 sub getRecords { Link Here
488
                    # not an index scan
501
                    # not an index scan
489
                    else {
502
                    else {
490
                        $record = $results[ $i - 1 ]->record($j)->raw();
503
                        $record = $results[ $i - 1 ]->record($j)->raw();
491
492
                        # warn "RECORD $j:".$record;
504
                        # warn "RECORD $j:".$record;
493
                        $results_hash->{'RECORDS'}[$j] = $record;
505
                        $results_hash->{'RECORDS'}[$j] = $record;
494
                    }
506
                    }
Lines 503-541 sub getRecords { Link Here
503
                      $size > $facets_maxrecs ? $facets_maxrecs : $size;
515
                      $size > $facets_maxrecs ? $facets_maxrecs : $size;
504
                    for my $facet (@$facets) {
516
                    for my $facet (@$facets) {
505
                        for ( my $j = 0 ; $j < $jmax ; $j++ ) {
517
                        for ( my $j = 0 ; $j < $jmax ; $j++ ) {
506
                            my $render_record =
518
507
                              $results[ $i - 1 ]->record($j)->render();
519
                            my $marc_record =  eval {
520
                                if ( C4::Context->config('zebra_bib_index_mode') eq 'dom' ) {
521
                                    MARC::Record->new_from_xml(
522
                                        $results[ $i - 1 ]->record($j)->raw(),
523
                                        'UTF-8'
524
                                    );
525
                                } else {
526
                                   MARC::Record->new_from_usmarc(
527
                                        $results[ $i - 1 ]->record($j)->raw()
528
                                    );
529
                                }
530
                            };
531
532
                            if ( $@ ) {
533
                                warn "ERROR DECODING RECORD - $@: " .
534
                                    $results[ $i - 1 ]->record($j)->raw();
535
                                next;
536
                            }
537
508
                            my @used_datas = ();
538
                            my @used_datas = ();
539
509
                            foreach my $tag ( @{ $facet->{tags} } ) {
540
                            foreach my $tag ( @{ $facet->{tags} } ) {
510
541
511
                                # avoid first line
542
                                # avoid first line
512
                                my $tag_num = substr( $tag, 0, 3 );
543
                                my $tag_num = substr( $tag, 0, 3 );
513
                                my $letters = substr( $tag, 3 );
544
                                my $subfield_letters = substr( $tag, 3 );
514
                                my $field_pattern =
545
                                # Removed when as_string fixed
515
                                  '\n' . $tag_num . ' ([^z][^\n]+)';
546
                                my @subfields = $subfield_letters =~ /./sg;
516
                                $field_pattern = '\n' . $tag_num . ' ([^\n]+)'
547
517
                                  if ( int($tag_num) < 10 );
548
                                my @fields = $marc_record->field($tag_num);
518
                                my @field_tokens =
549
                                foreach my $field (@fields) {
519
                                  ( $render_record =~ /$field_pattern/g );
550
                                    my $data = $field->as_string( $subfield_letters, $facet->{sep} );
520
                                foreach my $field_token (@field_tokens) {
551
521
                                    my @subf = ( $field_token =~
522
                                          /\$([a-zA-Z0-9]) ([^\$]+)/g );
523
                                    my @values;
524
                                    for ( my $i = 0 ; $i < @subf ; $i += 2 ) {
525
                                        if ( $letters =~ $subf[$i] ) {
526
                                            my $value = $subf[ $i + 1 ];
527
                                            $value =~ s/^ *//;
528
                                            $value =~ s/ *$//;
529
                                            push @values, $value;
530
                                        }
531
                                    }
532
                                    my $data = join( $facet->{sep}, @values );
533
                                    unless ( $data ~~ @used_datas ) {
552
                                    unless ( $data ~~ @used_datas ) {
534
                                        $facets_counter->{ $facet->{idx} }
535
                                          ->{$data}++;
536
                                        push @used_datas, $data;
553
                                        push @used_datas, $data;
537
                                    }
554
                                    }
538
                                }    # fields
555
556
                                    $facets_counter->{ $facet->{idx} }->{$data}++;
557
558
                                } # fields
539
                            }    # field codes
559
                            }    # field codes
540
                        }    # records
560
                        }    # records
541
                        $facets_info->{ $facet->{idx} }->{label_value} =
561
                        $facets_info->{ $facet->{idx} }->{label_value} =
Lines 1700-1712 sub searchResults { Link Here
1700
        $times = $hits;	 # FIXME: if $hits is undefined, why do we want to equal it?
1720
        $times = $hits;	 # FIXME: if $hits is undefined, why do we want to equal it?
1701
    }
1721
    }
1702
1722
1703
	my $marcflavour = C4::Context->preference("marcflavour");
1723
    my $marcflavour = C4::Context->preference("marcflavour");
1704
    # We get the biblionumber position in MARC
1724
    # We get the biblionumber position in MARC
1705
    my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblio.biblionumber','');
1725
    my ($bibliotag,$bibliosubf)=GetMarcFromKohaField('biblio.biblionumber','');
1706
1726
1707
    # loop through all of the records we've retrieved
1727
    # loop through all of the records we've retrieved
1708
    for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
1728
    for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
1709
        my $marcrecord = eval { MARC::File::USMARC::decode( $marcresults->[$i] ); };
1729
        my $marcrecord = eval {
1730
            if ( C4::Context->config('zebra_bib_index_mode') eq 'dom') {
1731
                MARC::Record->new_from_xml( $marcresults->[$i], 'UTF-8' );
1732
            } else {
1733
                MARC::Record->new_from_usmarc( $marcresults->[$i] );
1734
            }
1735
        };
1736
1710
        if ( $@ ) {
1737
        if ( $@ ) {
1711
            warn "ERROR DECODING RECORD - $@: " . $marcresults->[$i];
1738
            warn "ERROR DECODING RECORD - $@: " . $marcresults->[$i];
1712
            next;
1739
            next;
(-)a/catalogue/search.pl (-1 / +1 lines)
Lines 660-666 for (my $i=0;$i<@servers;$i++) { Link Here
660
    elsif ($server =~/authorityserver/) { # this is the local authority server
660
    elsif ($server =~/authorityserver/) { # this is the local authority server
661
        my @inner_sup_results_array;
661
        my @inner_sup_results_array;
662
        for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) {
662
        for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) {
663
            my $marc_record_object = MARC::Record->new_from_usmarc($sup_record);
663
            my $marc_record_object = MARC::Record->new_from_xml($sup_record,'UTF-8');
664
            # warn "Authority Found: ".$marc_record_object->as_formatted();
664
            # warn "Authority Found: ".$marc_record_object->as_formatted();
665
            push @inner_sup_results_array, {
665
            push @inner_sup_results_array, {
666
                'title' => $marc_record_object->field(100)->subfield('a'),
666
                'title' => $marc_record_object->field(100)->subfield('a'),
(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 309-315 if ($barcode) { Link Here
309
            foreach my $hit ( @{$results} ) {
309
            foreach my $hit ( @{$results} ) {
310
                my $chosen =
310
                my $chosen =
311
                  TransformMarcToKoha( C4::Context->dbh,
311
                  TransformMarcToKoha( C4::Context->dbh,
312
                    MARC::Record->new_from_usmarc($hit) );
312
                    MARC::Record->new_from_xml($hit,'UTF-8') );
313
313
314
                # offer all barcodes individually
314
                # offer all barcodes individually
315
                foreach my $barcode ( sort split(/\s*\|\s*/, $chosen->{barcode}) ) {
315
                foreach my $barcode ( sort split(/\s*\|\s*/, $chosen->{barcode}) ) {
(-)a/t/db_dependent/Search.t (-3 / +42 lines)
Lines 359-364 sub run_marc21_search_tests { Link Here
359
        getRecords('au:Lessig', 'au:Lessig', [], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
359
        getRecords('au:Lessig', 'au:Lessig', [], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
360
    is($results_hashref->{biblioserver}->{hits}, 4, "getRecords title search for 'Australia' matched right number of records");
360
    is($results_hashref->{biblioserver}->{hits}, 4, "getRecords title search for 'Australia' matched right number of records");
361
361
362
if ( $indexing_mode eq 'dom' ) {
363
    ( undef, $results_hashref, $facets_loop ) =
364
        getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
365
    ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/^Efectos del ambiente/ &&
366
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() eq 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies' &&
367
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/
368
        , "Simple relevance sorting in getRecords matches old behavior");
369
370
    ( undef, $results_hashref, $facets_loop ) =
371
        getRecords('salud', 'salud', [ 'author_az' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
372
    ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/la enfermedad laboral\^ies$/ &&
373
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[6],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ &&
374
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() eq 'World health statistics 2009^ien'
375
        , "Simple ascending author sorting in getRecords matches old behavior");
376
377
    ( undef, $results_hashref, $facets_loop ) =
378
        getRecords('salud', 'salud', [ 'author_za' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
379
    ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' &&
380
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[12],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ &&
381
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/la enfermedad laboral\^ies$/
382
        , "Simple descending author sorting in getRecords matches old behavior");
383
384
    ( undef, $results_hashref, $facets_loop ) =
385
        getRecords('salud', 'salud', [ 'pubdate_asc' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
386
    ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() eq 'Manual de higiene industrial^ies' &&
387
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() =~ m/seguridad e higiene del trabajo\^ies$/ &&
388
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/
389
        , "Simple ascending publication date sorting in getRecords matches old behavior");
390
391
    ( undef, $results_hashref, $facets_loop ) =
392
        getRecords('salud', 'salud', [ 'pubdate_dsc' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
393
    ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/^Estado de salud/ &&
394
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' &&
395
        MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() eq 'Manual de higiene industrial^ies'
396
        , "Simple descending publication date sorting in getRecords matches old behavior");
397
398
} elsif ( $indexing_mode eq 'grs1' ){
362
    ( undef, $results_hashref, $facets_loop ) =
399
    ( undef, $results_hashref, $facets_loop ) =
363
        getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
400
        getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef);
364
    ok(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper() =~ m/^Efectos del ambiente/ &&
401
    ok(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper() =~ m/^Efectos del ambiente/ &&
Lines 393-406 sub run_marc21_search_tests { Link Here
393
        MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[7])->title_proper() eq 'World health statistics 2009^ien' &&
430
        MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[7])->title_proper() eq 'World health statistics 2009^ien' &&
394
        MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[18])->title_proper() eq 'Manual de higiene industrial^ies'
431
        MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[18])->title_proper() eq 'Manual de higiene industrial^ies'
395
        , "Simple descending publication date sorting in getRecords matches old behavior");
432
        , "Simple descending publication date sorting in getRecords matches old behavior");
433
}
396
434
435
TODO: {
436
    local $TODO = "Switch relevance search to MARCXML too";
397
    ( undef, $results_hashref, $facets_loop ) =
437
    ( undef, $results_hashref, $facets_loop ) =
398
        getRecords('books', 'books', [ 'relevance' ], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, undef, 1);
438
        getRecords('books', 'books', [ 'relevance' ], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, undef, 1);
399
    $record = MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0]);
439
    $record = MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0]);
400
    is($record->title_proper(), 'books', "Scan returned requested item");
440
    is($record->title_proper(), 'books', "Scan returned requested item");
401
    is($record->subfield('100', 'a'), 2, "Scan returned correct number of records matching term");
441
    is($record->subfield('100', 'a'), 2, "Scan returned correct number of records matching term");
402
403
    # Time to test buildQuery and searchResults too.
442
    # Time to test buildQuery and searchResults too.
443
}
404
444
405
    my ( $query, $simple_query, $query_cgi,
445
    my ( $query, $simple_query, $query_cgi,
406
    $query_desc, $limit, $limit_cgi, $limit_desc,
446
    $query_desc, $limit, $limit_cgi, $limit_desc,
Lines 544-550 sub run_marc21_search_tests { Link Here
544
        is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
584
        is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
545
    } else {
585
    } else {
546
        local $TODO = "Query weighting does not behave exactly the same in DOM vs. GRS";
586
        local $TODO = "Query weighting does not behave exactly the same in DOM vs. GRS";
547
        is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
587
        is(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first");
548
    }
588
    }
549
589
550
    $QueryStemming = $QueryWeightFields = $QueryFuzzy = $QueryRemoveStopwords = 0;
590
    $QueryStemming = $QueryWeightFields = $QueryFuzzy = $QueryRemoveStopwords = 0;
551
- 

Return to bug 11096