--- trunk/conf/normalize/ff-libri.pl	2007/04/05 21:48:41	816
+++ trunk/conf/normalize/ff-libri.pl	2007/05/18 20:27:21	824
@@ -57,7 +57,7 @@
 ## FIXME treba velika slova pretvoriti u mala
 
 marc_fixed('008','35',
-	first( rec('101') )
+	first( lc(rec('101')) )
 );
 
 
@@ -69,7 +69,7 @@
 
 
 marc('035','6',
-join_with(' ',
+join_with('',
 #		config('input normalize path'),
 #		config('name'),
 		config(),
@@ -225,6 +225,7 @@
 
 if ( 	( rec('200','a') =~ m/^Die /) || 
 	( rec('200','a') =~ m/^Das /) || 
+	( rec('200','a') =~ m/^Der /) || 
 	( rec('200','a') =~ m/^The /) ) {
 		marc_indicators('245', $i1, 4);
 } 
@@ -245,18 +246,20 @@
 
 marc_compose('245',
 	'a', suffix(
-		( ! rec('200','b') && ( rec('200','f') || rec('200','c') ) ) ? ' / ' : ' ', 
+		( ! rec('200','p') && ( rec('200','f') || rec('200','c') ) ) ? ' / ' :  
+		( rec('200','p') && rec('200','c') ) ? ' : '  : 
+			'', 
 			rec('200','a'),
 	),
 	'b', suffix(
-		( rec('200','b') && rec('200','f') ) ? ' / ' : 
-		( rec('200','b') && rec('200','c') ) ? '. '  : 
-			' ',
-			rec('200','b'),
+		( rec('200','p') && rec('200','f') ) ? ' / ' : 
+		( rec('200','p') && rec('200','c') ) ? '. '  : 
+			'',
+			rec('200','p'),
 	),
 	'c', suffix(
 		( rec('200','f') && rec('200','c') ) ? '. ' :
-			' ',
+			'',
 			rec('200','f'),
 	),
 	'+', rec('200','c'),
@@ -307,17 +310,18 @@
 
 ### 250
 
-marc('250','a',
-	suffix(
-		rec('205','f') ? ' / ' :
-				 ' '.
+marc_compose('250',
+	'a',suffix(
+		rec('205','f') ? ' / ' : 
+			' ',
 			rec('205','a')
-	)
+	),
+	'b', rec('205','f'),
 );
 
-marc('250','b',
-	rec('205','f')
-);
+#marc('250','b',
+#	rec('205','f')
+#);
 
 
 ### 260
@@ -380,10 +384,24 @@
 		marc_indicators('440', ' ', 2);
 } 
 
-marc('440','a',
-	rec('225','a'),
+#_debug(3);
+
+marc('440',
+	'a', suffix( rec('225','f'),
+			rec('225','a'),
+	),
 );
 
+#	join_with(' / ',
+#		join_with(' ',
+#			rec('225','a'),
+#			rec('225','p'),
+#		),
+#			rec('225','f')
+#	),
+
+#_debug(0);
+
 marc('440','n',
 	rec('225','h')
 );
@@ -642,6 +660,34 @@
 
 ### generiranje zapisa o nakladničkoj cjelini i povezivanje podređenog zapisa s nadređenim
 
+if (
+	rec('225','a')	# da li je nakladnicka cjelina?
+) {
+
+my $series_key =
+join_with('',
+	rec('225','a'),
+	rec('210','a'),
+	rec('210','b'),
+);
+
+my $series = get( $series_key );
+
+if ($series) {
+	warn "nije novi";
+} else {
+
+
+$series = join_with('',
+	config(),
+	'LS',
+	rec('000')
+);
+
+set( $series_key => $series );
+
+}
+}
 
 my $series_key = join_with('',
 	rec('225','a'),
@@ -657,7 +703,6 @@
 		get( $series_key )
 	);
 }
-
 ### testing
 #
 # my $dup_key = join_with('',