Searching Patch 1: fixing searching in 3.0
authorJoshua Ferraro <jmf@liblime.com>
Mon, 29 Oct 2007 22:42:26 +0000 (17:42 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Mon, 29 Oct 2007 22:45:14 +0000 (17:45 -0500)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

C4/Search.pm
catalogue/search.pl
changelanguage.pl [new file with mode: 0755]
etc/zebradb/biblios/etc/bib1.att
etc/zebradb/biblios/etc/record.abs
etc/zebradb/ccl.properties
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch_unimarc.tmpl [new file with mode: 0644]

index 09b324d..860b216 100644 (file)
@@ -572,8 +572,8 @@ sub buildQuery {
             # otherwise, a french word like "leçon" is splitted in "le" "çon", le is an empty word, we get "çon"
             # and don't find anything...
             my $stemmed_operand;
-            my $stemming      = C4::Context->parameters("Stemming")     || 0;
-            my $weight_fields = C4::Context->parameters("WeightFields") || 0;
+            my $stemming      = C4::Context->preference("Stemming")     || 0;
+            my $weight_fields = C4::Context->preference("WeightFields") || 0;
 
             # We Have to do this more carefully.
             #Since Phrase Search Is Phrase search.
index 2f05649..f1e48bd 100755 (executable)
 
 =head1 NAME
 
-search - a search script for finding records in a Koha system (Version 2.4)
+search - a search script for finding records in a Koha system (Version 3.0)
 
 =head1 OVERVIEW
 
-This script contains a demonstration of a new search API for Koha 2.4. It is
-designed to be simple to use and configure, yet capable of performing feats
-like stemming, field weighting, relevance ranking, support for multiple 
-query language formats (CCL, CQL, PQF), full or nearly full support for the
+This script contains a new search API for Koha 3.0. It is designed to be 
+simple to use and configure, yet capable of performing feats like stemming,
+field weighting, relevance ranking, support for multiple  query language
+formats (CCL, CQL, PQF), full or nearly full support for the
 bib1 attribute set, extended attribute sets defined in Zebra profiles, access
 to the full range of Z39.50 query options, federated searches on Z39.50
 targets, etc.
@@ -68,9 +68,13 @@ etc. These are not stored in the template for two reasons:
 
 =over
 
-=item 1. Efficiency - we have more control over objects inside the script, and it's possible to not duplicate things like indexes (if the search indexes were stored in the template they would need to be repeated)
+=item 1. Efficiency - we have more control over objects inside the script, 
+and it's possible to not duplicate things like indexes (if the search indexes 
+were stored in the template they would need to be repeated)
 
-=item 2. Customization - if these elements were moved to the sql database it would allow a simple librarian to determine which fields to display on the page without editing any html (also how the fields should behave when being searched).
+=item 2. Customization - if these elements were moved to the sql database it 
+would allow a simple librarian to determine which fields to display on the page 
+without editing any html (also how the fields should behave when being searched).
 
 =back
 
@@ -103,34 +107,46 @@ There are several types of queries needed in the process of search and retrieve:
 
 =item 1 Koha query - the query that is passed to Zebra
 
-This is the most complex query that needs to be built.The original design goal was to use a custom CCL2PQF query parser to translate an incoming CCL query into a multi-leaf query to pass to Zebra. It needs to be multi-leaf to allow field weighting, koha-specific relevance ranking, and stemming. When I have a chance I'll try to flesh out this section to better explain.
+This is the most complex query that needs to be built. The original design goal 
+was to use a custom CCL2PQF query parser to translate an incoming CCL query into
+a multi-leaf query to pass to Zebra. It needs to be multi-leaf to allow field 
+weighting, koha-specific relevance ranking, and stemming. When I have a chance 
+I'll try to flesh out this section to better explain.
 
-This query incorporates query profiles that aren't compatible with non-Zebra Z39.50 targets to acomplish the field weighting and relevance ranking.
+This query incorporates query profiles that aren't compatible with non-Zebra 
+Z39.50 targets to acomplish the field weighting and relevance ranking.
 
 =item 2 Federated query - the query that is passed to other Z39.50 targets
 
-This query is just the user's query expressed in CCL CQL, or PQF for passing to a non-zebra Z39.50 target (one that doesn't support the extended profile that Zebra does).
+This query is just the user's query expressed in CCL CQL, or PQF for passing to a 
+non-zebra Z39.50 target (one that doesn't support the extended profile that Zebra does).
 
-=item 3 Search description - passed to the template / saved for future refinements of the query (by user)
+=item 3 Search description - passed to the template / saved for future refinements of 
+the query (by user)
 
-This is a simple string that completely expresses the query in a way that can be parsed by Koha for future refinements of the query or as a part of a history feature. It differs from the human search description in several ways:
+This is a simple string that completely expresses the query in a way that can be parsed 
+by Koha for future refinements of the query or as a part of a history feature. It differs
+from the human search description:
 
 1. it does not contain commas or = signs
-2. 
 
 =item 4 Human search description - what the user sees in the search_desc area
 
-This is a simple string nearly identical to the Search description, but more human readable. It will contain = signs or commas, etc.
+This is a simple string nearly identical to the Search description, but more human 
+readable. It will contain = signs or commas, etc.
 
 =back
 
 =head3 2. Perform the Search
 
-This section takes the query strings and performs searches on the named servers, including the Koha Zebra server, stores the results in a deeply nested object, builds 'faceted results', and returns these objects.
+This section takes the query strings and performs searches on the named servers, including
+the Koha Zebra server, stores the results in a deeply nested object, builds 'faceted results',
+and returns these objects.
 
 =head3 3. Build HTML
 
-The final major section of this script takes the objects collected thusfar and builds the HTML for output to the template and user.
+The final major section of this script takes the objects collected thusfar and builds the
+HTML for output to the template and user.
 
 =head3 Additional Notes
 
@@ -161,12 +177,20 @@ my ($template,$borrowernumber,$cookie);
 
 # decide which template to use
 my $template_name;
+my $template_type;
 my @params = $cgi->param("limit");
 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';
 }
 # load the template
 ($template, $borrowernumber, $cookie) = get_template_and_user({
@@ -187,10 +211,7 @@ query parser.
 =cut
 
 ## URI Re-Writing
-# FIXME: URI re-writing should be tested more carefully and may better
-# handled by mod_rewrite or something else. The code below almost works,
-# but doesn't quite handle limits correctly when they are the only
-# param passed -- I'll work on this soon -- JF
+# Deprecated, but preserved because it's interesting :-)
 #my $rewrite_flag;
 #my $uri = $cgi->url(-base => 1);
 #my $relative_url = $cgi->url(-relative=>1);
@@ -198,7 +219,7 @@ query parser.
 #warn "URI:$uri";
 #my @cgi_params_list = $cgi->param();
 #my $url_params = $cgi->Vars;
-
+#
 #for my $each_param_set (@cgi_params_list) {
 #    $uri.= join "",  map "\&$each_param_set=".$_, split("\0",$url_params->{$each_param_set}) if $url_params->{$each_param_set};
 #}
@@ -222,7 +243,7 @@ my $categories = GetBranchCategories(undef,'searchdomain');
 
 $template->param(branchloop => \@branch_loop, searchdomainloop => $categories);
 
-# load the itemtypes (Called Collection Codes in the template -- used for circ rules )
+# load the itemtypes
 my $itemtypes = GetItemTypes;
 my @itemtypesloop;
 my $selected=1;
@@ -246,14 +267,10 @@ $template->param(itemtypeloop => \@itemtypesloop);
 # $template->param(itypeloop=>\@itype_loop,);
 
 # load the languages ( for switching from one template to another )
-# my @languages_options = displayLanguages($cgi);
-# my $languages_count = @languages_options;
-# if($languages_count > 1){
-#         $template->param(languages => \@languages_options);
-# }
+$template->param(languages_loop => getTranslatedLanguages('intranet','prog'));
 
 # The following should only be loaded if we're bringing up the advanced search template
-if ( $template_name eq "catalogue/advsearch.tmpl" ) {
+if ( $template_type eq 'advsearch' ) {
     # load the servers (used for searching -- to do federated searching, etc.)
     my $primary_servers_loop;# = displayPrimaryServers();
     $template->param(outer_servers_loop =>  $primary_servers_loop,);
@@ -264,24 +281,31 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) {
     # determine what to display next to the search boxes (ie, boolean option
     # shouldn't appear on the first one, scan indexes should, adding a new
     # box should only appear on the last, etc.
-    # FIXME: this stuff should be cleaned up a bit and the html should be turned
-    # into flags for the template -- I'll work on that soon -- JF
     my @search_boxes_array;
-    my $search_boxes_count = 1; # should be a syspref
-    for (my $i=0;$i<=$search_boxes_count;$i++) {
-        if ($i==0) {
+    my $search_boxes_count = C4::Context->preference("OPACAdvSearchInputCount") | 3; # FIXME: should be a syspref
+    for (my $i=1;$i<=$search_boxes_count;$i++) {
+               # if it's the first one, don't display boolean option, but show scan indexes
+        if ($i==1) {
             push @search_boxes_array,
                 {
-                search_boxes_label => 1,
                 scan_index => 1,
                 };
         
         }
+               # if it's the last one, show the 'add field' box
         elsif ($i==$search_boxes_count) {
             push @search_boxes_array,
                 {
-                add_field => "1",};
+                               boolean => 1,
+                add_field => 1,
+                               };
         }
+               else {
+                       push @search_boxes_array,
+                               {
+                               boolean => 1,
+                               };
+               }
 
     }
     $template->param(uc(C4::Context->preference("marcflavour")) => 1,
@@ -291,14 +315,7 @@ if ( $template_name eq "catalogue/advsearch.tmpl" ) {
     my $languages_limit_loop = getAllLanguages();
     $template->param(search_languages_loop => $languages_limit_loop,);
     
-    my $expanded_options;
-    if (not defined $cgi->param('expanded_options')){
-        $expanded_options = C4::Context->preference("expandedSearchOption");
-    }
-    else {
-        $expanded_options = $cgi->param('expanded_options');
-    }
-    $template->param(expanded_options => $expanded_options);
+    $template->param(expanded_options => $cgi->param('expanded_options') | C4::Context->preference("expandedSearchOption"));
 
     # load the sort_by options for the template
     my $sort_by = $cgi->param('sort_by');
diff --git a/changelanguage.pl b/changelanguage.pl
new file mode 100755 (executable)
index 0000000..9a470ae
--- /dev/null
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use C4::Output;
+use CGI;
+
+my $query    = new CGI;
+my $language = $query->param('language');
+my $url      = $query->referer();
+
+warn "Language : $query // $language // $url";
+setlanguagecookie( $query, $language, $url );
index 1bebbb3..201561e 100644 (file)
@@ -148,12 +148,13 @@ att 8028 uri
 att 8029 replacementprice
 att 8030 replacementpricedate
 
-# att 8001                     Extent
-# att 8910                     Koha-Auth-Number
+## Fixed Fields and other special indexes
+att 9901                       Extent
+att 9910                       Koha-Auth-Number
 # record length according to the leader
-# att 8005                     llength
-#att 8002                      Summary 
-#att 8900                      Call-Number
+att 9905                       llength
+att 9902                       Summary 
+att 9990                       Call-Number
 # Usually Target Audience 008/22
 att 8822                       ta
 # Usually Form of item 008/23
@@ -173,6 +174,6 @@ att 8701                    ff7-01
 att 8702                       ff7-02
 att 8703                       ff7-01-02
 # Author-personal-bibliography - lastname,firstname in 100$a
-#att 8900              Author-personal-bibliography
+att 9900               Author-personal-bibliography
 # Author-in-order - firstname lastname in 245$c statement of responsibility
-#att 8901              Author-in-order
+att 9902               Author-in-order
index efb436a..9806ed1 100644 (file)
@@ -1,5 +1,3 @@
-# $Id: record.abs,v 1.1.2.1 2006/05/08 14:42:49 tgarip1957 Exp $
-
 # This is a fairly simple example of a set of MARC21 indexing rules. It
 # results in a server which provides a passable Bath level 0 and 1 service
 # (author, title, subject, keyword and exact services). Feel free to
index 034f220..54b8ae9 100644 (file)
@@ -7,7 +7,7 @@
 #      q q1 q2 q3
 #
 #  3. comments
-#      comments begin with 
+#      comments begin with #
 #
 #  4. directives
 #      @   directive    value
@@ -56,7 +56,7 @@ ab Abstract
 #            of records selected is the union of the sets of records
 #            selected by each of the (appropriate) Use attributes that
 #            the target supports.
-Any 4=6 1=1016
+Any 1=1016
 kw Any
 
 #Anywhere             1035  The record is selected if the
index 3e4a4e8..5dadd77 100644 (file)
@@ -1,5 +1,5 @@
 <div id="header">
-       
+
 <div id="toplevelnav">
 <ul id="toplevelmenu">
        <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li><!-- /TMPL_IF -->
index 0f7d808..eb45f8a 100644 (file)
@@ -1,3 +1,14 @@
         </div>
+
+<!-- TMPL_IF NAME="languages_loop" -->
+               <div id="changelanguage">
+               <ul>
+               <!-- TMPL_LOOP NAME="languages_loop" -->
+               <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language_code" -->"><!-- TMPL_VAR NAME="language_name" --></a></li>
+               <!-- /TMPL_LOOP -->
+               </ul>
+               </div>
+<!-- /TMPL_IF -->
+
     </body>
-</html>
\ No newline at end of file
+</html>
index 6c7b71d..33fc86e 100644 (file)
                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>
        
 <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="if_expanded_options_actually_worked" -->
 <!-- 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>
+                <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" -->/img/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
 </fieldset>
 <!-- /DATABASES -->
     </fieldset>
 <!-- /REMOTE DATABASES -->
 <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
 
 <!-- BOOLEAN SEARCH OPTIONS -->
     <fieldset>
     <legend>Search For: </legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
-
-        <!-- TMPL_IF NAME="expanded_options" -->
-            <!-- TMPL_IF NAME="scan_index" -->
-                <p><label for="scan">Scan Indexes</label><input type="checkbox" name="scan" id="scan" value="1" /></p>
-            <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
         <div>
-            <!-- TMPL_IF NAME="expanded_options" -->
+                       <!-- TMPL_IF NAME="expanded_options" -->
+            <!-- TMPL_IF NAME="boolean" -->
                 <select name="op">
-                    <option value="and" selected="selected">and</option>
-                    <option value="or">or</option>
-                    <option value="not">not</option>
+                    <option value="+" selected="selected">and</option>
+                    <option value="|">or</option>
+                    <option value="!">not</option>
                 </select>
             <!-- /TMPL_IF --> 
+                       <!-- /TMPL_IF -->
             <select name="idx">
-                <option value="kw,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+                <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="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 -->
+               <!-- 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 -->
+
+<!-- ITEMTYPE LIMITS -->
     <div id="itemtypelist">
-    <h2>Itemtype limit to any of the following:</h2>
+    <h2>Limit type to: match any of the following:</h2>
     <table>
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
-        <td><p>
-        <!-- 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" --></p></td>
+        <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>
+<!-- /ITEMTYPE LIMITS -->
+
 <!-- TMPL_IF NAME="expanded_options" -->
 <!-- BASIC LIMITS -->
-<!--TMPL_IF Name="usmarc"-->
+ <fieldset>
+       <legend>Limits:</legend>
+<!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options -->
+       <p><label for="limit-yr">Year: </label>
+               <input size="15" name="limit-yr" id="" value=""/>&nbsp;&nbsp;(format: yyyy-yyyy)</p>
+<!-- /PUB / COPY YEAR LIMIT -->
+
+<!-- LANGUAGE LIMIT -->
+               <p><label for="language-limit">Language: </label>                                        
+               <select name="limit">
+               <!-- TMPL_LOOP NAME="search_languages_loop" -->
+               <option value="<!-- TMPL_VAR NAME="language_code" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="language_name" --> <!-- TMPL_IF NAME="language_locale_name" -->(<!-- TMPL_VAR NAME="language_locale_name" -->)<!-- /TMPL_IF --></option>
+               <!-- /TMPL_LOOP -->
+               </select></p><!-- <a href="">Show all languages</a>-->
+<!-- /LANGUAGE LIMIT -->
+</fieldset>
+<!-- /BASIC LIMITS -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="template-defined-limits" -->
+<!-- TYPE 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/en/images/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>
+            <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>
+            <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>
-                
+            <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>
+<!-- /TMPL_IF -->
 <!-- /TYPE LIMITS -->
 
 
        </p>
 
 </fieldset>
-<!--/TMPL_IF -->
-<!--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="datedue:0000-00-00" /></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>
         </p>
 </fieldset>
 <!-- RANK LIMITS -->
-<p></p>
 <!-- SEARCH BUTTONS -->
-            <p><input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
+            <p><input class="submit" type="submit" accesskey="s" value="Search" />
             <!-- TMPL_IF NAME="expanded_options" -->
             <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
             <!-- TMPL_ELSE -->
 </div>
 </form>
 
-
-
 </div>
 </div>
 
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
new file mode 100644 (file)
index 0000000..7be5ff9
--- /dev/null
@@ -0,0 +1,571 @@
+<!-- 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" -->