local

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@517 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/conf/input/validate_ffzg b/conf/input/validate_ffzg
index 23936d4..582eb2d 100644 (file)
--- a/conf/input/validate_ffzg
+++ b/conf/input/validate_ffzg
@@ -26,4 +26,4 @@
 991 
 994 a b c
 998 a 
-999 
+999 a b 

diff --git a/conf/normalize/common.pl b/conf/normalize/common.pl
index 4dd24dc..9e9d1c5 100755 (executable)
--- a/conf/normalize/common.pl
+++ b/conf/normalize/common.pl
@@ -2,14 +2,6 @@ tag('MFN',
        rec('000')
 );
 
-display('ControlNumber',
-       rec1('001')
-);
-
-display('LastTransaction',
-       rec1('005')
-);
-
 display('ISBN',
        rec1('10'),
        rec('010','a')
@@ -19,10 +11,6 @@ display('ISBN_information',
        rec('010','b')
 );
 
-display('ISBN_availability',
-       rec('010','d')
-);
-
 display('ISBN_incorrect',
        rec('010','z')
 );
@@ -47,42 +35,6 @@ search('ISN',
        rec('011'),
 );
 
-display('NationalBibliographySource',
-       rec('020','a')
-);
-
-display('NationalBibliographyNumber',
-       rec('020','b')
-);
-
-display('LegalDepositSource',
-       rec('021','a')
-);
-
-display('LegalDepositNumber',
-       rec('021','b')
-);
-
-display('GovernmentDocumentSource',
-       rec('022','a')
-);
-
-display('GovernmentDocumentNumber',
-       rec('022','b')
-);
-
-display('GovernmentDocumentCancelled',
-       rec('022','z')
-);
-
-tag('Coden',
-       rec('040','a')
-);
-
-display('GeneralInformation',
-       rec(100,'a')
-);
-
 tag('LanguageText',
        rec(101,'a')
 );
@@ -94,22 +46,6 @@ tag('LanguageOriginal',
        )
 );
 
-tag('LanguageSummary',
-       rec(101,'d')
-);
-
-tag('LanguageContents',
-       rec(101,'e')
-);
-
-tag('CountryPublishing',
-       rec(102,'a')
-);
-
-tag('LocalSubentity',
-       rec(102,'b')
-);
-
 tag('TitleProper',
        regex( 's/<[^>]*>//g',
                rec(200,'a')
@@ -353,7 +289,7 @@ tag('SubjectForm',
        rec(608)
 );
 
-tag('UncontroledTerms',
+tag('UncontrolledTerms',
        rec(610)
 );
 

diff --git a/conf/output/tt/html_ffzg_results_short.tt b/conf/output/tt/html_ffzg_results_short.tt
index 0547928..7f4fa67 100644 (file)
--- a/conf/output/tt/html_ffzg_results_short.tt
+++ b/conf/output/tt/html_ffzg_results_short.tt
@@ -10,17 +10,14 @@
        <span class="title">
        <a href="#" onClick="[% load_rec(record_uri, 'results_full.tt') %]">
        [% d('TitleProper').replace('<|>', '') -%]
-               [%- IF d('Subtitle') -%] : 
-               [%- d('Subtitle',' ') -%]
+               [%- IF d('ReminderTitle') -%] : 
+               [%- d('ReminderTitle',' ') -%]
         [%- END -%]</a></span>
-        [%- IF d('ParallelTitle') -%]
-       = [% d('ParallelTitle') %]
-        [%- END -%]
         [%- IF d('EditionStatement') -%], 
        [%- d('EditionStatement') %].
         [% END %]
-        [% IF d('Responsibility') %]<br/><span class="author">
-           [% d('Responsibility',' ') -%]</span>
+        [% IF d('StatementResponsibility') %]<br/><span class="author">
+           [% d('StatementResponsibility',' ') -%]</span>
         [%- END -%]
        [%- IF d('DatePublication') -%] (
                [%- d('DatePublication').replace('cop. ','') -%])