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

diff --git a/lib/WebPAC/Normalize.pm b/lib/WebPAC/Normalize.pm
index 7547f95..74331be 100644 (file)
--- 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 (executable)
--- 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 (file)
index 794bcf7..0000000
--- a/t/data/normalize.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>
-<!--
-       Here are few examples of syntax.
-
-       <isis type="search|display">something v200^a something else</isis>
-       <config type="search|display">name of var from config file</config>
--->
-<config>
-<indexer>
-       <MFN>
-               <isis>v000</isis>
-       </MFN>
-
-       <ISBN>
-               <isis type="display">v10</isis>
-       </ISBN>
-
-       <ISSN>
-               <isis type="display">v11</isis>
-       </ISSN>
-
-       <IdentificationNumbers name="ISN">
-               <isis type="search">v10 v11</isis>
-       </IdentificationNumbers>
-       
-       <Language>
-               <isis>v101</isis>
-       </Language>
-       
-       <TitleProper>
-               <isis><![CDATA[filter{regex(s/<[^>]*>/)}v200^a]]></isis>
-       </TitleProper>
-
-       <titleNo>
-               <isis>v200^9</isis>
-       </titleNo>
-
-       <Subtitle>
-               <isis>v200^e</isis>
-       </Subtitle>
-
-       <TitleProper2>
-               <isis>v200^c</isis>
-       </TitleProper2>
-       
-       <ParallelTitle>
-               <isis>v200^d</isis>
-       </ParallelTitle>
-
-       <Responsibility>
-               <isis>v200^f ; v200^g</isis>
-       </Responsibility>
-
-       <ResponsibilityFirst>
-               <isis type="display">v200^f</isis>
-       </ResponsibilityFirst>
-               
-       <ResponsibilitySecond>
-               <isis type="display">v200^g</isis>
-       </ResponsibilitySecond>
-
-       <VolumeDesignation>
-               <isis>v200^v</isis>
-       </VolumeDesignation>
-
-       <EditionStatement>
-               <isis>v205^a</isis>
-       </EditionStatement>
-
-       <SerialNo>
-               <isis>v207^a</isis>
-       </SerialNo>
-
-       <fond>
-               <isis>v209^a</isis>
-       </fond>
-
-       <PlacePublication>
-               <isis>v210^a</isis>
-       </PlacePublication>
-
-       <NamePublisher>
-               <isis>v210^c</isis>
-       </NamePublisher>
-
-       <DatePublication> 
-               <isis>v210^d</isis>
-       </DatePublication>
-
-       <PhysicalDescription>
-               <isis>v215^a : v215^c ; v215^d</isis>
-       </PhysicalDescription>
-       
-       <MaterialDesignation>
-               <isis>v215^a</isis>
-       </MaterialDesignation>
-       
-       <PhysicalDetails>
-               <isis>v215^c</isis>
-       </PhysicalDetails>
-       
-       <AccompanyingMaterial>
-               <isis>v215^e</isis>
-       </AccompanyingMaterial>
-
-       <Series>
-               <isis>v225^a = v225^d : v225^e ; v225^v. v225^h, v225^i ; v225^w</isis>
-       </Series>
-       
-       <SeriesTitle>
-               <isis>v225^a</isis>
-       </SeriesTitle>
-       
-       <GeneralNote>
-               <isis>v300</isis>
-       </GeneralNote>
-
-       <EditionNote>
-               <isis>v305</isis>
-       </EditionNote>
-
-       <PhysicalDescriptionNote>
-               <isis>v307</isis>
-       </PhysicalDescriptionNote>
-
-       <IntellectResponsNote>
-               <isis>v314</isis>
-       </IntellectResponsNote>
-
-       <InternalBibliographies>
-               <isis>v320</isis>
-       </InternalBibliographies>
-
-       <Frequency>
-               <isis>v326</isis>
-       </Frequency>
-
-       <ContentsNote>
-               <isis>v327</isis>
-       </ContentsNote>
-
-       <Summary>
-               <isis>v330</isis>
-       </Summary>
-
-       <SystemRequirements>
-               <isis>v337</isis>
-       </SystemRequirements>
-
-       <IssuedWith>
-               <isis>v423^z: v423^a / v423^c v423^b</isis>
-       </IssuedWith>
-
-       <Parts>
-               <isis type="display">lookup{dio-jzav:v900}</isis>
-               <isis type="search">lookup{id-dio-jzav:v900}</isis>
-       </Parts>
-       
-       <PartsEF>
-               <isis type="display">lookup{naslov-efzg:001v001}</isis>
-       </PartsEF>
-
-       <PartsID>
-               <isis>v463^1</isis>
-       </PartsID>
-
-       <Piece>
-               <isis>lookup{naslov-efzg:s463^1}</isis>
-       </Piece>
-
-       <PieceSubtitle>
-               <isis>lookup{podnaslov-efzg:s463^1}</isis>
-       </PieceSubtitle>
-
-       <PieceNum>
-               <isis>v463^v</isis>
-       </PieceNum>
-       
-
-       <PieceAnalitic>
-               <isis>v464^a / v464^g v464^f</isis>
-       </PieceAnalitic>
-
-       <UniformHeading>
-               <isis>v500^a. v503^b</isis>
-       </UniformHeading>
-       
-       <ExpandedTitle>
-               <isis>v532</isis>
-       </ExpandedTitle>
-       
-       <Form>
-               <isis>v608</isis>
-       </Form>
-
-       <UncontrolledTerms>
-               <isis>v610</isis>       
-       </UncontrolledTerms>
-       
-       <UDC_All>
-               <isis type="search">v675</isis>
-       </UDC_All>
-       
-       <UDC>
-               <isis>v675^a</isis>
-       </UDC>
-
-       <UDCb>
-               <isis>v675^b</isis>
-       </UDCb>
-
-       <APA>
-               <isis>v686</isis>
-       </APA>
-
-       <PersonalNamePrim>
-               <isis>v700^a, v700^b</isis>
-               <isis type="index">v700^a, v700^b</isis>
-       </PersonalNamePrim>
-
-       <PersonalNameSec>
-               <isis>v701^a, v701^b</isis>
-               <isis type="index">v701^a, v701^b</isis>
-       </PersonalNameSec>
-
-       <PersonalNameOther>
-               <isis>v702^a, v702^b</isis>
-               <isis type="index">v702^a, v702^b</isis>
-       </PersonalNameOther>
-
-       <Names>
-               <isis>v700^a, v700^b</isis>
-               <isis>v701^a, v701^b</isis>
-               <isis>v702^a, v702^b</isis>
-               <isis type="index">v700^a, v700^b</isis>
-               <isis type="index">v701^a, v701^b</isis>
-               <isis type="index">v702^a, v702^b</isis>
-       </Names>
-
-       <CorporateName>
-               <isis>v710^a</isis>
-       </CorporateName>
-
-       <CorporateName2>
-               <isis>v711^a</isis>
-       </CorporateName2>
-
-       <OriginatingSource>
-               <isis>v801</isis>
-       </OriginatingSource>
-       
-       <URL>
-               <isis>v856^u</isis>
-       </URL>
-
-       <level>
-               <isis>v909</isis>
-       </level>
-       
-       <ID>
-               <isis>v900</isis>
-               <isis>001v001</isis>
-       </ID>
-       
-       <Set>
-               <isis type="display">lookup{set-jzav:v946^1}</isis>
-               <isis type="search">v946^1</isis>
-               <isis type="display">lookup{set-efzg:v461^1}</isis>
-               <isis type="search">v461^1</isis>
-       </Set>
-
-       <Set2>
-               <isis>lookup{set-jzav:lookup{parent-id:v946^1}}</isis>
-       </Set2>
-
-       <CallNo>
-               <isis>v990</isis>
-       </CallNo>
-
-       <InvNo>
-               <isis>v991</isis>
-       </InvNo>
-
-</indexer>
-</config>