--- trunk/conf/normalize/mapping.pl	2006/06/29 22:53:21	546
+++ trunk/conf/normalize/mapping.pl	2006/06/29 23:19:26	547
@@ -1,66 +1,68 @@
-marc21('001',
+marc('001',
 	rec('000')
 );
 
-marc21('020','a',
+marc('020','a',
 	rec('010')
 );
 
-marc21('101','a',
+marc_repeatable_subfield('041','a',
 	rec('101')
 );
 
-marc21('245','a',
+marc_indicators('245', 0, 0);
+
+marc('245','a',
 	rec('200','a')
 );
 
-marc21('245','b',
+marc('245','b',
 	join_with(' : ',
 		rec('200','d'),
 		rec('200','e')
 	)
 );
 
-marc21('245','c',
+marc('245','c',
 	join_with(' ; ',
 		rec('200','f'),
 		rec('200','g')
 	)
 );
 
-marc21('250','a',
+marc('250','a',
 	rec('205','a')
 );
 
-marc21('260','a',
+marc('260','a',
 	rec('210','a')
 );
 
-marc21('260','b',
+marc('260','b',
 	rec('210','c')
 );
 
-marc21('260','c',
+marc('260','c',
 	rec('210','d')
 );
 
-marc21('300','a',
+marc('300','a',
 	rec('215','a')
 );
 
-marc21('300','b',
+marc('300','b',
 	rec('215','c')
 );
 
-marc21('300','c',
+marc('300','c',
 	rec('215','d')
 );
 
-marc21('300','e',
+marc('300','e',
 	rec('215','e')
 );
 
-marc21('490','a',
+marc('490','a',
 	join_with(' = ',
 		rec('225','a'),
 		join_with(" :  ",
@@ -73,30 +75,32 @@
 	)
 );
 
-marc21('490','v',
+marc('490','v',
 	rec('225','v')
 );
 
-marc21('500','a',
+marc('500','a',
 	rec('300')
 );
 
-marc21('504','a',
+marc('504','a',
 	rec('320')
 );
 
-marc21('655','a',
+marc_indicators('655', ' ', 4);
+marc('655','a',
 	rec('610')
 );
 
-marc21('100','a',
+marc_indicators('100', 0, ' ');
+marc('100','a',
 	join_with(', ',
 		rec('700', 'a'),
 		rec('700', 'b')
 	)
 );
 
-marc21('700','a',
+marc('700','a',
 	join_with(', ',
 		rec('701', 'a'),
 		rec('701', 'b')
@@ -104,12 +108,12 @@
 );
 
 if ( rec('701') ) { 
-	marc21('700','4', 
+	marc('700','4', 
 		'070'
 	); 
 }
 
-marc21('700','a',
+marc('700','a',
 	join_with(', ',
 		rec('702','a'),
 		rec('702','b')
@@ -117,7 +121,7 @@
 );
 
 if ( rec('702') ) {
-	marc21('700','4',
+	marc('700','4',
 		'340'
 	);
 }