--- trunk/conf/normalize/ff-nakladnicka.pl	2007/04/05 21:48:41	816
+++ trunk/conf/normalize/ff-nakladnicka.pl	2007/05/18 20:27:21	824
@@ -29,24 +29,32 @@
 } else {
 
 
-$series = join_with(' ',
+$series = join_with('',
 	config(),
 	'LS',
 	rec('000')
 );
 
-set( $series_key => $series );
+#set( $series_key => $series );
 
 # Leader
 marc_leader('05','n');
 marc_leader('06','a');
-marc_leader('07','c');
+marc_leader('07','s');
 marc_leader('18','i');
 
 ## 008 
 
+marc_fixed('008',00,
+	'070401'
+);
+
 marc_fixed('008','35',
-	first( rec('101') )
+	first( lc( rec('101') ) )
+);
+
+marc('022','a',
+	rec('225','x')
 );
 
 marc('035','6', $series );
@@ -99,25 +107,22 @@
 
 ## 245
 
-marc('245',
+marc_compose('245',
 	'a', suffix(
-		( ! rec('225','b') && rec('225','f') ) ? ' / ' : 
-		rec('225','c') ? ' / ' : ' ',
-			rec('225','a'),
-	)
-);
-marc('245',
+		( ! rec('225','p') && ( rec('225','f') || rec('225','c') ) ) ? ' / ' :  
+		( rec('225','p') && rec('225','c') ) ? ' : '  : 
+			'', 
+			first(rec('225','a')),
+	),
 	'b', suffix(
-		( rec('225','b') && rec('225','f') ) ? ' / ' : 
-		( rec('225','b') && rec('225','c') ) ? '. '  : 
-			' ',
-			rec('225','b'),
+		( rec('225','p') && rec('225','f') ) ? ' / ' : 
+		( rec('225','p') && rec('225','c') ) ? '. '  : 
+			'',
+			rec('225','p'),
 	),
-);
-marc('245',
 	'c', suffix(
 		( rec('225','f') && rec('225','c') ) ? '. ' :
-			' ',
+			'',
 			rec('225','f'),
 	),
 );