--- trunk/t/6-unit.t	2006/06/26 16:39:42	535
+++ trunk/t/6-unit.t	2006/06/26 16:39:51	536
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 41;
+use Test::More tests => 24;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use File::Temp qw/tempdir/;
@@ -17,8 +17,8 @@
 use_ok( 'WebPAC::Lookup' );
 use_ok( 'WebPAC::Input' );
 use_ok( 'WebPAC::Store' );
-use_ok( 'WebPAC::Normalize::XML' );
-use_ok( 'WebPAC::Normalize::Set' );
+use_ok( 'WebPAC::Lookup::Normalize' );
+use_ok( 'WebPAC::Normalize' );
 use_ok( 'WebPAC::Output::TT' );
 }
 
@@ -28,15 +28,13 @@
 
 my $isis_file = "$abs_path../t/winisis/BIBL";
 #$isis_file = '/data/hidra/THS/THS';
-$isis_file = '/data/isis_data/ffkk/';
+#$isis_file = '/data/isis_data/ffkk/';
 
 diag "isis_file: $isis_file" if ($debug);
 
 my $normalize_set_pl = "$abs_path/data/normalize.pl";
 my $lookup_file = "$abs_path../conf/lookup/isis.pm";
 
-my ($t1,$t2) = (0,0);
-
 ok(my $lookup = new WebPAC::Lookup(
 	lookup_file => $lookup_file,
 ), "new Lookup");
@@ -61,19 +59,6 @@
 	database => '.',
 ), "new Store");
 
-ok(my $n = new WebPAC::Normalize::XML(
-#	filter => { 'foo' => sub { shift } },
-	db => $db,
-	lookup_regex => $lookup->regex,
-	lookup => $lookup,
-	no_progress_bar => 1,
-), "new Normalize::XML");
-
-ok($n->open(
-	tag => 'isis',
-	xml_file => "$abs_path/data/normalize.xml",
-), "Normalize::XML->open");
-
 ok(my $norm_pl = read_file( $normalize_set_pl ), "set definitions: $normalize_set_pl" );
 
 ok(my $out = new WebPAC::Output::TT(
@@ -83,6 +68,8 @@
 
 diag " lookup => ",Dumper($lookup->lookup_hash) if ($debug);
 
+my $t_norm = 0;
+
 foreach my $pos ( 0 ... $isis->size ) {
 
 	my $row = $isis->fetch || next;
@@ -90,21 +77,14 @@
 	diag " row $pos => ",Dumper($row) if ($debug);
 
 	my $t = time();
-	ok(my $ds = $n->data_structure($row), "XML data_structure");
-	$t1 += time() - $t;
-
-	diag " ds $pos => ",Dumper($ds) if ($debug);
-
-	$t = time();
-	ok( my $ds2 = WebPAC::Normalize::Set::data_structure(
+	ok( my $ds = WebPAC::Normalize::data_structure(
 		lookup => $lookup->lookup_hash,
 		row => $row,
 		rules => $norm_pl,
 	), "Set data_structure");
-	$t2 += time() - $t;
+	$t_norm += time() - $t;
 
-	diag " ds2 $pos => ",Dumper($ds2) if ($debug);
-	is_deeply( $ds, $ds2, 'ds same for xml and sets');
+	diag " ds $pos => ",Dumper($ds) if ($debug);
 
 	ok(my $html = $out->apply(
 		template => 'html.tt',
@@ -117,4 +97,4 @@
 
 };
 
-diag sprintf("timings: %.2fs vs %.2fs [%1.2f%%]\n", $t1, $t2, ($t1 / $t2) * 100);
+diag sprintf("timings: %.2fs\n", $t_norm);