--- search/Search.cgi	2002/06/16 19:39:44	1.4
+++ search/Search.cgi	2002/06/24 13:47:06	1.5
@@ -181,23 +181,6 @@
 #
 
 
-# List of default configuration settings
-%main::DefaultSettings = (
-	'lowest-year',	'1990',
-	'max-score',	'1000',
-	'allow-summary-displays','no',
-	'allow-similiar-search','no',
-	'allow-regular-searches','no',
-	'deliver-empty-results-from-regular-search','no',
-#	'allow-relevance-feedback-searches','no',
-	'mailer-application','/usr/lib/sendmail',
-	'server-log','mps.log',
-	'output-colums','yes',
-	'show-nr-colums',3,
-	'show-past-date-list','no',
-	'database-for-SearchFieldDescriptions','ps',
-);
-
 # read configuration fields
 require "config.pm";
 
@@ -435,8 +418,11 @@
 
 	# Send the banner
 	print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=100%>\n");
-	print("<TR><TD VALIGN=TOP ALIGN=RIGHT> <A HREF=\"/\" OnMouseOver=\"self.status='Return Home'; return true\"><IMG SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'banner'}\" ALT=\"Return Home\" BORDER=0></A> </TD></TR>\n"); 
-	print("</TABLE>\n");
+#	print("<TR><TD VALIGN=TOP ALIGN=RIGHT> <A HREF=\"/\" OnMouseOver=\"self.status='Return Home'; return true\"><IMG SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'banner'}\" ALT=\"Return Home\" BORDER=0></A> </TD></TR>\n"); 
+
+        print("<TR><TD VALIGN=TOP ALIGN=RIGHT> <A HREF=\"/\" OnMouseOver=\"self.status='Return Home'; return true\"><H3>Katalozi knjižnica Filozofskog fakulteta</H3> </A> </TD></TR>\n");
+
+        print("</TABLE>\n");
 		
 
 	# Set the flag saying that the header has been sent
@@ -535,11 +521,15 @@
 
 	if ( %MenuBar && defined($MenuBar{'GetSearch'}) ) {
 		print("<IMG SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'inactive-search'}\" ALT=\"Search\" BORDER=0>");
+
+
 	}
 	else {
+
 		print("<INPUT NAME=\"GetSearch\" TYPE=IMAGE SRC=\"$main::ConfigurationData{'image-base-path'}/$main::ImageNames{'active-search'}\" ALT=\"Search\" BORDER=0>");
 
-	
+
+
 	}
 
 	if ( defined($main::RemoteUser) ) {
@@ -2698,12 +2688,13 @@
 			# Put up the headline and the score, this one links to the document
 			if ( $HTML ) {
 				print("<!-- resultItem -->\n");
-				print("<TR><TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> $SelectorText </TD> <TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> <!-- relevance --> <B> $Score </B> <!-- /relevance --> </TD> <TD ALIGN=LEFT VALIGN=TOP> <A HREF=\"$LinkText\" OnMouseOver=\"self.status='Retrieve this document'; return true\"> $Headline <I> ( $main::DatabaseDescriptions{$Database} ) </I> </A> <BR> <FONT SIZE=-2>");
-			}
-			else {
+				#print("<TR><TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> $SelectorText </TD> <TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> <!-- relevance --> <B> $Score </B> <!-- /relevance --> </TD> <TD ALIGN=LEFT VALIGN=TOP> <A HREF=\"$LinkText\" OnMouseOver=\"self.status='Retrieve this document'; return true\"> $Headline <I> ( $main::DatabaseDescriptions{$Database} ) </I> </A> <BR> <FONT SIZE=-2>");
+				print("<TR><TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> $SelectorText </TD><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> <A HREF=\"$LinkText\" OnMouseOver=\"self.status='Retrieve this document'; return true\"> $Headline </A> <BR> <FONT SIZE=-2>&nbsp;");
+			} else {
 				printf("%3d $Headline ($main::DatabaseDescriptions{$Database})\n", $Score);
 			}
 
+if (0) { ## don't display description
 
 			# Put up the summary
 			if ( defined($SummaryText) && ($SummaryText ne "") ) {
@@ -2720,6 +2711,7 @@
 			if ( ! defined($Remainder) ) {
 				if ( $HTML ) {
 					print("Formatttt: $MimeTypeName, ");
+			
 				}
 				else {
 					print("    Format: $MimeTypeName, ");
@@ -2728,11 +2720,11 @@
 
 
 			# Put up the date if we got it
-			if ( defined($Date) && ($Date ne "") ) {
+			 if ( defined($Date) && ($Date ne "") ) {
 				print("Date: $Date");
 				
 				# Put up the time if we got it
-				if ( defined($Time) && ($Time ne "") ) {
+				 if ( defined($Time) && ($Time ne "") ) {
 					print(" $Time");
 				}
 				
@@ -2863,6 +2855,7 @@
 				}
 				print("\n");
 
+} #if
 				# Finish off the entry
 				if ( $HTML ) {
 					print("</FONT></TD></TR>\n");
@@ -3093,7 +3086,8 @@
 	# Database selection
 	if ( %main::DatabaseDescriptions ) {
 
-		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> Odaberite bazu koju želite pretraživati: </TD> <TD ALIGN=LEFT VALIGN=TOP>\n");
+		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=3> Odaberite bazu koju želite pretraživati: </TD></TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=4>
+		");
 		
 		# Parse out the database names and put them into a
 		# hash table, they should be separated with a '\0'