From ef8a07c21b0813b77d1f81f8b12cb4500425f21d Mon Sep 17 00:00:00 2001
From: kados <kados>
Date: Sun, 21 May 2006 02:07:44 +0000
Subject: [PATCH] merging dev-week and HEAD

---
 opac/opac-MARCdetail.pl | 26 +++++++++++++++-----------
 opac/opac-account.pl    |  5 +----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index ffaa073a72..061e23e20a 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -94,7 +94,7 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 	my @loop_data =();
 	my @subfields_data;
 	# deal with leader
-	unless ($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop  or $tagslib->{'000'}->{'@'}->{hidden}) {
+	unless ($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop  or $tagslib->{'000'}->{'@'}->{hidden}>0) {
 		my %subfield_data;
 		$subfield_data{marc_lib}=$tagslib->{'000'}->{'@'}->{lib};
 		$subfield_data{marc_value}=$record->leader();
@@ -113,7 +113,7 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 		# 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);
-			next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{hidden});
+			next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{hidden}>0);
 			my %subfield_data;
 			$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{'@'}->{lib};
 			$subfield_data{marc_value}=$fields[$x_i]->data();
@@ -126,7 +126,7 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 			for my $i (0..$#subf) {
 				$subf[$i][0] = "@" unless $subf[$i][0];
 				next if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
-				next if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden});
+				next if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden}>0);
 				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};
@@ -149,11 +149,15 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 		}
 		if ($#subfields_data>=0) {
 			my %tag_data;
-	#		if ($fields[$x_i]->tag() eq $fields[$x_i-1]->tag()) {
-	#			$tag_data{tag}="";
-	#		} else {
-				$tag_data{tag}=$fields[$x_i]->tag().' -'. $tagslib->{$fields[$x_i]->tag()}->{lib};
-	#		}
+			if (($fields[$x_i]->tag() eq $fields[$x_i-1]->tag()) && (C4::Context->preference('LabelMARCView') eq 'economical')) {
+				$tag_data{tag}="";
+			} else {
+				if (C4::Context->preference('hide_marc')) {
+					$tag_data{tag}=$tagslib->{$fields[$x_i]->tag()}->{lib};
+				} else {
+					$tag_data{tag}=$fields[$x_i]->tag().' -'. $tagslib->{$fields[$x_i]->tag()}->{lib};
+				}
+			}
 			my @tmp = @subfields_data;
 			$tag_data{subfield} = \@tmp;
 			push (@loop_data, \%tag_data);
@@ -211,9 +215,9 @@ foreach my $subfield_code (keys(%witness)) {
 }
 
 $template->param(item_loop => \@item_value_loop,
-						item_header_loop => \@header_value_loop,
-#						bibid => $bibid,
-						biblionumber => $biblionumber);
+				item_header_loop => \@header_value_loop,
+				biblionumber => $biblionumber
+);
 output_html_with_http_headers $query, $cookie, $template->output;
 
 sub get_authorised_value_desc ($$$$$) {
diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 35c61f1ec7..06d9595b9b 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -60,10 +60,7 @@ foreach my $row (@$accts) {
 
 
 $template->param( ACCOUNT_LINES => $accts,
-			     LibraryName => C4::Context->preference("LibraryName"),
-				suggestion => C4::Context->preference("suggestion"),
-				virtualshelves => C4::Context->preference("virtualshelves")
- );
+);
 
 $template->param( total => sprintf("%.2f",$total) );
 
-- 
2.39.2