moving unimarc subtypes to an include, adding UNIMARC flag

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 0879c02..049d03d 100755 (executable)
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -183,15 +183,12 @@ if ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || (
     $template_name = 'catalogue/results.tmpl';
 }
 else {
-       # use a UNIMARC-specific template if UNIMARC
-       if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
-       $template_name = 'catalogue/advsearch_unimarc.tmpl';
-       }
-       else {
     $template_name = 'catalogue/advsearch.tmpl';
-       }
        $template_type = 'advsearch';
 }
+if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
+       $template->param('UNIMARC' => 1);
+}
 # load the template
 ($template, $borrowernumber, $cookie) = get_template_and_user({
     template_name => $template_name,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
new file mode 100644 (file)
index 0000000..afc4208
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc
@@ -0,0 +1,206 @@
+</div>
+<div id="sidebar">
+<!-- SUBTYPE LIMITS -->
+               <fieldset>
+               <legend>Champs Cod&eacute;s</legend>
+               <p>
+               <label>Public</label>
+               <select name="limit" class="subtype">
+            <option value="" SELECTED="selected" class="menuheader">Tout public</option>
+                       <option value="aud:a">Jeunesse en g&eacute;n&eacute;ral</option>
+                       <option value="aud:b">Pr&eacute;-scolaire</option>
+                       <option value="aud:c">scolaire</option>
+                       <option value="aud:d">enfant</option>
+                       <option value="aud:e">jeune adulte</option>
+                       <option value="aud:k">adulte, haut niveau</option>
+                       <option value="aud:m">fiction ou vulg adulte</option>
+                       <option value="aud:u">inconnu</option>
+               </select>
+               </p>
+               <p>
+               <label>Format</label>
+        <select name="limit" class="subtype">
+                       <option value="" selected="selected" class="menuheader">Tout format</option>
+                               <option value="Material-type:r">Impression normale</option>
+                               <option value="Material-type:d">Impression en gros caractere</option>
+                               <option value="Material-type:e">Journal</option>
+                               <option value="Material-type:f">Caractere braille et moon</option>
+                               <option value="Material-type:g">Micro-impression</option>
+                               <option value="Material-type:h">Manuscrit</option>
+                               <option value="Material-type:i">Multimedia</option>
+                               <option value="Material-type:j">Impression en reduction</option>
+                               <option value="Material-type:z">Autres formes de presentation</option>
+               </select>
+               </p>
+               <p>
+               <label>Forme</label>
+               <select name="limit" class="subtype">
+                       <option value="" selected="selected" class="menuheader">Toute forme</option>
+            <option value="Literature-Code:a">fiction, roman</option>
+            <option value="Literature-Code:b">Theatre, piece televisee</option>
+            <option value="Literature-Code:c">Essais</option>
+            <option value="Literature-Code:d">Humour, satire</option>
+            <option value="Literature-Code:e">Lettres</option>
+            <option value="Literature-Code:f">Nouvelles</option>
+            <option value="Literature-Code:g">Poesie</option>
+            <option value="Literature-Code:h">Discours, art oratoire</option>
+            <option value="Literature-Code:y">Il ne s'agit pas d'un texte litteraire</option>
+            <option value="Literature-Code:z">formes vari&eacute;es ou autres formes litteraires</option>
+               </select>
+               </p>
+        <p>
+               <label>Biographie</label>
+        <select name="limit" class="subtype" size="1">
+            <option value="">Tout type de biographie</option>
+            <option value="Biography-code:y">C'est pas une biographie</option>
+            <option value="Biography-code:a">autobiographie (y compris correspondance...)</option>
+            <option value="Biography-code:b">Biographie individuelle</option>
+            <option value="Biography-code:c">Biographie collective</option>
+            <option value="Biography-code:d">Contient des informations biographiques</option>
+               </select>
+        </p>
+        <p>
+               <label>Illustration</label>
+        <select name="limit" class="subtype" size="1">
+            <option value="">Tout type d'illustration</option>
+            <option value="Illustration-Code:a">Illustrations</option>
+            <option value="Illustration-Code:b">Cartes</option>
+            <option value="Illustration-Code:c">Portraits</option>
+            <option value="Illustration-Code:d">cartes marines</option>
+            <option value="Illustration-Code:e">plans</option>
+            <option value="Illustration-Code:f">Planches</option>
+            <option value="Illustration-Code:g">Musique imprimee</option>
+            <option value="Illustration-Code:h">fac-similes</option>
+            <option value="Illustration-Code:i">armoiries</option>
+            <option value="Illustration-Code:j">Tables Genealogique</option>
+            <option value="Illustration-Code:k">Formulaires</option>
+            <option value="Illustration-Code:l">Specimens</option>
+            <option value="Illustration-Code:m">Enregistrement sonore</option>
+            <option value="Illustration-Code:n">Transparents</option>
+            <option value="Illustration-Code:o">Enluminures</option>
+            <option value="Illustration-Code:y">Sans illustrations</option>
+        </select>
+        </p>
+               <p>
+               <label>Contenu</label>
+               <select name="limit" class="subtype">
+                       <option value="" >Tout type de contenu</option>
+            <option value="ctype:a" >Bibliographie</option>
+            <option value="ctype:b" >Catalogue</option>
+            <option value="ctype:c" >index</option>
+            <option value="ctype:d" >resume</option>
+            <option value="ctype:e" >Dictionnaire</option>
+            <option value="ctype:f" >encyclopedie</option>
+            <option value="ctype:g" >Repertoire</option>
+            <option value="ctype:h" >Description projet</option>
+            <option value="ctype:i" >statistiques</option>
+            <option value="ctype:j" >Manuels d'enseignement programme</option>
+            <option value="ctype:k" >Brevet</option>
+            <option value="ctype:l" >norme</option>
+            <option value="ctype:m" >Memoire ou these</option>
+            <option value="ctype:n" >Lois et decrets</option>
+            <option value="ctype:o" >Table numerique</option>
+            <option value="ctype:p" >Rapport technique</option>
+            <option value="ctype:q" >Sujet d'examen</option>
+            <option value="ctype:r" >Synthese bibliographique</option>
+            <option value="ctype:s" >Traite</option>
+            <option value="ctype:t" >Bande dessinee</option>
+            <option value="ctype:z" >Autres</option>
+               </select>
+        </p>
+        <p>
+               <label>Type vid&eacute;o</label>
+               <select name="limit" class="subtype">
+            <option value="">Tout type video</option>
+                       <option value="Video-mt:a">Film</option>
+                       <option value="Video-mt:b">Document &agrave; projeter</option>
+                       <option value="Video-mt:c">Enregistrement video</option>
+               </select>
+        </p>
+               </fieldset>
+               <fieldset>
+               <legend>P&eacute;riodique</legend><p>
+               <p>
+               <label>Type periodique</label>
+               <select name="limit" class="subtype">
+           <option value="">Tout type de periodique</option>
+           <option value="Type-Of-Serial:a">Periodique</option>
+                       <option value="Type-Of-Serial:b">Collection des monographies</option>
+                       <option value="Type-Of-Serial:c">Journal</option>
+                       <option value="Type-Of-Serial:z">autres</option>
+               </select>
+               </p>
+               <p>
+               <label>P&eacute;riodicit&eacute;</label>
+               <select name="limit" class="subtype">
+                       <option value="">Toute P&eacute;riodicit&eacute;</option>
+                               <option value="Frequency-code:a">Quotidien</option>
+                               <option value="Frequency-code:b">Bihebdomadaire</option>
+                               <option value="Frequency-code:c">Hebdomadaire</option>
+                               <option value="Frequency-code:d">Toutes les deux semaines</option>
+                               <option value="Frequency-code:e">Deux fois par mois</option>
+                               <option value="Frequency-code:f">Mensuel</option>
+                               <option value="Frequency-code:g">Bimestriel</option>
+                               <option value="Frequency-code:h">Trimestriel</option>
+                               <option value="Frequency-code:i">Trois fois par an</option>
+                               <option value="Frequency-code:j">Semestriel</option>
+                               <option value="Frequency-code:k">Annuel</option>
+                               <option value="Frequency-code:l">Bisanuel</option>
+                               <option value="Frequency-code:m">Triennal</option>
+                               <option value="Frequency-code:n">Trois fois par semaine</option>
+                               <option value="Frequency-code:o">Trois fois par mois</option>
+                               <option value="Frequency-code:u">Inconnue</option>
+                               <option value="Frequency-code:y">Sans periodicite</option>
+                               <option value="Frequency-code:i">Autre</option>
+               </select>
+               </p>
+               <p>
+               <label>Toute R&eacute;gularit&eacute;</label>
+               <select name="limit" class="subtype">
+            <option value="">R&eacute;gularit&eacute;</option>
+                               <option value="Regularity-code:u">Inconnu</option>
+                               <option value="Regularity-code:a">Regulier</option>
+                               <option value="Regularity-code:b">Normalement irregulier</option>
+                               <option value="Regularity-code:y">Irregulier</option>
+               </select>
+        </p>
+
+        </fieldset>
+               <fieldset>
+               <legend>Document pictural</legend><p>
+               <select name="limit" class="subtype">
+                               <option value="">Tout type</option>
+                               <option value="Graphics-type:a">Collage</option>
+                               <option value="Graphics-type:b">Dessin</option>
+                               <option value="Graphics-type:c">Peinture</option>
+                               <option value="Graphics-type:d">Reproduction photomecanique</option>
+                               <option value="Graphics-type:e">Negatif photo</option>
+                               <option value="Graphics-type:f">Tirage photographique</option>
+                               <option value="Graphics-type:h">Image</option>
+                               <option value="Graphics-type:i">Gravure</option>
+                               <option value="Graphics-type:k">Dessin technique</option>
+                               <option value="Graphics-type:z">Autres types de documents graphique non projetable</option>
+               </select>
+               <select name="limit" class="subtype">
+            <option value="">tout support</option>
+            <option value="Graphics-support:a">Toile</option>
+            <option value="Graphics-support:b">Carte bristol</option>
+            <option value="Graphics-support:c">Carton / carte a dessin</option>
+            <option value="Graphics-support:d">Verre</option>
+            <option value="Graphics-support:j">Platre</option>
+            <option value="Graphics-support:k">Isorel</option>
+            <option value="Graphics-support:l">Porcelaine</option>
+            <option value="Graphics-support:m">Pierre</option>
+            <option value="Graphics-support:n">Bois</option>
+            <option value="Graphics-support:u">Inconnu</option>
+            <option value="Graphics-support:v">Support composite</option>
+            <option value="Graphics-support:e">Synthetique (plastique, vinyle...)</option>
+            <option value="Graphics-support:f">Peau</option>
+            <option value="Graphics-support:g">Textile</option>
+            <option value="Graphics-support:h">Metal</option>
+            <option value="Graphics-support:i">Papier</option>
+            <option value="Graphics-support:z">Autres</option>
+               </select>
+        </p>
+
+</fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 6df5d5e..b536f59 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -193,6 +193,9 @@
 
 </div>
 </div>
+<!-- TMPL_IF NAME="UNIMARC" -->
+<!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
+<!-- TMPL_ELSE -->
 <div id="sidebar">
 <!-- SUBTYPE LIMITS -->
         <fieldset>
@@ -258,6 +261,7 @@
        </p>
 
 </fieldset>
+<!-- /TMPL_ELSE -->
 
 <!-- AVAILABILITY LIMITS -->
     <fieldset><legend>Location and availability: </legend>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch_unimarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch_unimarc.tmpl
deleted file mode 100644 (file)
index 7be5ff9..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch_unimarc.tmpl
+++ /dev/null
@@ -1,571 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Catalogue &rsaquo; Advanced Search</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/JavaScript" language="JavaScript">
-       /**
-        *  Function add_field();
-        *  This function allows to display a new field to search.
-        */
-       function add_field() {
-           var ButtonPlus = document.getElementById('ButtonPlus');
-               var line = ButtonPlus.parentNode;
-               var dad  = line.parentNode;
-               dad.appendChild(line.cloneNode(true));
-               line.removeChild(ButtonPlus);
-           //var line       = ButtonPlus.parentNode;
-           //var dad        = line.parentNode;
-           //dad.appendChild(line.cloneNode(true));
-           //line.removeChild(ButtonPlus);
-       }
-</script>
-</head>
-<body>
-
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<div id="doc" class="yui-t7">
-   <div id="bd">
-       
-<form action="search.pl" method="get">
-<div id="advanced-search">
-<!-- TMPL_IF NAME="expanded_options" -->
-<h1>Advanced Search</h1>
-<!-- TMPL_ELSE -->
-<h1>Search the Catalogue</h1>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="outer_servers_loop" -->
-<!-- DATABASES -->
-
-<fieldset>
-        <legend>Select local databases</legend>
-                <!-- TMPL_LOOP NAME="local_servers_loop" -->
-                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
-                <!-- /TMPL_LOOP -->
-</fieldset>
-<!-- /DATABASES -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="outer_servers_loop" -->
-<!-- REMOTE DATABASES -->
-<fieldset>
-    <legend>Select remote databases:</legend>
-                <!-- TMPL_LOOP NAME="outer_servers_loop" -->
-                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /><!-- TMPL_VAR NAME="label" --></label>
-                <!-- /TMPL_LOOP -->
-    </fieldset>
-<!-- /REMOTE DATABASES -->
-<!-- /TMPL_IF -->
-
-<!-- BOOLEAN SEARCH OPTIONS -->
-    <fieldset>
-    <legend>Search For: </legend>
-    <!-- TMPL_LOOP NAME="search_boxes_loop" -->
-        <div>
-            <!-- TMPL_IF NAME="boolean" -->
-                <select name="op">
-                    <option value="+" selected="selected">and</option>
-                    <option value="|">or</option>
-                    <option value="!">not</option>
-                </select>
-            <!-- /TMPL_IF --> 
-            <select name="idx">
-                <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
-                <option value="au,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
-                <option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
-                <option value="cpn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
-                <option value="cfn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-                <option value="cpn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name Phrase</option>
-                <option value="cfn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Conference Name Phrase</option>
-                <option value="pn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-                <option value="pn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
-                <option value="ln" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Language</option>
-                <option value="nt,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
-                <option value="pb,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
-                <option value="pl,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
-                <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
-                <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
-                <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
-                <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-                <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
-                <option value="su,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
-                <option value="su,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
-                <option value="ti,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
-                <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
-                <option value="se,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
-                <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
-            </select>
-            <input id="search_box" type="text" size="30" name="q" title="Enter search terms" value="" class="focus" />
-
-            <!-- TMPL_IF NAME="expanded_options" -->
-                <!-- TMPL_IF NAME="add_field" -->
-                    <a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>
-                               <!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="scan_index" -->
-                       <label for="scan">Scan Indexes</label><input type="checkbox" name="scan" id="scan" value="1" />
-               <!-- /TMPL_IF -->
-            <!-- /TMPL_IF -->
-               </div>
-    <!-- /TMPL_LOOP -->
-    </fieldset>
-<!-- /BOOLEAN SEARCH OPTIONS -->
-    <div id="itemtypelist">
-    <h2>Limit type to: match any of the following:</h2>
-    <table>
-        <tr>
-      <!--TMPL_LOOP Name="itemtypeloop"-->
-        <td>
-        <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
-               <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->" />&nbsp;
-        <!--TMPL_VAR Name="description" --></td>
-        <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
-      <!--/TMPL_LOOP-->
-      </tr>
-    </table>
-    </div>
-<!-- BASIC LIMITS -->
-    <fieldset>
-
-    <legend>Limit type to: match any of the following</legend>
-    <table class="itemtypes">
-            <tr>
-            <td><input type="checkbox" id="mc-bks" name="limit" value="mc:t" />
-                       <label for="mc-bks" title="Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations">
-                       <img border="0" src="/intranet-tmpl/prog/img/AF.gif" alt="Books" />Books</label></td>
-                       <td><input type="checkbox" id="mc-vis" name="limit" value="mc:v" />
-                       <label for="mc-vis" title="Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif" alt="Visual Materials" />Visual Materials</label></td>
-            <td><input type="checkbox" id="mc-sr" name="limit" value="mc-rtype:i" />
-                       <label for="mc-sr" title="Spoken, Books on CD and Cassette">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books on Tape" />Books on Tape</label></td>
-            </tr>
-
-            <tr>
-            <td><input type="checkbox" id="mc-cf" name="limit" value="mc:c" />
-                       <label for="mc-cf" title="Computer files, Data, Software">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/CD-ROM software.gif" alt="Computer Files" />Computer Files</label></td>
-            <td><input type="checkbox" id="mc-lh" name="limit" value="mc-collection:LH" />
-                       <label for="mc-lh" title="Local History Materials">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/Local history.gif" alt="Local History Materials" />Local History Materials</label></td>
-            <td><input type="checkbox" id="mc-map" name="limit" value="mc:a" />
-                       <label for="mc-map" title="Maps, Globes">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/PF.gif " alt="Maps" />Maps</label></td>
-            </tr>
-
-            <tr>
-            <td><input type="checkbox" id="mc-mus" name="limit" value="mc-rtype:j" />
-                       <label for="mc-mus" title="Music">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/CDM.gif" alt="Music" />Music</label></td>
-            <td><input type="checkbox" id="mc-kit" name="limit" value="mc-rtype:o" />
-                       <label for="mc-kit" title="Kits"><img border="0" src="/intranet-tmpl/prog/en/images/KIT.gif" alt="Kits" />Kits</label></td>
-            <td><input type="checkbox" id="mc-ref" name="limit" value="mc-collection:REF" />
-                       <label for="mc-ref" title="Reference">
-                       <img border="0" src="/intranet-tmpl/prog/en/images/REF.gif" alt="Reference" />Reference</label></td>
-            </tr>
-            
-            </table>
-</fieldset>
-<!-- /TYPE LIMITS -->
-
-
-</div>
-</div>
-<div id="sidebar">
-<!-- SUBTYPE LIMITS -->
-        <fieldset>
-        <legend>Subtype limits</legend><p>
-        
-        <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any Audience</option>
-            <option value="aud:a" >Easy</option>
-            <option value="aud:c" >Juvenile</option>
-            <option value="aud:d" >Young Adult</option>
-            <option value="aud:e" >Adult</option>
-        </select>
-        
-        <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any Content</option>
-            <option value="fic:1" >Fiction</option>
-            <option value="fic:0" >Non Fiction</option>
-            <option value="bio:b" >Biography</option>
-            <option value="mus:j" >Musical recording</option>
-            <option value="mus:i" >Non-musical recording</option>
-        </select>
-
-        
-        <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any Format</option>
-            <option value="l-format:ta" >Regular print</option>
-            <option value="l-format:tb" >Large print</option>
-            <option value="l-format:fk" >Braille</option>
-            <option value="" >-----------</option>
-            <option value="l-format:sd" >CD audio</option>
-            <option value="l-format:ss" >Cassette recording</option>
-            <option value="l-format:vf" >VHS tape / Videocassette</option>
-            <option value="l-format:vd" >DVD video / Videodisc</option>
-            <option value="l-format:co" >CD Software</option>
-            <option value="l-format:cr" >Website</option>
-        </select>
-        
-        <select name="limit" class="subtype">
-            <option value="" >Additional Content Types</option>
-            <option value="ctype:a" >Abstracts/summaries</option>
-            <option value="ctype:b" >Bibliographies</option>
-            <option value="ctype:c" >Catalogs</option>
-            <option value="ctype:d" >Dictionaries</option>
-            <option value="ctype:e" >Encyclopedias </option>
-            <option value="ctype:f" >Handbooks</option>
-            <option value="ctype:g" >Legal articles</option>
-            <option value="ctype:i" >Indexes</option>
-            <option value="ctype:j" >Patent document</option>
-            <option value="ctype:k" >Discographies</option>
-            <option value="ctype:l" >Legislation</option>
-            <option value="ctype:m" >Theses</option>
-            <option value="ctype:n" >Surveys</option>
-            <option value="ctype:o" >Reviews</option>
-            <option value="ctype:p" >Programmed texts</option>
-            <option value="ctype:q" >Filmographies</option>
-            <option value="ctype:r" >Directories</option>
-            <option value="ctype:s" >Statistics</option>
-            <option value="ctype:t" >Technical reports</option>
-            <option value="ctype:v" >Legal cases and case notes</option>
-            <option value="ctype:w" >Law reports and digests</option>
-            <option value="ctype:z" >Treaties </option>
-        </select>
-       </p>
-
-</fieldset>
-
-<!--TMPL_IF Name="UNIMARC" -->
-</div>
-<div id="sidebar">
-<!-- SUBTYPE LIMITS -->
-               <fieldset>
-               <legend>Champs Cod&eacute;s</legend>
-               <p>
-               <label>Public</label>
-               <select name="limit" class="subtype">
-            <option value="" SELECTED="selected" class="menuheader">Tout public</option>
-                       <option value="aud:a">Jeunesse en g&eacute;n&eacute;ral</option>
-                       <option value="aud:b">Pr&eacute;-scolaire</option>
-                       <option value="aud:c">scolaire</option>
-                       <option value="aud:d">enfant</option>
-                       <option value="aud:e">jeune adulte</option>
-                       <option value="aud:k">adulte, haut niveau</option>
-                       <option value="aud:m">fiction ou vulg adulte</option>
-                       <option value="aud:u">inconnu</option>
-               </select>
-               </p>
-               <p>
-               <label>Format</label>
-        <select name="limit" class="subtype">
-                       <option value="" selected="selected" class="menuheader">Tout format</option>
-                               <option value="Material-type:r">Impression normale</option>
-                               <option value="Material-type:d">Impression en gros caractere</option>
-                               <option value="Material-type:e">Journal</option>
-                               <option value="Material-type:f">Caractere braille et moon</option>
-                               <option value="Material-type:g">Micro-impression</option>
-                               <option value="Material-type:h">Manuscrit</option>
-                               <option value="Material-type:i">Multimedia</option>
-                               <option value="Material-type:j">Impression en reduction</option>
-                               <option value="Material-type:z">Autres formes de presentation</option>
-               </select>
-               </p>
-               <p>
-               <label>Forme</label>
-               <select name="limit" class="subtype">
-                       <option value="" selected="selected" class="menuheader">Toute forme</option>
-            <option value="Literature-Code:a">fiction, roman</option>
-            <option value="Literature-Code:b">Theatre, piece televisee</option>
-            <option value="Literature-Code:c">Essais</option>
-            <option value="Literature-Code:d">Humour, satire</option>
-            <option value="Literature-Code:e">Lettres</option>
-            <option value="Literature-Code:f">Nouvelles</option>
-            <option value="Literature-Code:g">Poesie</option>
-            <option value="Literature-Code:h">Discours, art oratoire</option>
-            <option value="Literature-Code:y">Il ne s'agit pas d'un texte litteraire</option>
-            <option value="Literature-Code:z">formes vari&eacute;es ou autres formes litteraires</option>
-               </select>
-               </p>
-        <p>
-               <label>Biographie</label>
-        <select name="limit" class="subtype" size="1">
-            <option value="">Tout type de biographie</option>
-            <option value="Biography-code:y">C'est pas une biographie</option>
-            <option value="Biography-code:a">autobiographie (y compris correspondance...)</option>
-            <option value="Biography-code:b">Biographie individuelle</option>
-            <option value="Biography-code:c">Biographie collective</option>
-            <option value="Biography-code:d">Contient des informations biographiques</option>
-               </select>
-        </p>
-        <p>
-               <label>Illustration</label>
-        <select name="limit" class="subtype" size="1">
-            <option value="">Tout type d'illustration</option>
-            <option value="Illustration-Code:a">Illustrations</option>
-            <option value="Illustration-Code:b">Cartes</option>
-            <option value="Illustration-Code:c">Portraits</option>
-            <option value="Illustration-Code:d">cartes marines</option>
-            <option value="Illustration-Code:e">plans</option>
-            <option value="Illustration-Code:f">Planches</option>
-            <option value="Illustration-Code:g">Musique imprimee</option>
-            <option value="Illustration-Code:h">fac-similes</option>
-            <option value="Illustration-Code:i">armoiries</option>
-            <option value="Illustration-Code:j">Tables Genealogique</option>
-            <option value="Illustration-Code:k">Formulaires</option>
-            <option value="Illustration-Code:l">Specimens</option>
-            <option value="Illustration-Code:m">Enregistrement sonore</option>
-            <option value="Illustration-Code:n">Transparents</option>
-            <option value="Illustration-Code:o">Enluminures</option>
-            <option value="Illustration-Code:y">Sans illustrations</option>
-        </select>
-        </p>
-               <p>
-               <label>Contenu</label>
-               <select name="limit" class="subtype">
-                       <option value="" >Tout type de contenu</option>
-            <option value="ctype:a" >Bibliographie</option>
-            <option value="ctype:b" >Catalogue</option>
-            <option value="ctype:c" >index</option>
-            <option value="ctype:d" >resume</option>
-            <option value="ctype:e" >Dictionnaire</option>
-            <option value="ctype:f" >encyclopedie</option>
-            <option value="ctype:g" >Repertoire</option>
-            <option value="ctype:h" >Description projet</option>
-            <option value="ctype:i" >statistiques</option>
-            <option value="ctype:j" >Manuels d'enseignement programme</option>
-            <option value="ctype:k" >Brevet</option>
-            <option value="ctype:l" >norme</option>
-            <option value="ctype:m" >Memoire ou these</option>
-            <option value="ctype:n" >Lois et decrets</option>
-            <option value="ctype:o" >Table numerique</option>
-            <option value="ctype:p" >Rapport technique</option>
-            <option value="ctype:q" >Sujet d'examen</option>
-            <option value="ctype:r" >Synthese bibliographique</option>
-            <option value="ctype:s" >Traite</option>
-            <option value="ctype:t" >Bande dessinee</option>
-            <option value="ctype:z" >Autres</option>
-               </select>
-        </p>
-        <p>
-               <label>Type vid&eacute;o</label>
-               <select name="limit" class="subtype">
-            <option value="">Tout type video</option>
-                       <option value="Video-mt:a">Film</option>
-                       <option value="Video-mt:b">Document &agrave; projeter</option>
-                       <option value="Video-mt:c">Enregistrement video</option>
-               </select>
-        </p>
-               </fieldset>
-               <fieldset>
-               <legend>P&eacute;riodique</legend><p>
-               <p>
-               <label>Type periodique</label>
-               <select name="limit" class="subtype">
-           <option value="">Tout type de periodique</option>
-           <option value="Type-Of-Serial:a">Periodique</option>
-                       <option value="Type-Of-Serial:b">Collection des monographies</option>
-                       <option value="Type-Of-Serial:c">Journal</option>
-                       <option value="Type-Of-Serial:z">autres</option>
-               </select>
-               </p>
-               <p>
-               <label>P&eacute;riodicit&eacute;</label>
-               <select name="limit" class="subtype">
-                       <option value="">Toute P&eacute;riodicit&eacute;</option>
-                               <option value="Frequency-code:a">Quotidien</option>
-                               <option value="Frequency-code:b">Bihebdomadaire</option>
-                               <option value="Frequency-code:c">Hebdomadaire</option>
-                               <option value="Frequency-code:d">Toutes les deux semaines</option>
-                               <option value="Frequency-code:e">Deux fois par mois</option>
-                               <option value="Frequency-code:f">Mensuel</option>
-                               <option value="Frequency-code:g">Bimestriel</option>
-                               <option value="Frequency-code:h">Trimestriel</option>
-                               <option value="Frequency-code:i">Trois fois par an</option>
-                               <option value="Frequency-code:j">Semestriel</option>
-                               <option value="Frequency-code:k">Annuel</option>
-                               <option value="Frequency-code:l">Bisanuel</option>
-                               <option value="Frequency-code:m">Triennal</option>
-                               <option value="Frequency-code:n">Trois fois par semaine</option>
-                               <option value="Frequency-code:o">Trois fois par mois</option>
-                               <option value="Frequency-code:u">Inconnue</option>
-                               <option value="Frequency-code:y">Sans periodicite</option>
-                               <option value="Frequency-code:i">Autre</option>
-               </select>
-               </p>
-               <p>
-               <label>Toute R&eacute;gularit&eacute;</label>
-               <select name="limit" class="subtype">
-            <option value="">R&eacute;gularit&eacute;</option>
-                               <option value="Regularity-code:u">Inconnu</option>
-                               <option value="Regularity-code:a">Regulier</option>
-                               <option value="Regularity-code:b">Normalement irregulier</option>
-                               <option value="Regularity-code:y">Irregulier</option>
-               </select>
-        </p>
-
-        </fieldset>
-               <fieldset>
-               <legend>Document pictural</legend><p>
-               <select name="limit" class="subtype">
-                               <option value="">Tout type</option>
-                               <option value="Graphics-type:a">Collage</option>
-                               <option value="Graphics-type:b">Dessin</option>
-                               <option value="Graphics-type:c">Peinture</option>
-                               <option value="Graphics-type:d">Reproduction photomecanique</option>
-                               <option value="Graphics-type:e">Negatif photo</option>
-                               <option value="Graphics-type:f">Tirage photographique</option>
-                               <option value="Graphics-type:h">Image</option>
-                               <option value="Graphics-type:i">Gravure</option>
-                               <option value="Graphics-type:k">Dessin technique</option>
-                               <option value="Graphics-type:z">Autres types de documents graphique non projetable</option>
-               </select>
-               <select name="limit" class="subtype">
-            <option value="">tout support</option>
-            <option value="Graphics-support:a">Toile</option>
-            <option value="Graphics-support:b">Carte bristol</option>
-            <option value="Graphics-support:c">Carton / carte a dessin</option>
-            <option value="Graphics-support:d">Verre</option>
-            <option value="Graphics-support:j">Platre</option>
-            <option value="Graphics-support:k">Isorel</option>
-            <option value="Graphics-support:l">Porcelaine</option>
-            <option value="Graphics-support:m">Pierre</option>
-            <option value="Graphics-support:n">Bois</option>
-            <option value="Graphics-support:u">Inconnu</option>
-            <option value="Graphics-support:v">Support composite</option>
-            <option value="Graphics-support:e">Synthetique (plastique, vinyle...)</option>
-            <option value="Graphics-support:f">Peau</option>
-            <option value="Graphics-support:g">Textile</option>
-            <option value="Graphics-support:h">Metal</option>
-            <option value="Graphics-support:i">Papier</option>
-            <option value="Graphics-support:z">Autres</option>
-               </select>
-        </p>
-
-</fieldset>
-<!--/TMPL_IF-->
-
-
-
-
-
-<!--/TMPL_IF-->
-<!-- AVAILABILITY LIMITS -->
-    <fieldset><legend>Location and availability: </legend>
-        <p>
-        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="available" /></p>
-        <p>
-        <label>Individual Libraries </label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
-        <option value="">All Libraries</option>
-        <!-- TMPL_LOOP NAME="branchloop" -->
-        <option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
-        <!-- /TMPL_LOOP -->
-        </select>
-               <!-- <input type='hidden' name='limit' value='branch: MAIN' /> -->
-        </p>
-        <!-- TMPL_IF NAME="searchdomainloop" -->
-               <p>OR<p> <!-- should addjs to grey out group pulldown if a library is selected. -->
-               <p>
-        <label>Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
-        <option value=""> -- none -- </option>
-        <!-- TMPL_LOOP NAME="searchdomainloop" -->
-        <option value="<!-- TMPL_VAR NAME='categorycode' -->"><!-- TMPL_VAR NAME='categoryname' --></option>
-        <!-- /TMPL_LOOP -->
-        </select>
-        </p>
-               <!-- /TMPL_IF -->
-    </fieldset>
-<!-- /AVAILABILITY LIMITS -->
-
-<!-- RANK LIMITS -->
-<fieldset><legend>Sort by: </legend>
-    <p><select id="sort_by" name="sort_by">
-        <option value="">Field-weighted, Relevance Ranked</option>
-        <!--TMPL_IF Name="9523a"-->
-          <option value="1=9523 &gt;i" selected="selected">Popularity (Most to Least)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=9523 &gt;i">Popularity (Most to Least)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="9523d"-->
-          <option value="1=9523 &lt;i" selected="selected">Popularity (Least to Most)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=9523 &lt;i">Popularity (Least to Most)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="1003d"-->
-          <option value="1=1003 &lt;i" selected="selected">Author (A-Z)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=1003 &lt;i">Author (A-Z)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="1003a"-->
-         <option value="1=1003 &gt;i" selected="selected">Author (Z-A)</option>
-        <!--TMPL_ELSE -->
-         <option value="1=1003 &gt;i">Author (Z-A)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="20d"-->
-          <option value="1=20 &lt;i" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=20 &lt;i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="20a"-->
-          <option value="1=20 &gt;i" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=20 &gt;i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected="selected">Dates</option>
-        <!--TMPL_ELSE -->
-          <option value="1=31 &gt;i">Dates</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=31 &gt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="31d"-->
-          <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="32a"-->
-          <option value="1=32 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=32 &gt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="32d"-->
-          <option value="1=32 &lt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
-        <!--TMPL_ELSE -->
-          <option value="1=32 &lt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="4d"-->
-          <option value="1=4 &lt;i" selected="selected">Title (A-Z)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=4 &lt;i">Title (A-Z)</option>
-        <!--/TMPL_IF-->
-        <!--TMPL_IF Name="4a"-->
-          <option value="1=4 &gt;i" selected="selected">Title (Z-A)</option>
-        <!--TMPL_ELSE -->
-          <option value="1=4 &gt;i">Title (Z-A)</option>
-        <!--/TMPL_IF-->
-    </select>
-        </p>
-</fieldset>
-<!-- RANK LIMITS -->
-<!-- SEARCH BUTTONS -->
-            <p><input class="submit" type="submit" accesskey="s" value="Search" />
-            <!-- TMPL_IF NAME="expanded_options" -->
-            <a href="/cgi-bin/koha/catalogue/search.pl">[Fewer Options]</a>
-            <!-- TMPL_ELSE -->
-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
-            <!-- /TMPL_IF -->
-            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a> 
-            </p>
-<!-- /SEARCH BUTTONS -->
-</div>
-</form>
-
-
-
-</div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->