X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdata%2Fnormalize.pl;h=656327da027da292ecdd7e8518d3a435b7448d12;hb=33156dfb36756fcafdf27a56b3254344aab06d09;hp=e986929decdd0381f0644025e5c555d74600d1ad;hpb=27ed149c54202dbbda9abd2cb230a56e10d5783d;p=webpac2

diff --git a/t/data/normalize.pl b/t/data/normalize.pl
index e986929..656327d 100755
--- a/t/data/normalize.pl
+++ b/t/data/normalize.pl
@@ -1,4 +1,4 @@
-tag('MFN',
+search_display('MFN',
 	rec('000')
 );
 
@@ -15,33 +15,33 @@ search('ISN',
 	rec('11'),
 );
 
-tag('Language',
+search_display('Language',
 	rec('101')
 );
 
-tag('TitleProper',
+search_display('TitleProper',
 	regex( 's/<[^>]*>//g',
 		rec('200','a')
 	)
 );
 
-tag('titleNo',
+search_display('titleNo',
 	rec('200','9')
 );
 
-tag('Subtitle',
+search_display('Subtitle',
 	rec('200','e')
 );
 
-tag('TitleProper2',
+search_display('TitleProper2',
 	rec('200','c')
 );
 
-tag('ParallelTitle',
+search_display('ParallelTitle',
 	rec('200','d')
 );
 
-tag('Responsibility',
+search_display('Responsibility',
 	join_with(" ; ",
 		rec('200','f'),
 		rec('200','g')
@@ -56,35 +56,35 @@ display('ResponsibilitySecond',
 	rec('200','g')
 );
 
-tag('VolumeDesignation',
+search_display('VolumeDesignation',
 	rec('200','v')
 );
 
-tag('EditionStatement',
+search_display('EditionStatement',
 	rec('205','a')
 );
 
-tag('SerialNo',
+search_display('SerialNo',
 	rec('207','a')
 );
 
-tag('fond',
+search_display('fond',
 	rec('209','a')
 );
 
-tag('PlacePublication',
+search_display('PlacePublication',
 	rec('210','a')
 );
 
-tag('NamePublisher',
+search_display('NamePublisher',
 	rec('210','c')
 );
 
-tag('DatePublication',
+search_display('DatePublication',
 	rec('210','d')
 );
 
-tag('PhysicalDescription',
+search_display('PhysicalDescription',
 	join_with(" : ",
 		rec('215','a'),
 		join_with(" ; ",
@@ -94,19 +94,19 @@ tag('PhysicalDescription',
 	)
 );
 
-tag('MaterialDesignation',
+search_display('MaterialDesignation',
 	rec('215','a')
 );
 
-tag('PhysicalDetails',
+search_display('PhysicalDetails',
 	rec('215','c')
 );
 
-tag('AccompanyingMaterial',
+search_display('AccompanyingMaterial',
 	rec('215','e')
 );
 
-tag('Series',
+search_display('Series',
 	join_with(" = ", rec('225','a'),
 		join_with(" : ", rec('225','d'),
 			join_with(" ; ", rec('225','e'),
@@ -122,47 +122,47 @@ tag('Series',
 	)
 );
 
-tag('SeriesTitle',
+search_display('SeriesTitle',
 	rec('225','a')
 );
 
-tag('GeneralNote',
+search_display('GeneralNote',
 	rec('300')
 );
 
-tag('EditionNote',
+search_display('EditionNote',
 	rec('305')
 );
 
-tag('PhysicalDescriptionNote',
+search_display('PhysicalDescriptionNote',
 	rec('307')
 );
 
-tag('IntellectResponsNote',
+search_display('IntellectResponsNote',
 	rec('314')
 );
 
-tag('InternalBibliographies',
+search_display('InternalBibliographies',
 	rec('320')
 );
 
-tag('Frequency',
+search_display('Frequency',
 	rec('326')
 );
 
-tag('ContentsNote',
+search_display('ContentsNote',
 	rec('327')
 );
 
-tag('Summary',
+search_display('Summary',
 	rec('330')
 );
 
-tag('SystemRequirements',
+search_display('SystemRequirements',
 	rec('337')
 );
 
-tag('IssuedWith',
+search_display('IssuedWith',
 	join_with(': ', rec(423,'z'),
 		join_with(' / ', rec(423,'a'),
 			join_with(' ', rec(423,'c'),
@@ -172,53 +172,15 @@ 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',
+search_display('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',
+search_display('PieceNum',
 	rec('463','v')
 );
 
-tag('PieceAnalitic',
+search_display('PieceAnalitic',
 	join_with(' / ',
 		rec('464','a'),
 		join_with(' ',
@@ -228,22 +190,22 @@ tag('PieceAnalitic',
 	)
 );
 
-tag('UniformHeading',
+search_display('UniformHeading',
 	join_with('. ',
 		rec(500,'a'),
 		rec(500,'b'),
 	)
 );
 
-tag('ExpandedTitle',
+search_display('ExpandedTitle',
 	rec(532)
 );
 
-tag('Form',
+search_display('Form',
 	rec(608)
 );
 
-tag('UncontrolledTerms',
+search_display('UncontrolledTerms',
 	rec(610)
 );
 
@@ -251,29 +213,29 @@ search('UDC_All',
 	rec(675),
 );
 
-tag('UDC',
+search_display('UDC',
 	rec(675)
 );
 
-tag('APACC',
+search_display('APACC',
 	rec(686)
 );
 
-tag('PersonalNamePrim',
+search_display('PersonalNamePrim',
 	join_with(', ',
 		rec(700,'a'),
 		rec(700,'b'),
 	)
 );
 
-tag('PersonalNameSec',
+search_display('PersonalNameSec',
 	join_with(', ',
 		rec(701,'a'),
 		rec(701,'b'),
 	)
 );
 
-tag('PersonalNameOther',
+search_display('PersonalNameOther',
 	join_with(', ',
 		rec(702,'a'),
 		rec(702,'b'),
@@ -286,69 +248,46 @@ search('Names',
 	rec(702),
 );
 
-tag('CorporateNamePrim',
+search_display('CorporateNamePrim',
 	join_with(', ',
 		rec(710,'a'),
 		rec(710,'b'),
 	)
 );
 
-tag('CorporateNameSec',
+search_display('CorporateNameSec',
 	join_with(', ',
 		rec(711,'a'),
 		rec(711,'b'),
 	)
 );
 
-tag('OriginatingSource',
+search_display('OriginatingSource',
 	rec(801)
 );
 
-tag('URL',
+search_display('URL',
 	rec(856,'u')
 );
 
-tag('level',
+search_display('level',
 	rec(909)
 );
 
-tag('ID',
+search_display('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',
+search_display('CallNo',
 	rec(990)
 );
 
-tag('InvNo',
+search_display('InvNo',
 	rec(991)
 );