From 392d5380e4e6a33ed30005304b852cf63c14c412 Mon Sep 17 00:00:00 2001
From: kados <kados>
Date: Thu, 13 Apr 2006 18:14:34 +0000
Subject: [PATCH] bugfix for MARCsubjects fixes cases where no subjects exist
 but getMARCsubjects() was still creating a blank one.

---
 C4/SearchMarc.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm
index a59916446c..776c304f78 100644
--- a/C4/SearchMarc.pm
+++ b/C4/SearchMarc.pm
@@ -671,9 +671,9 @@ sub getMARCsubjects {
 	my $lasttag;
 	my ($subfieldvalue,$subfieldcode,$tagorder,$tag);
 	while (($subfieldvalue,$subfieldcode,$tagorder,$tag)=$sth->fetchrow) {
-	warn "IN MARCSUBJECTS $subfieldvalue $subfieldcode $tagorder $tag\n";
+	#warn "IN MARCSUBJECTS $subfieldvalue $subfieldcode $tagorder $tag\n";
 		if ($activetagorder && $tagorder != $activetagorder) {
-		warn "ACTIVETAGORDER".$activetagorder;
+	#	warn "ACTIVETAGORDER".$activetagorder;
 			$subject=~ s/ -- $//;
 			$marcsubjct = {MARCSUBJCT => $subject,
 							link => $lasttag."9",
@@ -694,13 +694,14 @@ sub getMARCsubjects {
 		$activetagorder=$tagorder;
 		$lasttag=$tag if $tag;
 	}
-	$subject=~ s/ -- $//;
-	$marcsubjct = {MARCSUBJCT => $subject,
+	if ($subject) {
+		$subject=~ s/ -- $//;
+		$marcsubjct = {MARCSUBJCT => $subject,
 					link => $lasttag."9",
 					linkvalue => $field9,
 					};
-	push @marcsubjcts, $marcsubjct;
-
+		push @marcsubjcts, $marcsubjct;
+	}
 	$sth->finish;
 
 	my $marcsubjctsarray=\@marcsubjcts;