--- trunk/t/6-unit.t	2006/05/14 09:33:56	482
+++ trunk/t/6-unit.t	2006/05/14 12:39:39	491
@@ -2,12 +2,13 @@
 
 use strict;
 
-use Test::More tests => 66;
+use Test::More tests => 41;
 use Test::Exception;
 use Cwd qw/abs_path/;
 use File::Temp qw/tempdir/;
 use File::Slurp;
 use Data::Dumper;
+use Time::HiRes qw/time/;
 use blib;
 
 my $debug = shift @ARGV;
@@ -34,6 +35,8 @@
 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");
@@ -41,7 +44,8 @@
 ok(my $isis = new WebPAC::Input(
 	module => 'WebPAC::Input::ISIS',
 	code_page => 'ISO-8859-2',	# application encoding
-#	limit => 10,
+	limit => 100,
+	no_progress_bar => 1,
 ), "new Input::ISIS");
 
 ok(my $maxmfn = $isis->open(
@@ -62,6 +66,7 @@
 	db => $db,
 	lookup_regex => $lookup->regex,
 	lookup => $lookup,
+	no_progress_bar => 1,
 ), "new Normalize::XML");
 
 ok($n->open(
@@ -83,25 +88,23 @@
 	my $row = $isis->fetch || next;
 
 	diag " row $pos => ",Dumper($row) if ($debug);
-	set_rec( $row );
 
-	ok(my $ds = $n->data_structure($row), "data_structure");
+	my $t = time();
+	ok(my $ds = $n->data_structure($row), "XML data_structure");
+	$t1 += time() - $t;
 
 	diag " ds $pos => ",Dumper($ds) if ($debug);
 
-	# TODO move somewhere
-	{
-		no strict 'subs';
-		use WebPAC::Normalize::Set;
-		set_lookup( $lookup->lookup_hash );
-		clean_ds();
-		eval "$norm_pl";
-		ok(! $@, $@ ? "error: $@" : "no error");
-		ok(my $ds2 = get_ds(), "get_ds");
-		is_deeply( $ds, $ds2, 'ds same for xml and sets');
+	$t = time();
+	ok( my $ds2 = WebPAC::Normalize::Set::data_structure(
+		lookup => $lookup->lookup_hash,
+		row => $row,
+		rules => $norm_pl,
+	), "Set data_structure");
+	$t2 += time() - $t;
 
-		diag " ds2 $pos => ",Dumper($ds2) if ($debug);
-	}
+	diag " ds2 $pos => ",Dumper($ds2) if ($debug);
+	is_deeply( $ds, $ds2, 'ds same for xml and sets');
 
 	ok(my $html = $out->apply(
 		template => 'html.tt',
@@ -113,3 +116,5 @@
 	#diag $html;
 
 };
+
+diag sprintf("timings: %.2fs vs %.2fs [%1.2f%%]\n", $t1, $t2, ($t1 / $t2) * 100);