From eef0f28fa5d1c5f3c33ecead52c90cb380b5da63 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Tue, 31 Oct 2006 13:19:47 +0000 Subject: [PATCH] r1113@llin: dpavlin | 2006-10-31 14:17:02 +0100 cleanup normalization error message for lookups and modify tests so they don't fail anymore git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@766 07558da8-63fa-0310-ba24-9fe276d99e06 --- lib/WebPAC/Normalize.pm | 2 +- t/data/normalize.pl | 61 --------- t/data/normalize.xml | 285 ---------------------------------------- 3 files changed, 1 insertion(+), 347 deletions(-) delete mode 100644 t/data/normalize.xml diff --git a/lib/WebPAC/Normalize.pm b/lib/WebPAC/Normalize.pm index 7547f95..74331be 100644 --- a/lib/WebPAC/Normalize.pm +++ b/lib/WebPAC/Normalize.pm @@ -1022,7 +1022,7 @@ Easy as pie, right? sub lookup { my ($what, $database, $input, $key, $having) = @_; - confess "lookup needs 5 arguments: what, database, input, key, having" unless ($#_ == 4); + confess "lookup needs 5 arguments: what, database, input, key, having\n" unless ($#_ == 4); warn "## lookup ($database, $input, $key)", $/ if ($debug > 1); return unless (defined($lookup->{$database}->{$input}->{$key})); diff --git a/t/data/normalize.pl b/t/data/normalize.pl index e986929..12e7df1 100755 --- a/t/data/normalize.pl +++ b/t/data/normalize.pl @@ -172,48 +172,10 @@ tag('IssuedWith', ) ); -display('Parts', - lookup( - prefix( 'dio-jzav:', rec(900) ) - ) -); - -search('Parts', - lookup( - prefix( 'id-dio-jzav:', rec(900) ) - ) -); - -display('PartsEF', - lookup( - prefix( 'naslov-efzg:001', rec('001') ) - ) -); - tag('PartsID', rec('463','1') ); -tag('Piece', - lookup( - prefix( 'naslov-efzg:', - first( - rec(463,1) - ) - ) - ) -); - -tag('PieceSubtitle', - lookup( - prefix( 'podnaslov-efzg:', - first( - rec(463,1) - ) - ) - ) -); - tag('PieceNum', rec('463','v') ); @@ -316,34 +278,11 @@ tag('ID', rec(900) ); -display('Set', - lookup( - prefix( 'set-jzav:', - rec(946,1), - ) - ), - lookup( - prefix( 'set-efzg:', - rec(461,1), - ) - ) -); - search('Set', rec(946,1), rec(461,1), ); -tag('Set2', - lookup( - prefix( 'set-jzav:', - lookup( 'parent-id:', - rec(946,1) - ) - ) - ) -); - tag('CallNo', rec(990) ); diff --git a/t/data/normalize.xml b/t/data/normalize.xml deleted file mode 100644 index 794bcf7..0000000 --- a/t/data/normalize.xml +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - v000 - - - - v10 - - - - v11 - - - - v10 v11 - - - - v101 - - - - ]*>/)}v200^a]]> - - - - v200^9 - - - - v200^e - - - - v200^c - - - - v200^d - - - - v200^f ; v200^g - - - - v200^f - - - - v200^g - - - - v200^v - - - - v205^a - - - - v207^a - - - - v209^a - - - - v210^a - - - - v210^c - - - - v210^d - - - - v215^a : v215^c ; v215^d - - - - v215^a - - - - v215^c - - - - v215^e - - - - v225^a = v225^d : v225^e ; v225^v. v225^h, v225^i ; v225^w - - - - v225^a - - - - v300 - - - - v305 - - - - v307 - - - - v314 - - - - v320 - - - - v326 - - - - v327 - - - - v330 - - - - v337 - - - - v423^z: v423^a / v423^c v423^b - - - - lookup{dio-jzav:v900} - lookup{id-dio-jzav:v900} - - - - lookup{naslov-efzg:001v001} - - - - v463^1 - - - - lookup{naslov-efzg:s463^1} - - - - lookup{podnaslov-efzg:s463^1} - - - - v463^v - - - - - v464^a / v464^g v464^f - - - - v500^a. v503^b - - - - v532 - - -
- v608 -
- - - v610 - - - - v675 - - - - v675^a - - - - v675^b - - - - v686 - - - - v700^a, v700^b - v700^a, v700^b - - - - v701^a, v701^b - v701^a, v701^b - - - - v702^a, v702^b - v702^a, v702^b - - - - v700^a, v700^b - v701^a, v701^b - v702^a, v702^b - v700^a, v700^b - v701^a, v701^b - v702^a, v702^b - - - - v710^a - - - - v711^a - - - - v801 - - - - v856^u - - - - v909 - - - - v900 - 001v001 - - - - lookup{set-jzav:v946^1} - v946^1 - lookup{set-efzg:v461^1} - v461^1 - - - - lookup{set-jzav:lookup{parent-id:v946^1}} - - - - v990 - - - - v991 - - - - -- 2.20.1