[Koha-cvs] koha/search.marc search.pl [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	paul poulain <tipaul>	06/09/18 13:46:25

Modified files:
	search.marc    : search.pl 

Log message:
	synching opac search & librarian search from friday was a little bit erroneous. fixed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/search.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.22.2.13&r2=1.22.2.14

Patches:
Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/Attic/search.pl,v
retrieving revision 1.22.2.13
retrieving revision 1.22.2.14
diff -u -b -r1.22.2.13 -r1.22.2.14
--- search.pl	13 Sep 2006 14:16:37 -0000	1.22.2.13
+++ search.pl	18 Sep 2006 13:46:24 -0000	1.22.2.14
@@ -127,24 +127,24 @@
 		if ($marclist[$i] eq "biblioitems.isbn") {
 			$value[$i] =~ s/-//g;
 		}
-# 		if ($marc) {
-# 			my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marc,'');
-# 			if ($tag) {
-# 				push @tags,$dbh->quote("$tag$subfield");
-# 			} else {
-# 				if ($marc =~ /^(\d){3}(. -)(.)*/)
-# 				{
-# 					# The user is using the search catalogue part, more fields
-# 					push @tags, $dbh->quote(substr($marc,0,4));
-# 				}
-# 				else
-# 				{
-# 					push @tags, $marc;
-# 				}
-# 			}
-# 		} else {
-# 			push @tags, "";
-# 		}
+		if ($marclist[$i]) {
+			my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marclist[$i],'');
+			if ($tag) {
+				push @tags,$dbh->quote("$tag$subfield");
+			} else {
+				if ($marclist[$i] =~ /^(\d){3}(. -)(.)*/)
+				{
+					# The user is using the search catalogue part, more fields
+					push @tags, $dbh->quote(substr($marclist[$i],0,4));
+				}
+				else
+				{
+					push @tags, $marclist[$i];
+				}
+			}
+		} else {
+			push @tags, "";
+		}
 	}
 	findseealso($dbh,\@tags);
 	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,