local

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

diff --git a/conf/lookup/jzav.yml b/conf/lookup/jzav.yml
index ce7ca64..70b317b 100644 (file)
--- a/conf/lookup/jzav.yml
+++ b/conf/lookup/jzav.yml
@@ -3,12 +3,21 @@ lookup:
   - key: 'tip:v900'
     val: 'v200^a'
     eval: '"v909" eq "1"'
-#  - key: 'naslov:v900'
-#    val: 'v200^a : v200^e'
+  - key: 'naslov:v900'
+    val: 'v200^a : v200^e'
 #    eval: '"v909" eq "2"'
-  - key: 'naslov:v946^1'
+  - key: 'naslov3:v946^1'
     val: 'v200^a : v200^e'
     eval: '"v909" eq "3"'
+  - key: 'naslov4:v946^1'
+    val: 'v200^a : v200^e'
+    eval: '"v909" eq "4"'
   - key: 'tip-naslovi:v946^1'
     val: 'v900'
     eval: '"v909" eq "2"'
+    # tree
+  - key: 'parent:v900'
+    val: 'v946^1'
+  - key: 'child:v946^1'
+    val: 'v900'
+    # lookup{child:lookup{child:v900}

diff --git a/conf/normalize/isis_ffzg.xml b/conf/normalize/isis_ffzg.xml
index b78af43..78a5d78 100644 (file)
--- a/conf/normalize/isis_ffzg.xml
+++ b/conf/normalize/isis_ffzg.xml
@@ -49,8 +49,16 @@
        </ParallelTitle>
 
        <Responsibility>
-               <isis>v200^f ; v200^g</isis>
+               <isis>v200^g v200^f</isis>
        </Responsibility>
+               
+       <ResponsibilityFirst>
+               <isis type="display">v200^f</isis>
+       </ResponsibilityFirst>
+               
+       <ResponsibilitySecond>
+               <isis type="display">v200^g</isis>
+       </ResponsibilitySecond>
 
        <VolumeDesignation>
                <isis>v200^v</isis>
@@ -132,6 +140,14 @@
                <isis>v423^z: v423^a / v423^c v423^b</isis>
        </IssuedWith>
 
+       <Parts>
+               <isis>lookup{part:00v463^1}</isis>
+       </Parts>
+
+       <PartsID>
+               <isis>v463^1</isis>
+       </PartsID>
+
        <PieceAnalitic>
                <isis>v464^a / v464^g v464^f</isis>
        </PieceAnalitic>
@@ -208,12 +224,16 @@
                <isis>lookup{tip:v900}</isis>
        </recType>
 
-       <Parts>
+       <Parts3>
                <!--
                <isis>lookup{naslov:lookup{tip-naslovi:v946^1}}</isis>
                -->
-               <isis>lookup{naslov:v900}</isis>
-       </Parts>
+               <isis>lookup{naslov3:v900}</isis>
+       </Parts3>
+       
+       <Parts4>
+               <isis>lookup{naslov4:v900}</isis>
+       </Parts4>
        
        <CallNo>
                <isis>v990</isis>

diff --git a/conf/output/tt/html_ffzg_results_nonstd.tt b/conf/output/tt/html_ffzg_results_nonstd.tt
index 826ae87..be554b5 100644 (file)
--- a/conf/output/tt/html_ffzg_results_nonstd.tt
+++ b/conf/output/tt/html_ffzg_results_nonstd.tt
@@ -2,12 +2,26 @@
 <div class="holder_nonstd">
 
 <div class="bookcov_nonstd">
-        <img border="4" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL160_SCLZZZZZZZ_.jpg" alt="."/>
+        <img border="0" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL160_SCLZZZZZZZ_.jpg" alt="."/>
 
+       [% IF d('UDC') or d('APA') or d('UncontrolledTerms') %]<br/><br/>
+       <h3>Sliène knjige</h3>
+               [% IF d('UncontrolledTerms') %]<span class="labelNonstd">prema temi: </span><br/>
+                               [% search('UncontrolledTerms','UncontrolledTerms','<br/>') %]<br/><br/> 
+               [% END %]
+               [% IF d('UDC') or d('APA') %]<span class="labelNonstd">prema kategoriji: </span><br/>
+                       [% IF d('UDC') %]
+                               [% search('UDC','UDC','<br/>') %]<br/>
+                       [% END %]
+                       [% IF d('APA') %]
+                               [% search('APA','APA','<br/>') %]<br/>
+                       [% END %]
+               [% END %]
+       [% END %]
 </div>
 
 <div class="desc_nonstd">
-       <span class="title">
+       <span class="titleDet">
        [% IF d('titleNo') %]
                [% d('titleNo') %] /
        [% END %]
@@ -15,8 +29,8 @@
         [%- IF d('Subtitle') -%] : 
                [%- d('Subtitle') -%]
         [%- END -%]</span>
-        [%- IF d('ParallelTitle') -%] <small> = 
-               [%- d('ParallelTitle') -%]</small>
+        [%- IF d('ParallelTitle') -%] = 
+               [%- d('ParallelTitle') -%]
         [%- END -%]
         [%- IF d('EditionStatement') -%], 
                [%- d('EditionStatement') %].
@@ -24,44 +38,46 @@
         [% IF d('Responsibility') %]<br/>
                [% d('Responsibility') %]
         [% END %]
-  <br/><br/><small>    
-       [% d('PlacePublication',' : ') %] : [% d('NamePublisher') %], [% d('DatePublication').replace('cop. ', '') %]
        <br/>
-        [% d('MaterialDesignation').replace('.*,', '') -%]
-        [%- IF d('ISBN') -%] ISBN [% d('ISBN') %] 
-        [% END %]
- <br/>
-        [% IF d('SeriesTitle') %]<br/>
-            Serija: [% d('SeriesTitle') %]
+       
+       [% IF d('DatePublication') %]<br/><span class="labelNonstd">Godina: </span>
+               [% d('DatePublication').replace('cop. ', '') %]
+       [% END %]
+       
+       [% IF d('PlacePublication') %]<br/><span class="labelNonstd">Izdavaè: </span>
+               [% d('PlacePublication',' : ') %] : [% d('NamePublisher') %]
+       [% END %] 
+        
+       [% IF d('ISBN') %]<br/><span class="labelNonstd">ISBN</span>
+               [% d('ISBN') %]
         [% END %]
-    </small><br/>
-       [% IF d('UncontrolledTerms') %]<br/>
-                       <b>Tema: </b>
-                       [% search('UncontrolledTerms','UncontrolledTerms',' * ') %] 
-       [% END %]
-<!--
-       [% d('recType') %]
--->
+
+       [% IF d('PhysicalDescription') %]<br/><span class="labelNonstd">Materijalni opis: </span>
+       <!--
+               [% d('MaterialDesignation').replace('.*,', '') -%]
+       -->
+               [% d('PhysicalDescription').replace('.*,', '') -%]
+       [% END %]
        
-       [% d('Parts','<br/>') %]        
-<br/><br/>
-       [% d('GeneralNote','. - ') %]
+       [% IF d('SeriesTitle') %]<br/><br/>Serija: 
+               [% search('SeriesTitle','SeriesTitle',', ') %]
+        [% END %]
 
-       <!--
-       [% IF d('UDC') %]
-               [% d('UDC') %] (UDK)
+       [% IF d('Parts') %]<br/><br/>
+               Dijelovi: <ul><li>[% search('PartsID','Parts','</li><li>') %]</ul>
+       [% END %]
+ 
+       [% IF d('GeneralNote') %]<br/><span class="labelNonstd">Napomena</span>
+               [% d('GeneralNote','. - ') %]
        [% END %]
-       -->
-       
-       [% IF d('APA') %]
-               <br/><small>Klasifikacija: [% search('APA','APA',' ') %] <br/></small>
-       [% END %]
 
        [% IF d('ContentsNote') %] <br/>
                <strong> Sadr¾aj: </strong><br/>
                <small>[% d('ContentsNote','<br/>') %]</small>
        [% END %]
 
+      <p>&nbsp; 
+
 </div>
 
 <div class="avail">
@@ -79,7 +95,7 @@
 
 </small>
 <br/>
-<br/>
+
 
 <h3>Oblik zapisa</h3>
 

diff --git a/conf/output/tt/html_ffzg_results_short.tt b/conf/output/tt/html_ffzg_results_short.tt
index 1af44f1..da5dcda 100644 (file)
--- a/conf/output/tt/html_ffzg_results_short.tt
+++ b/conf/output/tt/html_ffzg_results_short.tt
@@ -1,37 +1,37 @@
 <div class=[% IF d('CallNo') %]"holder"[% ELSE %]"holder_none"[% END %]>
 
-<div class="bookcov">
-       <a href="#" onClick="load_rec([% d('MFN') %], 'html_ffzg_results_nonstd.tt'); return false;"><img border="2" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL90_SCLZZZZZZZ_.jpg" alt="slika naslovnice" /></a>
+<div class="bookcov_short">
+       <a href="#" onClick="load_rec(record_uri, 'html_ffzg_results_nonstd.tt'); return false;"><img border="0" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL50_SCLZZZZZZZ_.jpg" alt="slika naslovnice" /></a>
 </div>
-
-
+<!--
+<li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_nonstd.tt') %]">vi¹e informacija</a></li>
+-->
 <div class="desc_short">
        <span class="title">
+       <a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_nonstd.tt') %]">
        [% d('TitleProper').replace('<|>', '') -%]
                [%- IF d('Subtitle') -%] : 
                [%- d('Subtitle') -%]
-        [%- END -%]</span>
+        [%- END -%]</a></span>
         [%- IF d('ParallelTitle') -%]
        = [% d('ParallelTitle') %]
         [%- END -%]
         [%- IF d('EditionStatement') -%], 
        [%- d('EditionStatement') %].
         [% END %]
-
-        <br/>
-      
-        [% IF d('Responsibility') %]<span class="author">
+        [% IF d('Responsibility') %]<br/><span class="author">
            [% d('Responsibility') -%]</span>
         [%- END -%]
        [%- IF d('DatePublication') -%], 
-               [%- d('DatePublication').replace('cop. ','') %]
-       [% END %]
+               [%- d('DatePublication').replace('cop. ','') -%]
+       [%- END %]
        <br/>
 
      
-    <br/>  [% IF d('CallNo') %] 
-       Signatura: <span class="sig"> [% d('CallNo',' ') %]</span>
-[% END %]
+       <div class="info">
+       [% IF d('CallNo') %] Signatura: <span class="sig"> [% d('CallNo',' ') %]</span>
+       [% END %]
+       </div>
 </div>
 
 <div class="links">