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

(-)a/C4/Ris.pm (-20 / +19 lines)
Lines 59-66 package C4::Ris; Link Here
59
#
59
#
60
#
60
#
61
61
62
#use strict;
62
use strict;
63
#use warnings; FIXME - Bug 2505
63
use warnings;
64
64
65
use vars qw($VERSION @ISA @EXPORT);
65
use vars qw($VERSION @ISA @EXPORT);
66
66
Lines 763-769 sub get_keywords { Link Here
763
    my @subfields = ('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'x', 'y', 'z', '2', '3', '4');
763
    my @subfields = ('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'x', 'y', 'z', '2', '3', '4');
764
764
765
    ## loop over all 6XX fields
765
    ## loop over all 6XX fields
766
    foreach $kwfield (@keywords) {
766
    foreach my $kwfield (@keywords) {
767
	if ($kwfield != undef) {
767
	if ($kwfield != undef) {
768
	    ## authornames get special treatment
768
	    ## authornames get special treatment
769
	    if ($fieldname eq "600") {
769
	    if ($fieldname eq "600") {
Lines 776-784 sub get_keywords { Link Here
776
		@kwsubfields = $kwfield->subfields();
776
		@kwsubfields = $kwfield->subfields();
777
		
777
		
778
		## loop over all available subfield tuples
778
		## loop over all available subfield tuples
779
		foreach $kwtuple (@kwsubfields) {
779
		foreach my $kwtuple (@kwsubfields) {
780
		    ## loop over all subfields to check
780
		    ## loop over all subfields to check
781
		    foreach $subfield (@subfields) {
781
		    foreach my $subfield (@subfields) {
782
			## [0] contains subfield code
782
			## [0] contains subfield code
783
			if (@$kwtuple[0] eq $subfield) {
783
			if (@$kwtuple[0] eq $subfield) {
784
			    ## [1] contains value, remove trailing separators
784
			    ## [1] contains value, remove trailing separators
Lines 886-900 sub pool_subx { Link Here
886
    }
886
    }
887
887
888
    ## loop over all notefields
888
    ## loop over all notefields
889
    foreach $notefield (@notefields) {
889
    foreach my $notefield (@notefields) {
890
	if ($notefield != undef) {
890
	if ($notefield != undef) {
891
	    ## retrieve all available subfield tuples
891
	    ## retrieve all available subfield tuples
892
	    @notesubfields = $notefield->subfields();
892
	    @notesubfields = $notefield->subfields();
893
893
894
	    ## loop over all subfield tuples
894
	    ## loop over all subfield tuples
895
	    foreach $notetuple (@notesubfields) {
895
	    foreach my $notetuple (@notesubfields) {
896
		## loop over all subfields to check
896
		## loop over all subfields to check
897
		foreach $subfield (@subfields) {
897
		foreach my $subfield (@subfields) {
898
		    ## [0] contains subfield code
898
		    ## [0] contains subfield code
899
		    if (@$notetuple[0] eq $subfield) {
899
		    if (@$notetuple[0] eq $subfield) {
900
			## [1] contains value, remove trailing separators
900
			## [1] contains value, remove trailing separators
Lines 927-946 sub print_abstract { Link Here
927
    my @abstrings;
927
    my @abstrings;
928
928
929
    ## loop over all abfields
929
    ## loop over all abfields
930
    foreach $abfield (@abfields) {
930
    foreach my $abfield (@abfields) {
931
	foreach $field (@subfields) { 
931
        foreach my $field (@subfields) {
932
	    if (length ($abfield->subfield($field)) > 0) {
932
            if ( length( $abfield->subfield($field) ) > 0 ) {
933
		my $ab = $abfield->subfield($field);
933
                my $ab = $abfield->subfield($field);
934
934
935
		print "<marc>field 520 subfield $field: $ab\r\n" if $marcprint;
935
                print "<marc>field 520 subfield $field: $ab\r\n" if $marcprint;
936
936
937
		## strip trailing separators
937
                ## strip trailing separators
938
		$ab =~ s% *[;,:./]*$%%;
938
                $ab =~ s% *[;,:./]*$%%;
939
939
940
		## add string to the list
940
                ## add string to the list
941
		push (@abstrings, $ab);
941
                push( @abstrings, $ab );
942
	    }
942
            }
943
	}
943
        }
944
    }
944
    }
945
945
946
    my $allabs = join "; ", @abstrings;
946
    my $allabs = join "; ", @abstrings;
947
- 

Return to bug 2505