--- trunk/conf/normalize/mapping.pl	2006/08/25 18:06:42	621
+++ trunk/conf/normalize/mapping.pl	2006/08/25 19:22:33	622
@@ -25,7 +25,7 @@
 
 # polje 035 je u NSK ponovljivo. zašto ???
 
-# privemeno koristimo 0356 umjesto 0359
+# privemeno koristimo 0356 umjesto 0359, zato što marclint 9 prijavljuje kao grešku
 
 marc('035','6',
 join_with('',
@@ -45,7 +45,7 @@
 # u FFSF bazama postoji nekoliko zaredanih ISBN, odvojenih s '. - '
 
 marc('020','a',
-	rec('010')
+	rec('10')
 );
 
 # u polje 040a možda još dodati prefiks HR
@@ -85,9 +85,15 @@
 	),
 	'h', rec('200','b'),
 	'b', rec('200','k'),
-	'b', rec('200','d'),
-	'b', rec('200','e'),
-	'c', rec('200','f'),
+	'b', rec('200','d'), 
+	'b', 
+		join_with(' : ',
+			rec('200','e'),
+		),
+	'c', 
+		join_with(' ; ',
+			rec('200','f'),
+		),
 # FIXME append to last subfield
 	'+', prefix('. ', rec('200','c') ),
 );
@@ -368,64 +374,65 @@
 
 
 # višerazinci 
+# 
+# if ( rec('230') ) {
+# 
+# 	marc_duplicate();
+# 	marc_remove('245');
+# 
+# 	marc('245','a',
+# 		rec('230','a')
+# 	);
+# 
+# 	if ( ! rec('230','a') ) {
+# 
+# 		marc('245','a',
+# 			rec('200','a')
+# 		);
+# 	}
+# 
+# 	marc('245','b',
+# 		rec('230','e')
+# 	);
+# 
+# 	marc('245','c',
+# 		rec('230','f')
+# 	);
+# 
+# 	marc('245','n',
+# 		rec('230','v')
+# 	);
+# 
+# }
+# 
+# if ( rec('231') ) {
+# 
+# 	marc_duplicate();
+# 	marc_remove('245');
+# 
+# 	marc('245','a',
+# 		rec('231','a')
+# 	);
+# 
+# 	if ( ! rec('231','a') ) {
+# 
+# 		marc('245','a',
+# 			rec('200','a')
+# 		);
+# 	}
+# 
+# 	marc('245','b',
+# 		rec('231','e')
+# 	);
+# 
+# 	marc('245','c',
+# 		rec('231','f')
+# 	);
+# 
+# 	marc('245','n',
+# 		rec('231','v')
+# 	);
+# 
+# }
 
-if ( rec('230') ) {
-
-	marc_duplicate();
-	marc_remove('245');
-
-	marc('245','a',
-		rec('230','a')
-	);
-
-	if ( ! rec('230','a') ) {
-
-		marc('245','a',
-			rec('200','a')
-		);
-	}
-
-	marc('245','b',
-		rec('230','e')
-	);
-
-	marc('245','c',
-		rec('230','f')
-	);
-
-	marc('245','n',
-		rec('230','v')
-	);
-
-}
-
-if ( rec('231') ) {
-
-	marc_duplicate();
-	marc_remove('245');
-
-	marc('245','a',
-		rec('231','a')
-	);
-
-	if ( ! rec('231','a') ) {
-
-		marc('245','a',
-			rec('200','a')
-		);
-	}
-
-	marc('245','b',
-		rec('231','e')
-	);
-
-	marc('245','c',
-		rec('231','f')
-	);
-
-	marc('245','n',
-		rec('231','v')
-	);
-
-}
 }