bugfix: now database names are always transfered to filtering function

[webpac] / import_xml / isis.xml

diff --git a/import_xml/isis.xml b/import_xml/isis.xml
index 7e62acd..05e14e7 100644 (file)
--- a/import_xml/isis.xml
+++ b/import_xml/isis.xml
@@ -19,9 +19,7 @@
                <a href="?rm=results&show_full=1&f=PersonalName&v=%s">%s</a>
        ]]></format>
 
-       <format name="Publisher"><![CDATA[
-               <a href="?rm=results&show_full=1&f=Publisher&v=%s">%s</a>
-       ]]></format>
+       <format name="Publisher"><![CDATA[<a href="?rm=results&show_full=1&f=Publisher&v=%s">%s</a>]]></format>
 
        <format name="UncontrolledTerms"><![CDATA[
                <a href="?rm=results&show_full=1&f=UncontrolledTerms&v=%s">%s</a>
@@ -34,12 +32,12 @@
     <indexer>
        <headline>
                <isis type="display">200a : 200e / 200f, 210d</isis>
-               <config>
-                       <delimiter> ---&gt; </delimiter>
+               <config >
+                       <delimiter> ---> </delimiter>
                        <value>materialtype</value>
                </config>
-               <config>
-                       <delimiter> u knji¾nici: </delimiter>
+               <config >
+                       <delimiter>. Lokacija: </delimiter>
                        <value>library</value>
                </config>
        </headline>
@@ -66,6 +64,7 @@
        <PersonalName name="Autor: " order="15">
                <isis type="swish">700 701 702 710 711 503 200f 200g</isis>
                <isis type="display" format_name="PersonalName" format_delimiter=";;">700a 700b;;700a, 700b</isis>
+               <isis type="display" format_name="PersonalName" format_delimiter=";;">701a 701b;;701a, 701b</isis>
                <isis type="display" format_name="PersonalName" format_delimiter=";;">710a 710b;;710a. 710b</isis>
                <isis type="display" append="1">(710d ; 710f ; 710e)</isis>
                <isis type="display">503a, 503b</isis>
@@ -89,7 +88,7 @@
                <isis append="1" type="display"> = 200d</isis>
                <isis append="1" type="display">/ 200f ; 200g. 200c</isis>
                <isis type="index">200a : 200e</isis>
-               <isis type="swish_exact">200a : 200e</isis>
+               <isis type="swish_exact">200a</isis>
 
        </TitleAndResponsibility>
 
@@ -107,9 +106,9 @@
        </Publisher>
 
        <Publication name="Impresum: " order="40">
-               <isis type="display">210a</isis>
-               <isis type="display" append="1" delimiter=" : " format_name="Publisher" format_delimiter=";;">210c;;210c</isis>
-               <isis type="display" append="1" delimiter=", "> 210d</isis>
+               <isis type="display">210a : </isis>
+               <isis type="display" append="1" format_name="Publisher" format_delimiter=";;">210c;;210c</isis>
+               <isis type="display" append="1">, 210d</isis>
        </Publication>
        
        <PhisicalDescription name="Materijalni opisi: " order="45">
@@ -130,11 +129,23 @@
        
        <Note name="Napomena: " order="60">
                <isis>326</isis>
-               <isis append="1" delimiter=". - ">300</isis>
-               <isis append="1" delimiter=". - ">320</isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>300</value>
+               </isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>320</value>
+               </isis>
                <isis append="1" delimeter=". - ">324</isis>
-               <isis append="1" delimiter=". - ">327</isis>
-               <isis append="1" delimiter=". - ">329</isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>327</value>
+               </isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>329</value>
+               </isis>
                <isis type="index">300</isis>
                <isis type="index">320</isis>
                <isis type="index">327</isis>
@@ -168,7 +179,10 @@
        
        <UncontrolledTerms name="Tema: " order="67">
                <isis type="swish">610 200a 200e 200k</isis> 
-               <isis type="display" delimiter=" * " format="upper" format_name="UncontrolledTerms" format_delimiter=";;">610;;610</isis>       
+               <isis type="display"  format="upper" format_name="UncontrolledTerms" format_delimiter=";;">
+                       <delimiter> * </delimiter>
+                       <value>610;;610</value>
+               </isis> 
                <isis type="index">610</isis>
        </UncontrolledTerms>
        
@@ -205,6 +219,10 @@
                <isis type="index">994a</isis>
        </library>
 -->
+       <URL name="URL :" order="85">
+               <isis>856u</isis>
+       </URL>
+       
        <shelfNumber name="Signatura: " order="90">
                <isis delimeter=" ">990</isis>
                <isis type="index" filter="shelf">990</isis>
@@ -212,7 +230,10 @@
 
        <invNo name="Inventarni broj: " order="95">
                <isis type="swish">991 220 221 222 223</isis>
-               <isis type="display" delimiter=", ">991</isis> 
+               <isis type="display" >
+                       <delimiter>, </delimiter>
+                       <value>991</value>
+               </isis> 
                <isis append="1">220 (Sv.1),</isis>
                <isis append="1">221 (Sv.2),</isis>
                <isis append="1">222 (Sv.3),</isis>
@@ -222,13 +243,18 @@
 
        <type name="Vrsta graðe: " type="display" order="100">
                <!-- added via xml tag in .conf -->
-               <config>materialtype</config>
+               <config type="display">materialtype</config>
+               <config type="swish">material_code</config>
        </type>
        
        <library name="Knji¾nica: " type="display" order="101">
                <!-- added via library tag in .conf -->
-               <config>library</config>
-               <config>library_url</config>
+               <config type="display">library</config>
+               <config type="display" append="1" >
+                       <delimiter>, </delimiter>
+                       <value>library_url</value>
+               </config>
+               <config type="swish">library_code</config>
        </library>
 
     </indexer>