--- common.pm	2002/06/16 18:11:14	1.3
+++ common.pm	2002/06/24 18:07:26	1.8
@@ -23,11 +23,14 @@
 F 686 10 CC
 F 990 11 Signatura
 F 991 12 Inventarni broj
-F 10 13 ISBN
+F ISBN 13 ISBN
 F MFN 14 MFN
 F 215+ 15 Materijalni opis
+F 101 16 Jezik
 ";
 
+$common::database_cf="/local/search/databases.cf";
+
 #--------------------------------------------------------------------
 #
 # mps_expand(nr,"space separated string");
@@ -38,9 +41,27 @@
 	my $out = "";
 	while (my $fld = shift @_) {
 		if ($fld =~ s/\s*[,;\.!?'"<>\[\]]*\s+/ /g) {
+			$fld =~ s/></ /g;
 			foreach my $w (split(/\s+/,$fld)) {
 				# FIX: this should be replaced by stemmer!
-				$out .= "W $w $nr\n";
+				# remove chars from beginning of word
+				$w =~ s/^['"<(\[]//g;
+				# remove chars from end of word
+				$w =~ s/[,;\.!?'">)\]]$//g;
+				# preglasi φΦδΔόά -> ”™„Žš
+				if ($w =~ m/[”™„Žš]/) {
+					$out .= "W $w $nr\n";
+					$w =~ s/[”™]/oe/g;
+					$w =~ s/[„Ž]/ae/g;
+					$w =~ s/[š]/ue/g;
+					$out .= "W $w $nr\n";
+				# Irish Last names
+				} elsif (($nr == 1 || $nr == 2 || $nr == 3 || $nr == 6 || $nr == 7 || $nr == 8) && $w =~ m/^Ma?c([A-Z].+)/) {
+					$out .= "W Mc$1 $nr\n";
+					$out .= "W Mac$1 $nr\n";
+				} else {
+					$out .= "W $w $nr\n";
+				}
 			}
 		} else {
 			$out .= "W $fld $nr\n";