--- trunk/conf/normalize/ff-libri.pl	2007/11/02 13:00:55	964
+++ trunk/conf/normalize/ff-libri.pl	2007/11/10 11:02:37	1020
@@ -1,17 +1,18 @@
-#########################################################################
+##########################################################################
 ##									##
 ## Ova datoteka sadrži pravila za generiranje MARC21 ISO 2709 izlazne   ##
-## datoteke. Ulazni format je CDS/ISIS sa zapisima u UNIMARC-u.		##
+## datoteke. Ulazni format je CDS/ISIS izvorni format, sa zapisima u    ##
+## UNIMARC formatu, sa višestrukim odstupanjima od standarda.		##
 ##									##	
 ##########################################################################
 
-# konvertira se ako postoji polje 200^a
+## konvertira se ako postoji polje 200^a
 
 if ( rec('200','a') ) {
 
 ### LEADER
-# raspraviti 17,18
-# u nekim knjižnicama koristi se 999a i 999b, a u nekima samo 999
+## raspraviti 17,18
+## u nekim knjižnicama koristi se 999a i 999b, a u nekima samo 999
 
 if ( rec('999') && first(rec('999')) =~ m/(pregledan|P)/i) {
 	marc_leader('05','c');
@@ -19,12 +20,13 @@
 	marc_leader('05','n');
 }
 
-# moguća je i oznaka "m" u 06 - odrediti kriterije
+## moguća je i oznaka "m" u 06 - odrediti kriterije
+
 	marc_leader('06','a');
 	marc_leader('07','m');
 	marc_leader('18','i');
 
-# pojasniti upotrebu 19 lidera!
+## pojasniti upotrebu 19 lidera!
 
 if ( rec('230') ) {
 	marc_leader('19','r');
@@ -33,7 +35,7 @@
 ### 001 - Voyager
 
 ### 003
-# Pojasniti upotrebu polja
+## Pojasniti upotrebu polja
 
 ### 007
 # pojasniti upotrebu polja
@@ -74,10 +76,9 @@
 marc_fixed('008','35',
 	first( lc(rec('101')) )		# 35-37 - Language
 );
-marc_fixed('008','38', '|');		# 38 - Modified record
+					# 38 - Modified record
 marc_fixed('008','39','d');		# 39 - Cataloging source
 
-
 ### 008 - Books
 
 					# 18-21 - Illustrations
@@ -96,12 +97,19 @@
 ### 020
 # postoji modify -> drugi ISBN počinje prefixom "ISBN" koji se miče (sfb)
 
-marc('020','a',
-	regex('s/\s*[\\r\\n]+\s*\**\s*/ ; /g',
-		rec('10')
-	)
-);
+if ( frec('10') ne ( frec('290') ) ) {
+	marc('020','a', 
+		regex('s/-//g',
+			rec('10')
+		)
+	); 
+}
 
+#warn( 
+#	dump(
+#		frec('10')
+#	),
+#);
 
 ### 035$6
 # Privemeno koristimo 035$6 umjesto 035$9, zato što marclint prijavljuje 9 kao grešku.
@@ -154,8 +162,13 @@
 # ????
 
 
-#if ( rec('675') =~ m/\d=\d/ ) {
-if ( grep( m/prijevod/i, rec('300')) || grep( m/prevedeno/i, rec('300')) || grep( m/izv.*stv.*nasl/i, rec('300')) || grep( m/izvornik/i, rec('300')) || grep( m/preve/i, rec('200','f')) || grep( m/preve/i, rec('200','g')) || grep( m/prijevod/i, rec('200','f')) || grep( m/prijevod/i, rec('200','g')) ) {
+#if ( rec('675') =~ m/\d=\d/ ) ??
+
+if ( 
+	grep( m/[prijevod|prevedeno|izv.*stv.*nasl|izvornik]/i, rec('300') ) || 
+	grep( m/[preve|prijevod]/i, rec('200','f')) || 
+	grep( m/[preve|prijevod]/i, rec('200','g'))  
+) {
 	marc_indicators('041', 1, ' ');
 } else {
 	marc_indicators('041', 0, ' ');
@@ -168,7 +181,7 @@
 #_debug(2);
 
 marc_repeatable_subfield('041','a',
-	lc( rec('101') )
+	map { lc($_) } rec('101')
 );
 
 #_debug(0);
@@ -302,15 +315,22 @@
 if ( 	( rec('200','a') =~ m/^Die /) || 
 	( rec('200','a') =~ m/^Das /) || 
 	( rec('200','a') =~ m/^Der /) || 
+	( rec('200','a') =~ m/^Les /) || 
 	( rec('200','a') =~ m/^The /) ) {
 		marc_indicators('245', $i1, 4);
+
 } 
 
-if ( 	( rec('200','a') =~ m/^A /) && ( rec(101) =~ m/ENG/ ) ) {
-		marc_indicators('245', $i1, 2);
+if (	( rec('200','a') =~ m/^Un /) || 
+	( rec('200','a') =~ m/^An /) ||
+	( rec('200','a') =~ m/^La /) ||
+	( rec('200','a') =~ m/^Le /) ||
+	( rec('200','a') =~ m/^Il /) ) {
+		marc_indicators('245', $i1, 3);
 } 
 
-if ( 	( rec('200','a') =~ m/^An /) && ( rec(101) =~ m/ENG/ ) ) {
+if (	( rec('200','a') =~ m/^A /) || 
+	( rec('200','a') =~ m/^L'/) ) {
 		marc_indicators('245', $i1, 2);
 } 
 
@@ -349,7 +369,10 @@
 	'c', suffix(
 		( rec('200','f') && rec('200','c') ) ? '.' :
 			'',
-			rec('200','f'),
+			join_with(' ; ',
+				rec('200','f'),
+				rec('200','g')
+			)
 	),
 	'+', suffix('.',
 		rec('200','c'),
@@ -495,30 +518,71 @@
 #_debug(3);
 
 ### 440
+## marc_compose radi samo kad polje ni potpolja nisu ponovljivi
+
+
+marc_template(
+	from => 225, to => 440,
+	subfields_rename => [
+		'a' => 'a',
+	 	'x' => 'x',
+		'v' => 'v',
+		'h' => 'n',
+		'i' => 'p',
+		'w' => 'v',
+	],
+	marc_template => [
+		'a',
+		'a ;|v',
+		'a.|p',
+		'a, |x ;|v.|n,|p ;|v',
+		'a ;|v.|p ;|v',
+		'a.|p ;|v',
+		'v',
+	],
+);
 
-marc_original_order('440','225');
 
 #marc_compose('440',
 #	'a', suffix(
-#		rec('225','i') ? '. ' :
+#		( rec('225','v') ) ? ' ;' :
+#		( rec('225','w') ) ? ' ; ' :
+#		( rec('225','x') ) ? ',' :
+#		( rec('225','h') || rec('225','i') ) ? '.' :
+#			'.',
+#			frec('225','a')
+#	),
+#	'x',suffix(
+#		( rec('225','x') && ( rec('225','h') || rec('225','i') ) ) ? '.' :
 #			'',
-#			rec('225','a'),
+#			frec('225','x')
 #	),
-#	'p', suffix(
-#		( ! rec('225','x') && rec('225','i') && rec('225','v') ) ? ' ; ' :
-#		( rec('225','i') && rec('225','x') ) ? ', '  :
+#	'v',suffix(
+#		( rec('225','v') && ( rec('225','h') || rec('225','i') ) ) ? '.' :
+#		( rec('225','v') && rec('225','w') ) ? ' ; ' :
 #			'',
-#			rec('225','i'),
+#			frec('225','v')
 #	),
-#	'x', suffix(
-#		( rec('225','x') && rec('225','v') ) ? ' ; ' :
+#	'n',suffix(
+#		( rec('225','h') && rec('225','i') ) ? ',' :
+#		( rec('225','h') && rec('225','w') ) ? ' ; ' :
 #			'',
-#			rec('225','x'),
+#			frec('225','h')
 #	),
-#	'v', rec('225','v'),
+#	'p',suffix(
+#		( rec('225','i') && rec('225','w') ) ? ' ; ' :
+#		( rec('225','i') && rec('225','x') ) ? ',' :
+#			'',
+#			frec('225','i')
+#	),
+### 225w treba ici u 440v, na kraj
+#	'+', join_with(' ; ',
+#		rec('225','w'),
+#	)
 #);
 
-## ovo radi samo kad 225 nije ponovljivo
+#marc_original_order('440','225');
+
 
 #if (
 #	count( lookup(
@@ -528,99 +592,6 @@
 #	) ) > 1
 #) {
 
-#marc_compose('440',
-#	'a', suffix(
-# 		( rec('225','x') ) ? ', '  :
-# 		( rec('225','v') || rec('225','w') ) ? ' ; ' :
-# 		( rec('225','h') || rec('225','i') ) ? '. '  :
-# 			'',
-# 			join_with(' / ',
-# 				join_with(' : ',
-# 					join_with(' = ',
-# 						rec('225','a'),
-# 						rec('225','d'),
-# 					),
-# 					rec('225','e'),
-# 				),
-# 				rec('225','f'),
-# 			),
-# 	),
-# 	'x', suffix(
-# 		( rec('225','x') && rec('225','v') ) ? ' ; ' :
-# 		( rec('225','x') && ( rec('225','h') || rec('225','i') ) ) ? '. ' :
-# 			'',
-# 			rec('225','x'),
-# 	),
-# 	'v', suffix(
-# 		( rec('225','v') && rec('225','h') || rec('225','i') ) ? '. ' :
-# 			'',
-#			join_with('; ',
-# 				rec('225','v'),
-#			)
-# 	),
-# 	'n', suffix(
-# 		( rec('225','h') && rec('225','p') || rec('225','y') ) ? ', ' :
-# 			'',
-# 			rec('225','h'),
-# 	),
-# 	'p', suffix(
-# 		( rec('225','i') && rec('225','x') ) ? ', ' :
-# 		( rec('225','i') && rec('225','v') ) ? ' ; ' :
-# 			'',
-# 			rec('225','i'),
-# 	),
-# 	'x', suffix(
-# 		( rec('225','y') && rec('225','v') ) ? ' ; ' :
-# 			'',
-# 			rec('225','y'),
-# 	),
-# 	'v', rec('225','w'),
-# );
-# 
-# marc_compose('440',
-# 	'a', suffix(
-# 		rec('225','k') ? ' ; ' :
-# 			'',
-# 			join_with(' / ',
-# 				rec('225','b'),
-# 				rec('225','j')
-# 			),
-# 	),
-# 	'v',
-# 		rec('225','k'),
-# );
-# 
-# 
-# marc_compose('440',
-# 	'a', suffix(
-# 		rec('225','s') ? ' ; ' :
-# 			'',
-# 			join_with(' / ',
-# 				rec('225','c'),
-# 				rec('225','r')
-# 			),
-# 	),
-# 	'v',
-# 		rec('225','s'),
-# );
-
-#}
-
-#if ( rec('225','i') ) {
-#	marc('440','p',
-#		prefix('. ',
-#			rec('225','i')
-#		),
-#	);
-#}
-#
-#if ( rec('225','v') ) {
-#	marc('440','v',
-#		prefix(' ; ',
-#			rec('225','v'),
-#		),
-#	);
-#}
 
 #_debug(0);