--- search/filters/default.pl	2002/06/14 18:10:27	1.2
+++ search/filters/default.pl	2002/06/16 18:11:18	1.3
@@ -34,123 +34,7 @@
 # Application Constants
 #
 
-# Field Names
-%default::FieldNames = ( 	
-	'700+',	'Autor(i)',
-	'200',	'Naslov',
-	'205',	'Izdanje',
-	'210',	'Izdavanje',
-	'215',	'Materijalni opis',
-	'225',	'Nakladnička cjelina',
-	'300+',	'Napomena',
-	'330',	'Sadržaj',
-	'423',	'Prikriveni radovi',
-	'464',	'Analitički radovi',
-	'610',	'Ključne riječi',
-	'675+',	'Klasifik. oznaka',
-	'990',	'Signatura',
-	'991',  'Inventarni broj',
-	'ISBN',	'ISBN',
-	'MFN',	'MFN',
-	'994a',	'Knjižnica',
-
-
-	'A',	'Author(s)',
-	'B',	'Book',
-	'C',	'City',
-	'D',	'Date',
-	'E',	'Editor',
-	'F',	'Footnote',
-	'G',	'Order Info',
-	'H',	'Commentary',
-	'I',	'Publisher',
-	'J',	'Journal',
-	'K',	'Keyword',
-	'L',	'Label',
-	'M',	'Bell',
-	'N',	'Issue',
-	'O',	'Other',
-	'P',	'Page',
-	'Q',	'Corporate',
-	'R',	'Report',
-	'S',	'Series',
-	'T',	'Title',
-	'U',	'Annotation',
-	'V',	'Volume',
-	'W',	'URL',
-	'X',	'Abstract',
-	'Y',	'Table of Contents',
-	'Z',	'Reference',
-	'$',	'Price',
-	'*',	'Copyright',
-	'^',	'Parts',
-);
-
-
-
-# Field Display Order
-@default::FieldDisplayOrder = (
-	'ISBN',
-	'700+',
-	'200',
-	'205',
-	'210',
-	'215',
-	'225',
-	'300+',
-	'330',
-	'423',
-	'464',
-	'610',
-	'675+',
-	'990',
-	'991',
-	'MFN',
-	'994a',
-
-	'M',
-	'L',
-	'T',
-	'S',
-	'E',
-	'Q',
-	'A',
-	'J',
-	'B',
-	'D',
-	'V',
-	'N',
-	'P',
-	'C',
-	'I',
-	'G',
-	'$',
-	'K',
-	'*',
-	'W',
-	'O',
-	'Y',
-	'X',
-	'R',
-	'.',
-	'F',
-	'H',
-	'U',
-	'Z',
-	'^'
-);
-
-# separators
-%default::Separator = (
-	'700+',	', ',
-	'990',	' ',
-	'991', ', ',
-	'300+', '.- ',
-	'225', ', ',
-	'610', ' * ',
-
-	 
-);
+require "../config.pl";
 
 #--------------------------------------------------------------------------
 #
@@ -256,9 +140,17 @@
 		# Print the row start
 		$DocumentFinal .= "<TR><TD VALIGN=TOP ALIGN=RIGHT BGCOLOR=\"#EEEEEE\" WIDTH=\"130\"> $default::FieldNames{$FieldTag}: </TD><TD VALIGN=TOP ALIGN=LEFT> ";
 
-		$Document{$FieldTag} =~ s/&/&and;/g;
-		$Document{$FieldTag} =~ s/</&lt;/g;
-		$Document{$FieldTag} =~ s/>/&gt;/g;
+		sub html_enc {
+			my $tmp = $_[0];
+			$tmp =~ s/&/&and;/g;
+			$tmp =~ s/</&lt;/g;
+			$tmp =~ s/>/&gt;/g;
+			# fix some tags
+			$tmp =~ s/&lt;br&gt;/<br>/gi;
+			return $tmp;
+		}
+
+		$Document{$FieldTag} = html_enc($Document{$FieldTag});
 
 		# Print the field data, marking up if needed
 		if ( $FieldTag eq "A" || $FieldTag eq "E" ) {