Attachment #2992 for bug #4885

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





      &GetMarcControlnumber
      &GetMarcNotes
      &GetMarcISBN
      &GetMarcSubjects
      &GetMarcBiblio
      &GetMarcAuthors

    return $controlnumber;
}

=head2 GetMarcISBN

  $marcisbnsarray = GetMarcISBN( $record, $marcflavour );

Get all ISBNs from the MARC record and returns them in an array.
ISBNs stored in differents places depending on MARC flavour

=cut

sub GetMarcISBN {
    my ( $record, $marcflavour ) = @_;
    my $scope;
    if ( $marcflavour eq "MARC21" ) {
        $scope = '020';
    } else {    # assume unimarc if not marc21
        $scope = '010';
    }
    my @marcisbns;
    my $isbn = "";
    my $tag  = "";
    my $marcisbn;
    foreach my $field ( $record->field($scope) ) {
        my $value = $field->as_string();
        if ( $isbn ne "" ) {
            $marcisbn = { marcisbn => $isbn, };
            push @marcisbns, $marcisbn;
            $isbn = $value;
        }
        if ( $isbn ne $value ) {
            $isbn = $isbn . " " . $value;
        }
    }

    if ($isbn) {
        $marcisbn = { marcisbn => $isbn };
        push @marcisbns, $marcisbn;    #load last tag into array
    }
    return \@marcisbns;
}    # end GetMarcISBN

=head2 GetMarcNotes

  $marcnotesarray = GetMarcNotes( $record, $marcflavour );

Lines 87-92 unless (defined($record)) { Link Here

(-)a/catalogue/detail.pl (+2 lines)
87	}	87	}
88		88
89	my $marcnotesarray = GetMarcNotes( $record, $marcflavour );	89	my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
		90	my $marcisbnsarray = GetMarcISBN( $record, $marcflavour );
90	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );	91	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
91	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );	92	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
92	my $marcseriesarray = GetMarcSeries($record,$marcflavour);	93	my $marcseriesarray = GetMarcSeries($record,$marcflavour);
Lines 212-217 $template->param( Link Here
212	MARCAUTHORS => $marcauthorsarray,	213	MARCAUTHORS => $marcauthorsarray,
213	MARCSERIES => $marcseriesarray,	214	MARCSERIES => $marcseriesarray,
214	MARCURLS => $marcurlsarray,	215	MARCURLS => $marcurlsarray,
		216	MARCISBNS => $marcisbnsarray,
215	subtitle => $subtitle,	217	subtitle => $subtitle,
216	itemdata_ccode => $itemfields{ccode},	218	itemdata_ccode => $itemfields{ccode},
217	itemdata_enumchron => $itemfields{enumchron},	219	itemdata_enumchron => $itemfields{enumchron},

Lines 148-155 function verify_images() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl (-2 / +6 lines)
148		148
149	<div class="yui-u" style="margin-top: 1em;">	149	<div class="yui-u" style="margin-top: 1em;">
150	<ul>	150	<ul>
151	<!-- TMPL_IF name="normalized_isbn" -->	151	<!-- TMPL_IF NAME="MARCISBNS" -->
152	<li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="normalized_isbn" --></li>	152	<li><strong>ISBN:</strong><ul><!-- TMPL_LOOP NAME="MARCISBNS" --><li><!-- TMPL_VAR NAME="marcisbn" --></li><!-- /TMPL_LOOP --></ul></li>
		153	<!-- TMPL_ELSE -->
		154	<!-- TMPL_IF name="normalized_isbn" -->
		155	<li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="normalized_isbn" --></li>
		156	<!-- /TMPL_IF -->
153	<!-- /TMPL_IF -->	157	<!-- /TMPL_IF -->
154	<!-- TMPL_IF name="issn" -->	158	<!-- TMPL_IF name="issn" -->
155	<li><strong>ISSN:</strong><!-- TMPL_VAR NAME="issn" --></li>	159	<li><strong>ISSN:</strong><!-- TMPL_VAR NAME="issn" --></li>

Lines 132-139 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl (-2 / +6 lines)
132		132
133	<!-- TMPL_IF NAME="pages" --><span class="results_summary"><span class="label">Physical details:</span> <!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></span><!-- /TMPL_IF -->	133	<!-- TMPL_IF NAME="pages" --><span class="results_summary"><span class="label">Physical details:</span> <!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></span><!-- /TMPL_IF -->
134		134
135	<!-- TMPL_IF name="normalized_isbn" -->	135	<!-- TMPL_IF NAME="MARCISBNS" -->
136	<span class="results_summary"><span class="label">ISBN: </span><!-- TMPL_VAR NAME="normalized_isbn" --></span>	136	<span class="results_summary"><span class="label">IBSN:</span><!-- TMPL_LOOP NAME="MARCISBNS" --><!-- TMPL_VAR NAME="marcisbn" -->; <!-- /TMPL_LOOP -->.</span>
		137	<!-- TMPL_ELSE -->
		138	<!-- TMPL_IF name="normalized_isbn" -->
		139	<span class="results_summary"><span class="label">ISBN: </span><!-- TMPL_VAR NAME="normalized_isbn" --></span>
		140	<!-- /TMPL_IF -->
137	<!-- /TMPL_IF -->	141	<!-- /TMPL_IF -->
138	<!-- TMPL_IF name="issn" -->	142	<!-- TMPL_IF name="issn" -->
139	<span class="results_summary"><span class="label">ISSN:</span><!-- TMPL_VAR NAME="issn" --></span>	143	<span class="results_summary"><span class="label">ISSN:</span><!-- TMPL_VAR NAME="issn" --></span>

Lines 197-202 for my $itm (@items) { Link Here

(-)a/opac/opac-detail.pl (-1 / +2 lines)
197	my $dbh = C4::Context->dbh;	197	my $dbh = C4::Context->dbh;
198	my $marcflavour = C4::Context->preference("marcflavour");	198	my $marcflavour = C4::Context->preference("marcflavour");
199	my $marcnotesarray = GetMarcNotes ($record,$marcflavour);	199	my $marcnotesarray = GetMarcNotes ($record,$marcflavour);
		200	my $marcisbnsarray = GetMarcISBN ($record,$marcflavour);
200	my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);	201	my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
201	my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);	202	my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
202	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);	203	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);
Lines 209-214 my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($bib Link Here
209	MARCAUTHORS => $marcauthorsarray,	210	MARCAUTHORS => $marcauthorsarray,
210	MARCSERIES => $marcseriesarray,	211	MARCSERIES => $marcseriesarray,
211	MARCURLS => $marcurlsarray,	212	MARCURLS => $marcurlsarray,
		213	MARCISBNS => $marcisbnsarray,
212	norequests => $norequests,	214	norequests => $norequests,
213	RequestOnOpac => C4::Context->preference("RequestOnOpac"),	215	RequestOnOpac => C4::Context->preference("RequestOnOpac"),
214	itemdata_ccode => $itemfields{ccode},	216	itemdata_ccode => $itemfields{ccode},
215	-

Return to bug 4885

Lines 69-74 BEGIN { Link Here

(-)a/C4/Biblio.pm (+41 lines)
69		69
70	&GetMarcControlnumber	70	&GetMarcControlnumber
71	&GetMarcNotes	71	&GetMarcNotes
		72	&GetMarcISBN
72	&GetMarcSubjects	73	&GetMarcSubjects
73	&GetMarcBiblio	74	&GetMarcBiblio
74	&GetMarcAuthors	75	&GetMarcAuthors
Lines 1277-1282 sub GetMarcControlnumber { Link Here
1277	return $controlnumber;	1278	return $controlnumber;
1278	}	1279	}
1279		1280
		1281	=head2 GetMarcISBN
		1282
		1283	$marcisbnsarray = GetMarcISBN( $record, $marcflavour );
		1284
		1285	Get all ISBNs from the MARC record and returns them in an array.
		1286	ISBNs stored in differents places depending on MARC flavour
		1287
		1288	=cut
		1289
		1290	sub GetMarcISBN {
		1291	my ( $record, $marcflavour ) = @_;
		1292	my $scope;
		1293	if ( $marcflavour eq "MARC21" ) {
		1294	$scope = '020';
		1295	} else { # assume unimarc if not marc21
		1296	$scope = '010';
		1297	}
		1298	my @marcisbns;
		1299	my $isbn = "";
		1300	my $tag = "";
		1301	my $marcisbn;
		1302	foreach my $field ( $record->field($scope) ) {
		1303	my $value = $field->as_string();
		1304	if ( $isbn ne "" ) {
		1305	$marcisbn = { marcisbn => $isbn, };
		1306	push @marcisbns, $marcisbn;
		1307	$isbn = $value;
		1308	}
		1309	if ( $isbn ne $value ) {
		1310	$isbn = $isbn . " " . $value;
		1311	}
		1312	}
		1313
		1314	if ($isbn) {
		1315	$marcisbn = { marcisbn => $isbn };
		1316	push @marcisbns, $marcisbn; #load last tag into array
		1317	}
		1318	return \@marcisbns;
		1319	} # end GetMarcISBN
		1320
1280	=head2 GetMarcNotes	1321	=head2 GetMarcNotes
1281		1322
1282	$marcnotesarray = GetMarcNotes( $record, $marcflavour );	1323	$marcnotesarray = GetMarcNotes( $record, $marcflavour );