[Koha-cvs] koha opac/opac-MARCdetail.pl ./MARCdetail.pl [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	paul poulain <tipaul at savannah.gnu.org>	05/12/13 17:34:22

Modified files:
	opac           : opac-MARCdetail.pl 
	.              : MARCdetail.pl 

Log message:
	adding leader to MARC view if applicable

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-MARCdetail.pl.diff?only_with_tag=rel_2_2&tr1=1.4.2.5&tr2=1.4.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/MARCdetail.pl.diff?only_with_tag=rel_2_2&tr1=1.25.2.14&tr2=1.25.2.15&r1=text&r2=text

Patches:
Index: koha/MARCdetail.pl
diff -u koha/MARCdetail.pl:1.25.2.14 koha/MARCdetail.pl:1.25.2.15
--- koha/MARCdetail.pl:1.25.2.14	Tue Oct 25 12:41:13 2005
+++ koha/MARCdetail.pl	Tue Dec 13 17:34:22 2005
@@ -115,12 +115,25 @@
 # loop through each tab 0 through 9
 for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 # loop through each tag
-	my @fields = $record->fields();
 	my @loop_data =();
-# 	foreach my $field (@fields) {
 	my @subfields_data;
+	# deal with leader
+	unless ($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop  or $tagslib->{'000'}->{'@'}->{hidden}) {
+		my %subfield_data;
+		$subfield_data{marc_lib}=$tagslib->{'000'}->{'@'}->{lib};
+		$subfield_data{marc_value}=$record->leader();
+		$subfield_data{marc_subfield}='@';
+		$subfield_data{marc_tag}='000';
+		push(@subfields_data, \%subfield_data);
+		my %tag_data;
+			$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
+		my @tmp = @subfields_data;
+		$tag_data{subfield} = \@tmp;
+		push (@loop_data, \%tag_data);
+		undef @subfields_data;
+	}
+	my @fields = $record->fields();
 	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
-# 		warn "$tabloop => $x_i";
 		# if tag <10, there's no subfield, use the "@" trick
 		if ($fields[$x_i]->tag()<10) {
 			next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{tab}  ne $tabloop);
Index: koha/opac/opac-MARCdetail.pl
diff -u koha/opac/opac-MARCdetail.pl:1.4.2.5 koha/opac/opac-MARCdetail.pl:1.4.2.6
--- koha/opac/opac-MARCdetail.pl:1.4.2.5	Tue Oct  4 10:13:16 2005
+++ koha/opac/opac-MARCdetail.pl	Tue Dec 13 17:34:21 2005
@@ -89,12 +89,25 @@
 # loop through each tab 0 through 9
 for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 # loop through each tag
-	my @fields = $record->fields();
 	my @loop_data =();
-# 	foreach my $field (@fields) {
 	my @subfields_data;
+	# deal with leader
+	unless ($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop  or $tagslib->{'000'}->{'@'}->{hidden}) {
+		my %subfield_data;
+		$subfield_data{marc_lib}=$tagslib->{'000'}->{'@'}->{lib};
+		$subfield_data{marc_value}=$record->leader();
+		$subfield_data{marc_subfield}='@';
+		$subfield_data{marc_tag}='000';
+		push(@subfields_data, \%subfield_data);
+		my %tag_data;
+			$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
+		my @tmp = @subfields_data;
+		$tag_data{subfield} = \@tmp;
+		push (@loop_data, \%tag_data);
+		undef @subfields_data;
+	}
+	my @fields = $record->fields();
 	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
-# 		warn "$tabloop => $x_i";
 		# if tag <10, there's no subfield, use the "@" trick
 		if ($fields[$x_i]->tag()<10) {
 			next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{tab}  ne $tabloop);
@@ -115,6 +128,7 @@
 				my %subfield_data;
 				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
 				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
+				$subf[$i][1] =~ s/\n/<br\/>/g;
 				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
 					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {