X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2F3-normalize.t;h=132725216c3172e2890af8b6ec0357055a208efd;hb=5f5d44c525baf7d887f809f4281f208da33ac846;hp=ee0c802cfa9b4baed66b0078914250dfcd26c966;hpb=11115607fe1bd1526f08618a3e906fad2a675c06;p=webpac2

diff --git a/t/3-normalize.t b/t/3-normalize.t
index ee0c802..1327252 100755
--- a/t/3-normalize.t
+++ b/t/3-normalize.t
@@ -3,7 +3,7 @@
 use strict;
 use blib;
 
-use Test::More tests => 351;
+use Test::More tests => 340;
 
 BEGIN {
 	use_ok( 'WebPAC::Test' );
@@ -523,7 +523,7 @@ sub test_s {
 		}
 
 		ok(my $marc = WebPAC::Normalize::_get_marc_fields(), "_get_marc_fields");
-		diag dump( $marc ) if ($debug);
+		diag dump( $marc ) if $debug;
 		diag "expects:\n", dump($struct) if ($debug > 1);
 		is_deeply( $marc, $struct, $msg );
 	}
@@ -864,69 +864,33 @@ sub test_s {
 		[ '1-55860-701-3', '1-55860-701-3' ],
 	'isbn_10' );
 
-	# marc_template
+	# frec
+
+	my $rec = {
+			'200' => [ {
+				a => [ 'a1', 'a2' ], b => [ 'b1', 'b2' ], c => [ 'c1', 'c2' ],
+				subfields => [ qw/a 0 b 0 a 1 b 1 c 0 c 1/ ],
+			}, {
+				a => [ 'a3', 'a4', 'a5' ], b => 'b3', c => 'c3',
+				subfields => [ qw/a 0 a 1 b 0 c 0 a 2/ ],
+			} ],
+	};
+
+	test_rule( 'frec', $rec, qq{ frec(200) }, [ 'a1' ] );
+	test_rule( 'frec', $rec, qq{ frec(200,'a') }, [ 'a1' ] );
+	test_rule( 'frec', $rec, qq{ frec(200,'b') }, [ 'b1' ] );
+	test_rule( 'frec', $rec, qq{ frec(200,'c') }, [ 'c1' ] );
+
+	$rec->{'900'} = $rec->{'200'};
+	foreach my $sf ( qw/a b c/ ) {
+		ok( frec_eq( '200' => $sf, '900' => $sf ), "frec_eq 200 == 900 $sf");
+		ok( ! frec_ne( '200' => $sf, '900' => $sf ), "! frec_ne 200 == 900 $sf");
+	}
+
+	foreach my $sf ( qw/a b/ ) {
+		ok( ! frec_eq( '200' => $sf, '200' => 'c' ), "! frec_eq 200 $sf == 200 c");
+		ok( frec_ne( '200' => $sf, '200' => 'c' ), "frec_ne 200 $sf == 200 c");
+	}
 
-	test_rec_rules(
-		'marc_template',
-		{
-			'225' => [{
-				'a' => 'a-1-1',
-				'i' => 'i-1-1',
-				'v' => 'v-1-1',
-				'w' => 'w-1-1',
-				'h' => 'h-1-1',
-				'x' => 'x-1-1',
-			},{
-				'a' => 'a-2-1',
-				'v' => 'v-2-1',
-				'i' => 'i-2-1',
-			},{
-				'a' => 'a-3-1',
-				'i' => 'i-3-1',
-				'v' => 'v-3-1',
-			},{
-				'a' => 'a-4-1',
-				'v' => 'v-4-1',
-				'i' => 'i-4-1',
-				'w' => 'w-4-1',
-			}],
-		},
-		qq{
-			marc_template(
-				from => 225, to => 440,
-				subfields_rename => [
-					'a' => 'a',
-					'x' => 'x',
-					'v' => 'v',
-					'h' => 'n',
-					'i' => 'p',
-					'w' => 'v',
-				],
-				marc_template => [
-					'a, |x ; |v. |n, |p ; |v',
-					'a ; |v. |p ; |v',
-					'a. |p ; |v',
-				],
-			);
-		},
-		[
-			[440, " ", " ",
-				["a", "a-1-1"],
-				["x", "x-1-1"],
-				["v", "v-1-1"],
-				["n", "h-1-1"],
-				["p", "i-1-1"],
-				["v", "w-1-1"],
-			],
-			[440, " ", " ", ["a", "a-2-1"], ["p", "i-2-1"], ["v", "v-2-1"]],
-			[440, " ", " ", ["a", "a-3-1"], ["p", "i-3-1"], ["v", "v-3-1"]],
-			[440, " ", " ",
-				["a", "a-4-1"],
-				["v", "v-4-1"],
-				["p", "i-4-1"],
-				["v", "w-4-1"],
-			],
-		],
-	);
 }