--- trunk/conf/normalize/excel-wiley.pl	2006/11/03 20:41:12	773
+++ trunk/conf/normalize/excel-wiley.pl	2006/12/06 23:42:20	783
@@ -5,67 +5,25 @@
 
 marc('022','a',
 	lookup(
-		sub { rec('022','a') },
+		sub { rec('B') },
 		'wiley','full',
 		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
+			regex('s/\s*(\.|:|\-|\(|\))\s*//g',
 				lc( rec('A') )
 			);
-		} 
-	) ||
-	lookup(
-		sub { rec('022','a') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
 		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
 	)
 );
 
 marc('022','y',
 	lookup(
-		sub { rec('022','y') },
+		sub { rec('C') },
 		'wiley','full',
 		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
+			regex('s/\s*(\.|:|\-|\(|\))\s*//g',
 				lc( rec('A') )
 			);
-		} 
-	) ||
-	lookup(
-		sub { rec('022','y') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
 		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
 	)
 );
 
@@ -79,205 +37,27 @@
 	'[ Elektronička građa ]'
 );
 
-marc_indicators('246', 1, 0);
-
-marc('246','a',
-	lookup(
-		sub { rec('246','a') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	) ||
-	lookup(
-		sub { rec('246','a') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	)
-);
-
 marc('500','a',
 	lookup(
-		sub { rec('500','a') },
+		sub { 'Full Text dostupan od: ' . rec('V') },
 		'wiley','full',
 		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
+			regex('s/\s*(\.|:|\-|\(|\))\s*//g',
 				lc( rec('A') )
 			);
-		} 
-	) ||
-	lookup(
-		sub { rec('500','a') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
 		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
 	)
 );
 
-marc_indicators('650', ' ', 7);
-
-marc('650','a',
-	lookup(
-		sub { rec('650','a') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	) ||
-	lookup(
-		sub { rec('650','a') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	)
-);
-
-marc('650','v',
-	lookup(
-		sub { rec('650','v') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	) ||
-	lookup(
-		sub { rec('650','v') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	)
-);
-
-
-marc('650','z',
-	lookup(
-		sub { rec('650','z') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( 
-					rec('245','a') . ' ' . rec('245','b') 
-				)
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	) ||
-	lookup(
-		sub { rec('650','z') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
-			);
-		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
-	)
-);
-
-
-
 marc('856','u',
 	lookup(
-		sub { rec('856','u') },
+		sub { rec('D') },
 		'wiley','full',
 		sub { 
-				lc( 
-					rec('245','a') . rec('245','b') 
-				)
-		},
-
-		sub { 
+			regex('s/\s*(\.|:|\-|\(|\))\s*//g',
 				lc( rec('A') )
-		} 
-	) 
-	||
-	lookup(
-		sub { rec('856','u') },
-		'wiley','full',
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('245','a') )
 			);
 		},
-		sub { 
-			regex('s/\s*(\.|:)\s*$//g',
-				lc( rec('A') )
-			);
-		} 
 	)
 );
+