--- trunk/conf/normalize/ff-peri.pl	2007/09/06 19:12:31	890
+++ trunk/conf/normalize/ff-peri.pl	2007/10/10 21:00:48	903
@@ -27,7 +27,7 @@
 
 ## 008 - All materials
 marc_fixed('008','00', '070707');	# Date entered on file
-marc_fixed('008','06', 's');		# Type of date/Publication status
+marc_fixed('008','06', 't');		# Type of date/Publication status
 if ( rec('11') ) {
 	if ( my $lookup = lookup(
 			sub { rec('210','d') },
@@ -43,7 +43,8 @@
 		);
 	}
 }					# Date 1
-marc_fixed('008','11', ' ');		# Date 2
+
+# marc_fixed('008','11', ' ');		# Date 2
 marc_fixed('008','15', 
 	lc ( rec('102') ) 
 ); 				# Place of publication, production, or execution
@@ -55,7 +56,7 @@
 
 
 ## 008 - Continuing resources
-marc_fixed('008','18', '|');	# Frequency
+marc_fixed('008','18', '|');	# Frequency - ovo treba popuniti iz polja 326
 marc_fixed('008','19', '|'); 	# Regularity
 marc_fixed('008','21', 'p');	# Type of continuing resource
 marc_fixed('008','29', '|');	# Conference publication
@@ -64,11 +65,18 @@
 
 
 ## 022
-if ( ! rec('225','a') ) {
-	marc('022','a',
-		rec('11')
-	);
-}
+# if ( ! rec('225','a') ) {
+#	marc('022','a',
+#		rec('11')
+#	);
+# }
+#
+
+## 022
+marc('022','a',
+	rec('11')
+);
+
 
 # privemeno koristimo 0356 umjesto 0359, zato što marclint 9 prijavljuje kao grešku
 
@@ -105,15 +113,20 @@
 ## 044 - zemlja izdavanja
 
 if ( rec('11') ) {
-	marc('044','a',
-		lookup(
+	if ( my $lookup = lookup(
 			sub { rec('102','a') },
 			'nsk','bbaza',
 			sub { first( rec('011','a') ) },
 			sub { rec('11') },
-		),
-	);
-}
+		)
+	) {
+		marc('044','a', $lookup	);
+	} else {
+		marc('044','a',
+			rec('102')
+		);
+	}
+} 
 
 marc('080','a',
 	rec('675','a')