local

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

diff --git a/conf/lookup/jzav.yml b/conf/lookup/jzav.yml
index 11925df..ce7ca64 100644 (file)
--- a/conf/lookup/jzav.yml
+++ b/conf/lookup/jzav.yml
@@ -3,9 +3,12 @@ lookup:
   - key: 'tip:v900'
     val: 'v200^a'
     eval: '"v909" eq "1"'
-  - key: 'naslov:v900'
+#  - key: 'naslov:v900'
+#    val: 'v200^a : v200^e'
+#    eval: '"v909" eq "2"'
+  - key: 'naslov:v946^1'
     val: 'v200^a : v200^e'
-    eval: '"v909" eq "2"'
+    eval: '"v909" eq "3"'
   - key: 'tip-naslovi:v946^1'
     val: 'v900'
     eval: '"v909" eq "2"'

diff --git a/conf/normalize/isis_ffzg.xml b/conf/normalize/isis_ffzg.xml
index 7acc4bd..9fb7db9 100644 (file)
--- a/conf/normalize/isis_ffzg.xml
+++ b/conf/normalize/isis_ffzg.xml
@@ -71,6 +71,10 @@
                <isis>filter{regex(s/<[^>]*>/)}v200^a</isis>
        </TitleProper>
 
+       <titleNo>
+               <isis>v200^9</isis>
+       </titleNo>
+
        <Subtitle>
                <isis>v200^e</isis>
        </Subtitle>
@@ -239,12 +243,15 @@
                <isis>v856^u</isis>
        </URL>
 
-       <Set_2>
-               <isis>[naslov:v946^1]</isis>
-       </Set_2>
+       <recType>
+               <isis>lookup{tip:v900}</isis>
+       </recType>
 
        <Parts>
+               <!--
                <isis>lookup{naslov:lookup{tip-naslovi:v946^1}}</isis>
+               -->
+               <isis>lookup{naslov:v900}</isis>
        </Parts>
        
        <CallNo>

diff --git a/conf/output/tt/html_ffzg_results_nonstd.tt b/conf/output/tt/html_ffzg_results_nonstd.tt
index 99b2f92..826ae87 100644 (file)
--- a/conf/output/tt/html_ffzg_results_nonstd.tt
+++ b/conf/output/tt/html_ffzg_results_nonstd.tt
@@ -8,6 +8,9 @@
 
 <div class="desc_nonstd">
        <span class="title">
+       [% IF d('titleNo') %]
+               [% d('titleNo') %] /
+       [% END %]
        [% d('TitleProper').replace('<|>', '') -%]
         [%- IF d('Subtitle') -%] : 
                [%- d('Subtitle') -%]
@@ -22,7 +25,7 @@
                [% d('Responsibility') %]
         [% END %]
   <br/><br/><small>    
-       [% d('PlacePublication') %]: [% d('NamePublisher') %], [% d('DatePublication').replace('cop. ', '') %]
+       [% d('PlacePublication',' : ') %] : [% d('NamePublisher') %], [% d('DatePublication').replace('cop. ', '') %]
        <br/>
         [% d('MaterialDesignation').replace('.*,', '') -%]
         [%- IF d('ISBN') -%] ISBN [% d('ISBN') %] 
@@ -36,8 +39,13 @@
                        <b>Tema: </b>
                        [% search('UncontrolledTerms','UncontrolledTerms',' * ') %] 
        [% END %]
-
-       [% d('Parts') %]        
+<!--
+       [% d('recType') %]
+-->
+       
+       [% d('Parts','<br/>') %]        
+<br/><br/>
+       [% d('GeneralNote','. - ') %]
 
        <!--
        [% IF d('UDC') %]