--- search/Search.cgi	2002/06/16 18:11:16	1.3
+++ search/Search.cgi	2002/06/16 19:39:44	1.4
@@ -12,6 +12,8 @@
 #  of FS Consulting, Inc.													 *
 #*****************************************************************************
 
+#print "Content-type: text/plain\n\n";
+
 #--------------------------------------------------------------------------
 #
 # Author: Francois Schiettecatte (FS Consulting, Inc.)
@@ -192,12 +194,12 @@
 	'server-log','mps.log',
 	'output-colums','yes',
 	'show-nr-colums',3,
-#	'show-past-date-list','yes',
+	'show-past-date-list','no',
 	'database-for-SearchFieldDescriptions','ps',
 );
 
 # read configuration fields
-require "config.pl";
+require "config.pm";
 
 # List of required configuration settings
 @main::RequiredSettings = (
@@ -408,7 +410,7 @@
 	if ( ! $ENV{'GATEWAY_INTERFACE'} ) {
 		return;
 	}
-	
+
 	# Bail if we have already sent the header
 	if ( $main::HeaderSent ) {
 		return;
@@ -3056,10 +3058,19 @@
 		print ("<SELECT NAME=\"FieldName${field}\">");
 		for (my $i=0; $i<=$#SearchFieldNames; $i++) {
 			my $ItemEntry = $SearchFieldNames[$i];
-			my $Selected = ($main::FormData{"FieldName${field}"} == $ItemEntry || $i == ($field-1)) ? "SELECTED" : "";
+			my $Selected = "";
+			if ($main::FormData{"FieldName${field}"} && $main::FormData{"FieldName${field}"} eq $ItemEntry) {
+				$Selected = "SELECTED";
+			} elsif ($i == ($field - 1)) {
+				$Selected = "SELECTED";
+			}
+				
 			print("<OPTION VALUE=\"$ItemEntry\" $Selected> $main::SearchFieldDescriptions{$ItemEntry}\n");
 		}
-		my $Value = defined($main::FormData{"FieldContent${field}"}) ? "VALUE='".$main::FormData{"FieldContent${field}"}."'" : "";
+		my $Value = "";
+		if (defined($main::FormData{"FieldContent${field}"})) {
+			$Value = "VALUE='".$main::FormData{"FieldContent${field}"}."'";
+		}
 		print("</SELECT></TD><TD ALIGN=LEFT><INPUT NAME=\"FieldContent${field}\" TYPE=TEXT $Value SIZE=45> </TD></TR>\n");
 	}
 
@@ -3128,7 +3139,7 @@
 			for(my $i=0; $i <= $next ; $i++) {
 				print("<tr>");
 				for(my $j=0; $j <= $cols; $j++) {
-					print($html_database[$i+$next*$j+$j]);
+					print($html_database[$i+$next*$j+$j] || '');
 				}
 				print("</tr>");
 			}
@@ -7458,7 +7469,6 @@
 		foreach my $FieldInformation ( split(/\n/, $Text) ) {
 			my ($FieldName, $FieldDescription, undef) = split(/\t/, $FieldInformation, 3);
 			$main::SearchFieldDescriptions{$FieldName} = $FieldDescription;
-			print "-- $FieldName --<br>\n";
 		}
 	}
 }