Attachment #6916 for bug #6129

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

Lines 1627-1633 sub GetMarcAuthors { Link Here

(-)a/C4/Biblio.pm (-2 / +4 lines)
1627		1627
1628	=head2 GetMarcUrls	1628	=head2 GetMarcUrls
1629		1629
1630	$marcurls = GetMarcUrls($record,$marcflavour);	1630	$marcurls = GetMarcUrls($record,$marcflavour,$issn);
1631		1631
1632	Returns arrayref of URLs from MARC data, suitable to pass to tmpl loop.	1632	Returns arrayref of URLs from MARC data, suitable to pass to tmpl loop.
1633	Assumes web resources (not uncommon in MARC21 to omit resource type ind)	1633	Assumes web resources (not uncommon in MARC21 to omit resource type ind)
Lines 1635-1641 Assumes web resources (not uncommon in MARC21 to omit resource type ind) Link Here
1635	=cut	1635	=cut
1636		1636
1637	sub GetMarcUrls {	1637	sub GetMarcUrls {
1638	my ( $record, $marcflavour ) = @_;	1638	my ( $record, $marcflavour, $issn ) = @_;
1639		1639
1640	my @marcurls;	1640	my @marcurls;
1641	for my $field ( $record->field('856') ) {	1641	for my $field ( $record->field('856') ) {
Lines 1645-1650 sub GetMarcUrls { Link Here
1645	}	1645	}
1646	my @urls = $field->subfield('u');	1646	my @urls = $field->subfield('u');
1647	foreach my $url (@urls) {	1647	foreach my $url (@urls) {
		1648	$url .= "?sid=&ISSN=$issn"
		1649	if $issn && ($url =~ m/\bserialssolutions\b/o) && ($url !~ m/\bISSN=/o);
1648	my $marcurl;	1650	my $marcurl;
1649	if ( $marcflavour eq 'MARC21' ) {	1651	if ( $marcflavour eq 'MARC21' ) {
1650	my $s3 = $field->subfield('3');	1652	my $s3 = $field->subfield('3');

Lines 65-72 foreach my $biblionumber ( @bibs ) { Link Here

(-)a/basket/basket.pl (-2 / +2 lines)
65	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );	65	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
66	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );	66	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
67	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);	67	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);
68	my $marcurlsarray = GetMarcUrls ($record,$marcflavour);	68	my $marcurlsarray = GetMarcUrls ($record,$marcflavour,$dat->{issn});
69	my @items = GetItemsInfo( $biblionumber );	69	my @items = GetItemsInfo( $biblionumber, 'opac' );
70		70
71	my $hasauthors = 0;	71	my $hasauthors = 0;
72	if($dat->{'author'} \|\| @$marcauthorsarray) {	72	if($dat->{'author'} \|\| @$marcauthorsarray) {




    normalized_isbn => $isbn,
);

unless (defined($record)) {
    print $query->redirect("/cgi-bin/koha/errors/404.pl");
	exit;
}

my $dat = &GetBiblioData($biblionumber);

my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
my $marcisbnsarray   = GetMarcISBN( $record, $marcflavour );
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
my $marcseriesarray  = GetMarcSeries($record,$marcflavour);
my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour,$dat->{issn});
my $marchostsarray   = GetMarcHosts($record,$marcflavour);
my $subtitle         = GetRecordValue('subtitle', $record, $fw);

# Get Branches, Itemtypes and Locations

Lines 436-441 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-1 / +4 lines)
436	</xsl:for-each>	436	</xsl:for-each>
437	</span>	437	</span>
438	</xsl:if>	438	</xsl:if>
		439	<xsl:variable name="issn"><xsl:if test="marc:datafield[@tag=022]"><xsl:value-of select="marc:datafield[@tag=022]/marc:subfield[@code='a']"/></xsl:if></xsl:variable>
439		440
440	<!-- Other Title Statement: Alternate Graphic Representation (MARC 880) -->	441	<!-- Other Title Statement: Alternate Graphic Representation (MARC 880) -->
441	<xsl:if test="$display880">	442	<xsl:if test="$display880">
Lines 539-545 Link Here
539	<span class="results_summary online_resources"><span class="label">Online Resources: </span>	540	<span class="results_summary online_resources"><span class="label">Online Resources: </span>
540	<xsl:for-each select="marc:datafield[@tag=856]">	541	<xsl:for-each select="marc:datafield[@tag=856]">
541	<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>	542	<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
542	<a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>	543	<xsl:variable name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:variable>
		544	<!-- <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/><xsl:if test="$issn and matches(marc:subfield[@code='u'], 'serialssolutions') and not matches(marc:subfield[@code='u'], 'ISSN')">?ISSN=<xsl:value-of select="$issn"/></xsl:if></xsl:attribute> -->
		545	<a><xsl:attribute name="href"><xsl:value-of select="$href"/><xsl:if test="$issn and contains($href, 'serialssolutions') and not(contains($href, 'ISSN'))">?sid=&ISSN=<xsl:value-of select="$issn"/></xsl:if></xsl:attribute>
543	<xsl:if test="$OPACURLOpenInNewWindow='1'">	546	<xsl:if test="$OPACURLOpenInNewWindow='1'">
544	<xsl:attribute name="target">_blank</xsl:attribute>	547	<xsl:attribute name="target">_blank</xsl:attribute>
545	</xsl:if>	548	</xsl:if>

Lines 67-73 foreach my $biblionumber ( @bibs ) { Link Here

(-)a/opac/opac-basket.pl (-1 / +1 lines)
67	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );	67	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
68	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );	68	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
69	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);	69	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);
70	my $marcurlsarray = GetMarcUrls ($record,$marcflavour);	70	my $marcurlsarray = GetMarcUrls ($record,$marcflavour,$dat->{issn});
71	my @items = &GetItemsLocationInfo( $biblionumber );	71	my @items = &GetItemsLocationInfo( $biblionumber );
72	my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));	72	my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
73		73




# Hide items
if ($hideitems) {
    for my $itm (@all_items) {
        if  ( C4::Context->preference('hidelostitems') ) {
            push @items, $itm unless $itm->{itemlost} or any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
        } else {
            push @items, $itm unless any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
        }
    }
}
} else {
    # Or not
    @items = @all_items;

my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour,$dat->{issn});
my $marchostsarray   = GetMarcHosts($record,$marcflavour);
my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));

    $template->param(
- 

Return to bug 6129

Lines 400-411 my $hideitems = 1 if C4::Context->preference('hidelostitems') or scalar(@hiddeni Link Here

(-)a/opac/opac-detail.pl (-8 / +7 lines)
400	# Hide items	400	# Hide items
401	if ($hideitems) {	401	if ($hideitems) {
402	for my $itm (@all_items) {	402	for my $itm (@all_items) {
403	if ( C4::Context->preference('hidelostitems') ) {	403	if ( C4::Context->preference('hidelostitems') ) {
404	push @items, $itm unless $itm->{itemlost} or any { $itm->{'itemnumber'} eq $_ } @hiddenitems;	404	push @items, $itm unless $itm->{itemlost} or any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
405	} else {	405	} else {
406	push @items, $itm unless any { $itm->{'itemnumber'} eq $_ } @hiddenitems;	406	push @items, $itm unless any { $itm->{'itemnumber'} eq $_ } @hiddenitems;
		407	}
407	}	408	}
408	}
409	} else {	409	} else {
410	# Or not	410	# Or not
411	@items = @all_items;	411	@items = @all_items;
Lines 525-532 my $marcisbnsarray = GetMarcISBN ($record,$marcflavour); Link Here
525	my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);	525	my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
526	my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);	526	my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
527	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);	527	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);
528	my $marcurlsarray = GetMarcUrls ($record,$marcflavour);	528	my $marcurlsarray = GetMarcUrls ($record,$marcflavour,$dat->{issn});
529	my $marchostsarray = GetMarcHosts($record,$marcflavour);	529	my $marchostsarray = GetMarcHosts($record,$marcflavour);
530	my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));	530	my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
531		531
532	$template->param(	532	$template->param(
533	-

Lines 102-114 $template->param( Link Here

(-)a/catalogue/detail.pl (-2 / +9 lines)
102	normalized_isbn => $isbn,	102	normalized_isbn => $isbn,
103	);	103	);
104		104
		105	unless (defined($record)) {
		106	print $query->redirect("/cgi-bin/koha/errors/404.pl");
		107	exit;
		108	}
		109
		110	my $dat = &GetBiblioData($biblionumber);
		111
105	my $marcnotesarray = GetMarcNotes( $record, $marcflavour );	112	my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
106	my $marcisbnsarray = GetMarcISBN( $record, $marcflavour );	113	my $marcisbnsarray = GetMarcISBN( $record, $marcflavour );
107	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );	114	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
108	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );	115	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
109	my $marcseriesarray = GetMarcSeries($record,$marcflavour);	116	my $marcseriesarray = GetMarcSeries($record,$marcflavour);
110	my $marcurlsarray = GetMarcUrls ($record,$marcflavour);	117	my $marcurlsarray = GetMarcUrls ($record,$marcflavour,$dat->{issn});
111	my $marchostsarray = GetMarcHosts($record,$marcflavour);	118	my $marchostsarray = GetMarcHosts($record,$marcflavour);
112	my $subtitle = GetRecordValue('subtitle', $record, $fw);	119	my $subtitle = GetRecordValue('subtitle', $record, $fw);
113		120
114	# Get Branches, Itemtypes and Locations	121	# Get Branches, Itemtypes and Locations