From 65a138985fa09888e7c332bf5cf1f492fc601d79 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 23 Feb 2003 00:01:08 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@22 13eb9ef6-21d5-0310-b721-a9d68796d827
---
 import_xml/isis.xml       | 91 ++++++++++++++++++++++++++++++++++-----
 parse_format.pm           | 10 +++++
 template_html/search.html | 20 ++++-----
 3 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/import_xml/isis.xml b/import_xml/isis.xml
index bdddb73..55640a6 100644
--- a/import_xml/isis.xml
+++ b/import_xml/isis.xml
@@ -18,15 +18,33 @@
 		<isis type="display">200a : 200e / 200f , 210d</isis>
 	</headline>
 
-	<author name_singular="Autor" name_plural="Autori">
-		<isis type="swish">700 701 710 702 711 503 200f 200g</isis>
+	<IdentificationNumbers name="ISN">
+		<isis type="swish" filter="isn_swish">10 11</isis>
+		<isis type="index">10</isis>
+		<isis type="index">11</isis>
+	</IdentificationNumbers>
+
+	<ISBN name="ISBN">
+		<isis type="display">10</isis>
+	</ISBN>
+
+	<ISSN name="ISSN">
+		<isis type="display">11</isis>
+	</ISSN>
+
+	<Author name="Autor">
+		<isis type="swish">700 701 702 710 711 503 200f 200g</isis>
 		<isis type="display">700a, 700b</isis>
-		<isis type="display">; 701a, 701b</isis>
-		<!-- FIX -->
-		<isis type="display">; 701c, 701d; 710a : 710b, 710c (710d ; 710f ; 710e) 503a, 503b</isis>
+		<isis type="display">710a. 710b (710d ; 710f ; 710e)</isis>
+		<isis type="display">503a, 503b</isis>
 		<isis type="index">700a, 700b</isis>
-	</author>
-	<title name="Naslov">
+		<isis type="index">701a, 701b</isis>
+		<isis type="index">702a, 702b</isis>	
+		<isis type="index">710a</isis>
+		<isis type="index">503a, 503b</isis>
+	</Author>
+	
+	<TitleAndResponsibility name="Naslov">
 		<isis>200a : 299e ; 200k</isis>
 		<isis type="swish">200d 200c</isis>
 		<isis type="swish">225a</isis>
@@ -36,14 +54,58 @@
 		<isis type="swish">532</isis>
 		<isis append="1" type="display"> = 200d / 200f ; 200g. 200c</isis>
 		<isis type="index">200a</isis>
-	</title>
+	</TitleAndResponsibility>
+
+	<EditionStatement name="Izdanje">
+		<isis type="display">205a</isis>
+	</EditionStatement>
+	
+	<Date name="Godina izdavanja">
+		<isis type="swish">210d</isis>
+	</Date>
+
+	<Publisher name="Izdavaè">
+		<isis type="swish">210a 210c</isis>
+		<isis type="index">210c, 210a</isis>
+	</Publisher>
+
+	<Publication name="Impresum">
+		<isis type="display">210a : 210c, 210d</isis>
+	</Publication>
+	
+	<PhisicalDescription name="Materijalni opis">
+		<isis type="swish">215a : 215c ; 215d</isis>
+		<isis type="display">215a : 215c ; 215d</isis>
+	</PhisicalDescription>
 
-	<uncontr_subject name="Tema">
+	<Series name="Nakladnièka cjelina">
+		<isis>225a : 225e ; 225v. 225h, 225i ; 225w</isis>
+	</Series>
+	
+	<Note name="Napomena">
+		<isis delimiter=". -">300</isis>
+		<isis append="1" delimiter=". -">320</isis>
+	</Note>
+
+	<ContentsNote name="Sadr¾aj">
+		<isis>327</isis>
+	</ContentsNote>
+	
+	<Uncontrolled_Terms name="Tema">
 		<isis delimiter=" ; " format="upper">610 </isis>	
 <!--
 		<isis type="index">610</isis>
 -->
-	</uncontr_subject>
+	</Uncontrolled_Terms>
+	
+	<UDC name="UDK">
+		<isis>675a</isis>
+	</UDC>
+
+	<contents name="Sadr¾aj">
+		<isis>330</isis>
+	</contents>
+
 
 	<title_vol name="Podaci o svescima">
 		<isis type="display">&lt;br&gt;230v : 230a. - 250. - 260&lt;br&gt;ISBN 290</isis>
@@ -52,14 +114,23 @@
 		<isis type="display">&lt;br&gt;233v : 233a. - 253. - 263&lt;br&gt;ISBN 293</isis>
 	</title_vol>
 
+	<shelfNumber name="Signatura">
+		<isis>990</isis>
+	</shelfNumber>
+
 	<library name="Knji¾nica">
 		<isis>801a</isis>
 		<isis type="index">801a</isis>
 	</library>
 
+	<invNo name="Inventarni broj">
+		<isis delimiter=", ">991</isis>
+	</invNo>
+
 	<tip name="Tip graðe" type="display">
 		<!-- added via xml tag in .conf -->
 	</tip>
 
+
     </indexer>
 </config>
diff --git a/parse_format.pm b/parse_format.pm
index 6dadcf6..06462d8 100644
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -29,6 +29,16 @@ sub parse_format {
 				$swish .= $isis_tmp." ";
 			}
 			$prefix = "";
+		# this might be our local scpeciality -- fields 10 and 11
+		# (as opposed to 010 and 011) so they are strictly listed
+		# here
+		} elsif ($format =~ s/^(1[01])//) {
+			my $isis_tmp = isis_sf($row,$1,$2);
+			if ($isis_tmp) {
+				$display .= $prefix . $isis_tmp;
+				$swish .= $isis_tmp." ";
+			}
+			$prefix = "";
 		} elsif ($format =~ s/^([^\d]+)(\d{0,3})/$2/) {
 			$prefix .= $1;
 		} elsif ($format =~ s/^([^\d]+\d{0,2})//) {
diff --git a/template_html/search.html b/template_html/search.html
index 436340e..d246522 100644
--- a/template_html/search.html
+++ b/template_html/search.html
@@ -45,7 +45,7 @@
       <tr> 
         <td class="label" width="110" ><a href="author_help.html" title="Pomoæ">Autor(i):</a></td>
         <td class="inputfield" width="280" > 
-	  <input type="hidden" name="f2" value="author">
+	  <input type="hidden" name="f2" value="Author">
           <input size="30" type="text" name="v2" value="">
 	  <input type=submit value="index" name="f2_index" class="navigacija">
           </td>
@@ -54,7 +54,7 @@
       <tr> 
         <td class="label" width="110" ><a href="_help.html" title="Pomoæ">Naslov:</a></td>
         <td class="inputfield" width="280"> 
-	  <input type="hidden" name="f3" value="title">
+	  <input type="hidden" name="f3" value="TitleAndResponsibility">
           <input size="30" type="text" name="v3">
 	  <input type=submit value="index" name="f3_index" class="navigacija">
           </td>
@@ -63,7 +63,7 @@
       <tr> 
         <td class="label" width="110" ><a href="_help.html" title="Pomoæ">Godina:</a></td>
         <td class="inputfield" width="280"> 
-	  <input type="hidden" name="f4" value="year">
+	  <input type="hidden" name="f4" value="Date">
           <input  size="30" type="text" name="v4">
         </td>
         <td class="example">npr.</td>
@@ -71,25 +71,25 @@
       <tr> 
         <td class="label" width="110" ><a href="_help.html" title="Help on search terms">Izdavaè:</a></td>
         <td class="inputfield" width="280"> 
-	  <input type="hidden" name="f4" value="publisher">
-          <input  size="30" type="text" name="v4">
-	  <input type=submit value="index" name="f4_index" class="navigacija">
+	  <input type="hidden" name="f5" value="Publisher">
+          <input  size="30" type="text" name="v5">
+	  <input type=submit value="index" name="f5_index" class="navigacija">
           </td>
         <td class="example">npr.</td>
       </tr>
       <tr> 
         <td class="label" width="110" ><a href="_help.html" title="Help on search terms">ISBN/ISSN:</a></td>
         <td  class="inputfield" width="280"> 
-	  <input type="hidden" name="f5" value="isn">
-          <input  size="15" type="text" name="v5">
-	  <input type=submit value="index" name="f5_index" class="navigacija">
+	  <input type="hidden" name="f6" value="IdentificationNumbers">
+          <input  size="15" type="text" name="v6">
+	  <input type=submit value="index" name="f6_index" class="navigacija">
           </td>
         <td class="example">npr.</td>
       </tr>
       <tr> 
         <td width="110" class="label" > <a href="_help.html">Ostala polja:</a><br>
           <select name="f9">
-            <option value="101" selected>Jezik </option>
+            <option value="Language" selected>Jezik </option>
             <option value="610">Tema (podruèje)</option>
             <option value="225">Nakl. cjelina</option>
             <option value="300+">Napomene </option>
-- 
2.20.1