[Koha-cvs] koha/C4 SearchMarc.pm [rel_2_2]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Joshua Ferraro <kados at savannah.gnu.org>	06/04/13 18:14:34

Modified files:
	C4             : SearchMarc.pm 

Log message:
	bugfix for MARCsubjects fixes cases where no subjects exist but
	getMARCsubjects() was still creating a blank one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/SearchMarc.pm.diff?only_with_tag=rel_2_2&tr1=1.36.2.26&tr2=1.36.2.27&r1=text&r2=text

Patches:
Index: koha/C4/SearchMarc.pm
diff -u koha/C4/SearchMarc.pm:1.36.2.26 koha/C4/SearchMarc.pm:1.36.2.27
--- koha/C4/SearchMarc.pm:1.36.2.26	Sat Apr  8 23:15:29 2006
+++ koha/C4/SearchMarc.pm	Thu Apr 13 18:14:34 2006
@@ -671,9 +671,9 @@
 	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 @@
 		$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;