Attachment #3819 for bug #6129

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

Lines 1534-1540 sub GetMarcAuthors { Link Here

(-)a/C4/Biblio.pm (-2 / +4 lines)
1534		1534
1535	=head2 GetMarcUrls	1535	=head2 GetMarcUrls
1536		1536
1537	$marcurls = GetMarcUrls($record,$marcflavour);	1537	$marcurls = GetMarcUrls($record,$marcflavour,$issn);
1538		1538
1539	Returns arrayref of URLs from MARC data, suitable to pass to tmpl loop.	1539	Returns arrayref of URLs from MARC data, suitable to pass to tmpl loop.
1540	Assumes web resources (not uncommon in MARC21 to omit resource type ind)	1540	Assumes web resources (not uncommon in MARC21 to omit resource type ind)
Lines 1542-1548 Assumes web resources (not uncommon in MARC21 to omit resource type ind) Link Here
1542	=cut	1542	=cut
1543		1543
1544	sub GetMarcUrls {	1544	sub GetMarcUrls {
1545	my ( $record, $marcflavour ) = @_;	1545	my ( $record, $marcflavour, $issn ) = @_;
1546		1546
1547	my @marcurls;	1547	my @marcurls;
1548	for my $field ( $record->field('856') ) {	1548	for my $field ( $record->field('856') ) {
Lines 1552-1557 sub GetMarcUrls { Link Here
1552	}	1552	}
1553	my @urls = $field->subfield('u');	1553	my @urls = $field->subfield('u');
1554	foreach my $url (@urls) {	1554	foreach my $url (@urls) {
		1555	$url .= "?sid=&ISSN=$issn"
		1556	if $issn && ($url =~ m/\bserialssolutions\b/o) && ($url !~ m/\bISSN=/o);
1555	my $marcurl;	1557	my $marcurl;
1556	if ( $marcflavour eq 'MARC21' ) {	1558	if ( $marcflavour eq 'MARC21' ) {
1557	my $s3 = $field->subfield('3');	1559	my $s3 = $field->subfield('3');

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

(-)a/basket/basket.pl (-1 / +1 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, 'opac' );	69	my @items = &GetItemsInfo( $biblionumber, 'opac' );
70		70
71	my $hasauthors = 0;	71	my $hasauthors = 0;




	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 $subtitle         = GetRecordValue('subtitle', $record, $fw);

# Get Branches, Itemtypes and Locations

for my $itm (@all_items) {
    push @items, $itm unless ( $itm->{itemlost} && GetHideLostItemsPreference($borrowernumber) && !$showallitems);
}
my $dat = &GetBiblioData($biblionumber);

# get count of holds
my ( $holdcount, $holds ) = GetReservesFromBiblionumber($biblionumber,1);

Lines 431-436 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-1 / +4 lines)
431	</xsl:for-each>	431	</xsl:for-each>
432	</span>	432	</span>
433	</xsl:if>	433	</xsl:if>
		434	<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>
434		435
435	<!-- Other Title Statement: Alternate Graphic Representation (MARC 880) -->	436	<!-- Other Title Statement: Alternate Graphic Representation (MARC 880) -->
436	<xsl:if test="$display880">	437	<xsl:if test="$display880">
Lines 534-540 Link Here
534	<span class="results_summary"><span class="label">Online Resources: </span>	535	<span class="results_summary"><span class="label">Online Resources: </span>
535	<xsl:for-each select="marc:datafield[@tag=856]">	536	<xsl:for-each select="marc:datafield[@tag=856]">
536	<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>	537	<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
537	<a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>	538	<xsl:variable name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:variable>
		539	<!-- <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> -->
		540	<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>
538	<xsl:if test="$OPACURLOpenInNewWindow='1'">	541	<xsl:if test="$OPACURLOpenInNewWindow='1'">
539	<xsl:attribute name="target">_blank</xsl:attribute>	542	<xsl:attribute name="target">_blank</xsl:attribute>
540	</xsl:if>	543	</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




# change back when ive fixed request.pl
my @all_items = &GetItemsInfo( $biblionumber, 'opac' );
my @items;
@items = @all_items unless C4::Context->preference('hidelostitems');

if (C4::Context->preference('hidelostitems')) {
    # Hide host items
    for my $itm (@all_items) {
        push @items, $itm unless $itm->{itemlost};
    }
}
else {
    @items = @all_items;
}

my $dat = &GetBiblioData($biblionumber);

my $itemtypes = GetItemTypes();

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

    $template->param(
- 

Return to bug 6129

Lines 98-109 unless (defined($record)) { Link Here

(-)a/catalogue/detail.pl (-2 / +3 lines)
98	exit;	98	exit;
99	}	99	}
100		100
		101	my $dat = &GetBiblioData($biblionumber);
		102
101	my $marcnotesarray = GetMarcNotes( $record, $marcflavour );	103	my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
102	my $marcisbnsarray = GetMarcISBN( $record, $marcflavour );	104	my $marcisbnsarray = GetMarcISBN( $record, $marcflavour );
103	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );	105	my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
104	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );	106	my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
105	my $marcseriesarray = GetMarcSeries($record,$marcflavour);	107	my $marcseriesarray = GetMarcSeries($record,$marcflavour);
106	my $marcurlsarray = GetMarcUrls ($record,$marcflavour);	108	my $marcurlsarray = GetMarcUrls ($record,$marcflavour,$dat->{issn});
107	my $subtitle = GetRecordValue('subtitle', $record, $fw);	109	my $subtitle = GetRecordValue('subtitle', $record, $fw);
108		110
109	# Get Branches, Itemtypes and Locations	111	# Get Branches, Itemtypes and Locations
Lines 117-123 my @items; Link Here
117	for my $itm (@all_items) {	119	for my $itm (@all_items) {
118	push @items, $itm unless ( $itm->{itemlost} && GetHideLostItemsPreference($borrowernumber) && !$showallitems);	120	push @items, $itm unless ( $itm->{itemlost} && GetHideLostItemsPreference($borrowernumber) && !$showallitems);
119	}	121	}
120	my $dat = &GetBiblioData($biblionumber);
121		122
122	# get count of holds	123	# get count of holds
123	my ( $holdcount, $holds ) = GetReservesFromBiblionumber($biblionumber,1);	124	my ( $holdcount, $holds ) = GetReservesFromBiblionumber($biblionumber,1);

Lines 86-99 $template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowChec Link Here

(-)a/opac/opac-detail.pl (-4 / +5 lines)
86	# change back when ive fixed request.pl	86	# change back when ive fixed request.pl
87	my @all_items = &GetItemsInfo( $biblionumber, 'opac' );	87	my @all_items = &GetItemsInfo( $biblionumber, 'opac' );
88	my @items;	88	my @items;
89	@items = @all_items unless C4::Context->preference('hidelostitems');
90
91	if (C4::Context->preference('hidelostitems')) {	89	if (C4::Context->preference('hidelostitems')) {
92	# Hide host items	90	# Hide host items
93	for my $itm (@all_items) {	91	for my $itm (@all_items) {
94	push @items, $itm unless $itm->{itemlost};	92	push @items, $itm unless $itm->{itemlost};
95	}	93	}
96	}	94	}
		95	else {
		96	@items = @all_items;
		97	}
		98
97	my $dat = &GetBiblioData($biblionumber);	99	my $dat = &GetBiblioData($biblionumber);
98		100
99	my $itemtypes = GetItemTypes();	101	my $itemtypes = GetItemTypes();
Lines 209-215 my $marcisbnsarray = GetMarcISBN ($record,$marcflavour); Link Here
209	my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);	211	my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
210	my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);	212	my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
211	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);	213	my $marcseriesarray = GetMarcSeries ($record,$marcflavour);
212	my $marcurlsarray = GetMarcUrls ($record,$marcflavour);	214	my $marcurlsarray = GetMarcUrls ($record,$marcflavour,$dat->{issn});
213	my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));	215	my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
214		216
215	$template->param(	217	$template->param(
216	-