bugfix: check Isis database error in correct place

[webpac] / import_xml / excel.xml

diff --git a/import_xml/excel.xml b/import_xml/excel.xml
index 08617f9..ba2c1cc 100644 (file)
--- a/import_xml/excel.xml
+++ b/import_xml/excel.xml
@@ -20,6 +20,15 @@
     <indexer>
        <headline>
                <column type="display">|A|</column>
+               <config>
+                       <delimiter> ---> </delimiter>
+                       <value>materialtype</value>
+               </config>
+               <config>
+                       <delimiter> u knji¾nici: </delimiter>
+                       <value>library</value>
+               </config>
+ 
        </headline>
 
        <IdentificationNumbers name="ISN">
@@ -27,131 +36,22 @@
                <column type="index">|B|</column>
        </IdentificationNumbers>
 
-<!--
-       <ISBN name="ISBN" order="10">
-               <column type="display">10</column>
-       </ISBN>
-
--->
-       <ISSN name="ISSN" order="11">
+       <ISSN name="ISSN: " order="11">
                <column type="display">|B|</column>
        </ISSN>
 
-<!--
-       <MFN name="MFN">
-               <column>mfn</column>
-               <column type="index">mfn</column>
-       </MFN>
-               
-       <PersonalName name="Autor" order="15">
-               <column type="swish">700 701 702 710 711 503 200f 200g</column>
-               <column type="display">700a, 700b</column>
-               <column type="display">710a. 710b (710d ; 710f ; 710e)</column>
-               <column type="display">503a, 503b</column>
-               <column type="index">700a, 700b</column>
-               <column type="index">701a, 701b</column>
-               <column type="index">702a, 702b</column>        
-               <column type="index">710a</column>
-               <column type="index">503a, 503b</column>
-       </PersonalName>
-       
--->
-       <TitleAndResponsibility name="Naslov" order="20">
+       <TitleAndResponsibility name="Naslov: " order="20">
                <column>|A|</column>
                <column type="index">|A|</column>
        </TitleAndResponsibility>
 
-<!--
-       <EditionStatement name="Izdanje" order="25">
-               <column type="display">205a</column>
-       </EditionStatement>
-       
-       <Date name="Godina izdavanja" order="30">
-               <column type="swish">210d</column>
-       </Date>
-
-       <Publisher name="Izdavaè" order="35">
-               <column type="swish">210a 210c</column>
-               <column type="index">210c, 210a</column>
-       </Publisher>
-
-       <Publication name="Impresum" order="40">
-               <column type="display">210a : 210c, 210d</column>
-       </Publication>
-       
-       <PhisicalDescription name="Materijalni opis" order="45">
-               <column type="swish">215a : 215c ; 215d</column>
-               <column type="display">215a : 215c ; 215d</column>
-       </PhisicalDescription>
-       
-       <Language name="Jezik" order="50">
-               <column type="swish" filter="lang_swish">101</column>
-               <column type="display" filter="lang_display">101</column>
-               <column type="index" filter="lang_display">101</column>
-       </Language>
-       
-       <Series name="Nakladnièka cjelina" order="55">
-               <column>225a : 225e ; 225v. 225h, 225i ; 225w</column>
-               <column type="index">225a</column>
-       </Series>
-       
-       <Note name="Napomena" order="60">
-               <column delimiter=". -">300</column>
-               <column append="1" delimiter=". - ">320</column>
-               <column append="1" delimiter=". - ">327</column>
-               <column append="1" delimiter=". - ">329</column>
-               <column type="index">300</column>
-               <column type="index">320</column>
-               <column type="index">327</column>
-               <column type="index">329</column>
-       </Note>
-               
-       <UncontrolledTerms name="Tema" order="65">
-               <column delimiter=" * " format="upper">610 </column>    
-               <column type="index">610</column>
-       </UncontrolledTerms>
-       
-       <contents name="Sadr¾aj ¹ðè澩ÐÈÆ®" order="70">
-               <column>330 ¹ðè澩ÐÈÆ®</column>
-               <column type="index">330</column>
-       </contents>
-
-       <title_vol name="Podaci o svescima" order="75">
-               <column type="display">230v : 230a. - 250. - 260. ISBN 290</column>
-               <column type="display">231v : 231a. - 251. - 261. ISBN 291</column>
-               <column type="display">232v : 232a. - 252. - 262. ISBN 292</column>
-               <column type="display">233v : 233a. - 253. - 263. ISBN 293</column>
-       </title_vol>
-
-       <UDC name="UDK" order="80">
-               <column>675a</column>
-               <column type="index">675a</column>
-       </UDC>
-
-       <OtherClass name="APA CC" order="81">
-               <column>686</column>
-               <column type="index">686</column>
-       </OtherClass>
--->
-
-       <library name="Dostupno u" order="85">
+       <library name="Knji¾nica: " order="85">
                <column>|C|</column>
        </library>
 
-<!--
-       <shelfNumber name="Signatura" order="90">
-               <column>990</column>
-               <column type="index">990</column>
-       </shelfNumber>
-
-       <invNo name="Inventarni broj" order="95">
-               <column delimiter=", ">991</column>
-               <column type="index">991</column>
-       </invNo>
--->
-
-       <type name="Tip graðe" type="display" order="100">
+       <type name="Vrsta graðe: " type="display" order="100">
                <!-- added via xml tag in .conf -->
+               <config>materialtype</config>
        </type>