--- trunk/conf/normalize/ff-nakladnicka.pl	2007/05/18 20:27:21	824
+++ trunk/conf/normalize/ff-nakladnicka.pl	2007/08/23 19:21:23	876
@@ -31,16 +31,17 @@
 
 $series = join_with('',
 	config(),
-	'LS',
+	' LS',
 	rec('000')
 );
 
-#set( $series_key => $series );
+set( $series_key => $series );
 
 # Leader
 marc_leader('05','n');
 marc_leader('06','a');
 marc_leader('07','s');
+marc_leader('17','7');
 marc_leader('18','i');
 
 ## 008 
@@ -109,24 +110,51 @@
 
 marc_compose('245',
 	'a', suffix(
-		( ! rec('225','p') && ( rec('225','f') || rec('225','c') ) ) ? ' / ' :  
-		( rec('225','p') && rec('225','c') ) ? ' : '  : 
+		( ! ( rec('225','d') || rec('225','e') ) ) && ( rec('225','f') ) ? ' / ' :  
+		( rec('225','d') ) ? ' = ' :
+		( rec('225','e') ) ? ' : ' :
+		( rec('225','i') ) ? '. ' :
 			'', 
-			first(rec('225','a')),
+			rec('225','a'),
 	),
 	'b', suffix(
-		( rec('225','p') && rec('225','f') ) ? ' / ' : 
-		( rec('225','p') && rec('225','c') ) ? '. '  : 
+		( rec('225','d') && rec('225','f') ) ? ' / ' : 
 			'',
-			rec('225','p'),
+			rec('225','d'),
+	),
+	'b', suffix(
+		( rec('225','e') && rec('225','f') ) ? ' / ' : 
+			'',
+			rec('225','e'),
 	),
 	'c', suffix(
-		( rec('225','f') && rec('225','c') ) ? '. ' :
+		( rec('225','f') && rec('225','i') ) ? '. ' :
 			'',
 			rec('225','f'),
 	),
+	'p', rec('225','i'),
 );
 
+#marc_compose('245',
+#	'a', suffix(
+#		( ! rec('225','p') && ( rec('225','f') || rec('225','c') ) ) ? ' / ' :  
+#		( rec('225','p') && rec('225','c') ) ? ' : '  : 
+#			'', 
+#			first(rec('225','a')),
+#	),
+#	'b', suffix(
+#		( rec('225','p') && rec('225','f') ) ? ' / ' : 
+#		( rec('225','p') && rec('225','c') ) ? '. '  : 
+#			'',
+#			rec('225','p'),
+#	),
+#	'c', suffix(
+#		( rec('225','f') && rec('225','c') ) ? '. ' :
+#			'',
+#			rec('225','f'),
+#	),
+#);
+
 marc_original_order('260', '210');
 
 marc_remove('260','c');
@@ -146,10 +174,10 @@
 
 #_debug(0);
 
-marc_duplicate();
-marc_remove('*');
+#marc_duplicate();
+#marc_remove('*');
 
 
 } # $series
 
-}
+} # nakladnička cjelina