[Koha-cvs] koha C4/Search.pm catalogue/search.pl koha-tmpl... [rel_3_0]

Henri-Damien LAURENT laurenthdl at alinto.com
Mon Oct 23 10:54:03 CEST 2006


CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/10/23 08:54:03

Modified files:
	C4             : Search.pm 
	catalogue      : search.pl 
	koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl 

Log message:
	Adding itemtype search.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.11&r2=1.120.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: C4/Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.11
retrieving revision 1.120.2.12
diff -u -b -r1.120.2.11 -r1.120.2.12
--- C4/Search.pm	20 Oct 2006 15:29:17 -0000	1.120.2.11
+++ C4/Search.pm	23 Oct 2006 08:54:03 -0000	1.120.2.12
@@ -40,7 +40,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.120.2.11 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.12 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -3088,11 +3088,22 @@
 	# FIXME: should write up some documentation about the design goals here
     foreach my $limit (@limits) {
 		# FIXME: not quite right yet ... will work on this soon -- JF
+        my $type=$1 if $limit=~m/([^:]+):([^:]*)/;
 		if ($limit =~ /available/) {
 			$limit_query.=" (($query and datedue=0000-00-00) or ($query and datedue=0000-00-00 not lost=1) or ($query and datedue=0000-00-00 not lost=2))";
 			#$limit_search_desc.=" and available";
 		}
-		# these queries are treated as OR
+		elsif (($limit_query) && (index($limit_query,$type,0)>0)) {
+            if ($limit_query!~/\(/){
+			   $limit_query= substr($limit_query,0,index($limit_query,$type,0))."(".substr($limit_query,index($limit_query,$type,0))." or $limit )" if $limit;
+			   $limit_search_desc= substr($limit_search_desc,0,index($limit_search_desc,$type,0))."(".substr($limit_search_desc,index($limit_search_desc,$type,0))." or $limit )" if $limit;
+            } else {
+              chop $limit_query;
+              chop $limit_search_desc;
+              $limit_query.=" or $limit )" if $limit;
+              $limit_search_desc.=" or $limit )" if $limit;
+            }
+		}
 		elsif (($limit_query) && ($limit =~/mc/)) {
 			$limit_query.=" or $limit" if $limit;
 			$limit_search_desc.=" or $limit" if $limit;

Index: catalogue/search.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- catalogue/search.pl	13 Oct 2006 10:25:54 -0000	1.1.2.1
+++ catalogue/search.pl	23 Oct 2006 08:54:03 -0000	1.1.2.2
@@ -2,7 +2,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /cvsroot/koha/koha/catalogue/Attic/search.pl,v 1.1.2.1 2006/10/13 10:25:54 toins Exp $
+# $Header: /cvsroot/koha/koha/catalogue/Attic/search.pl,v 1.1.2.2 2006/10/23 08:54:03 hdl Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -220,12 +220,24 @@
 $template->param(branchloop => \@branch_loop,);
 
 # load the itemtypes (Called Collection Codes in the template -- used for circ rules )
-my ($itemtypecount, at item_type_loop) = GetItemTypes();
-$template->param(itemtypeloop=>\@item_type_loop,);
+my $itemtypes = GetItemTypes;
+my @itemtypesloop;
+my $selected=1;
+my $cnt;
+foreach my $thisitemtype (sort keys %$itemtypes) {
+    my %row =(  number=>$cnt++,
+                code => $thisitemtype,
+                selected => $selected,
+                description => $itemtypes->{$thisitemtype}->{'description'},
+            );
+    $selected = 0 if ($selected) ;
+    push @itemtypesloop, \%row;
+}
+$template->param(itemtypeloop => \@itemtypesloop);
 
-# load the itypes (Called item types in the template -- just authorized values for searching)
-my ($itypecount, at itype_loop) = GetCcodes();
-$template->param(itypeloop=>\@itype_loop,);
+# # load the itypes (Called item types in the template -- just authorized values for searching)
+# my ($itypecount, at itype_loop) = GetCcodes();
+# $template->param(itypeloop=>\@itype_loop,);
 
 # load the languages ( for switching from one template to another )
 my @languages_options = displayLanguages($cgi);
@@ -374,6 +386,7 @@
 my @results;
 ## I. BUILD THE QUERY
 ($error,$search_desc,$koha_query,$federated_query,$query_type) = buildQuery($query,\@operators,\@operands,\@indexes,\@limits);
+warn "query : $koha_query";
 ## II. DO THE SEARCH AND GET THE RESULTS
 my $total; # the total results for the whole set
 my $facets; # this object stores the faceted results that display on the left-hand of the results page

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl	19 Oct 2006 15:13:27 -0000	1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl	23 Oct 2006 08:54:03 -0000	1.1.2.4
@@ -51,9 +51,29 @@
 		<!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF --> 
 		<select name="idx">
-			<!-- TMPL_LOOP NAME="indexes" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
-		<!-- /TMPL_LOOP -->
+    <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+    <option value="au" <!-- 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" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
+    <option value="cfn" <!-- 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" <!-- 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" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
+    <option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
+    <option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</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" <!-- 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" <!-- 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" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
+
 		</select>
 		<input size="30" name="q" title="Enter search terms" value=""/>
 		    <!-- TMPL_IF NAME="expanded_options" -->
@@ -65,40 +85,37 @@
 	<!-- /TMPL_LOOP -->
 	</fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS --> 
+<fieldset>
+	<legend>Itemtype to: match any of the following </legend>
+      <!--TMPL_LOOP Name="itemtypeloop"-->
+        <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><label for="mt-<!--TMPL_VAR Name="number" -->" title="<!--TMPL_VAR Name="description" -->"><img border="0" src="/images/<!--TMPL_VAR Name="code" -->.gif" alt="<!--TMPL_VAR Name="description" -->" /></label>
+      <!--/TMPL_LOOP-->
+</fieldset>
 
-    <!-- TMPL_IF NAME="expanded_options" -->
+<!-- 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 -->
-                <!-- /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="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="language_label" --> <!-- TMPL_IF NAME="locale_label" -->(<!-- TMPL_VAR NAME="locale_label" -->)<!-- /TMPL_IF --></option>
-				<!-- /TMPL_LOOP -->
-				</select></p><!-- <a href="">Show all languages</a>-->
-				<!-- /LANGUAGE LIMIT -->
-	</fieldset>
-<!-- /BASIC LIMITS -->
-	<!-- /TMPL_IF -->
 
-<!-- TYPE LIMITS -->	
-	<fieldset>
 	<legend>Limit type to: match any of the following <a href="http://wiki.koha.org/?id=en:opachelp#" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#',' Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;">[ ? ]</a></legend>
 	<table class="itemtypes">
-			<!-- TMPL_LOOP NAME="outer_limit_types_loop" -->
 			<tr>
-				<!-- TMPL_LOOP NAME="inner_limit_types_loop" -->
-				<td<!-- TMPL_IF NAME="colspan" --> colspan="<!-- TMPL_VAR NAME="colspan" -->"<!-- /TMPL_IF -->><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->" title="<!-- TMPL_VAR NAME="title" -->"><a href="http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR NAME="id" -->','<!-- TMPL_VAR NAME="label" --> Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="<!-- TMPL_VAR NAME="themelang">/images/<!-- TMPL_VAR NAME="icon" -->" alt="<!-- TMPL_VAR NAME="label" -->" /></a><!-- TMPL_VAR NAME="label" --></label></td>
-				<!-- /TMPL_LOOP -->
+				<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"><a href="http://wiki.koha.org/?id=en:opachelp#mc-bks" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-bks','Books Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books" /></a>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"><a href="http://wiki.koha.org/?id=en:opachelp#mc-vis" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-vis','Visual Materials Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif" alt="Visual Materials" /></a>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"><a href="http://wiki.koha.org/?id=en:opachelp#mc-sr" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-sr','Books on Tape Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books on Tape" /></a>Books on Tape</label></td>
 			</tr>
-			<!-- /TMPL_LOOP -->
+			<tr>
+				<td><input type="checkbox" id="mc-cf" name="limit" value="mc:c"/><label for="mc-cf" title="Computer files, Data, Software"><a href="http://wiki.koha.org/?id=en:opachelp#mc-cf" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-cf','Computer Files Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/CD-ROM software.gif" alt="Computer Files" /></a>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"><a href="http://wiki.koha.org/?id=en:opachelp#mc-lh" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-lh','Local History Materials Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/Local history.gif" alt="Local History Materials" /></a>Local History Materials</label></td>
+				<td><input type="checkbox" id="mc-map" name="limit" value="mc:a"/><label for="mc-map" title="Maps, Globes"><a href="http://wiki.koha.org/?id=en:opachelp#mc-map" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-map','Maps Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/PF.gif " alt="Maps" /></a>Maps</label></td>
+			</tr>
+			<tr>
+				<td><input type="checkbox" id="mc-mus" name="limit" value="mc-rtype:j"/><label for="mc-mus" title="Music"><a href="http://wiki.koha.org/?id=en:opachelp#mc-mus" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-mus','Music Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/CDM.gif" alt="Music" /></a>Music</label></td>
+				<td><input type="checkbox" id="mc-kit" name="limit" value="mc-rtype:o"/><label for="mc-kit" title="Kits"><a href="http://wiki.koha.org/?id=en:opachelp#mc-kit" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-kit','Kits Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/KIT.gif" alt="Kits" /></a>Kits</label></td>
+				<td><input type="checkbox" id="mc-ref" name="limit" value="mc-collection:REF"/><label for="mc-ref" title="Reference"><a href="http://wiki.koha.org/?id=en:opachelp#mc-ref" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-ref','Reference Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;"><img border="0" src="/intranet-tmpl/prog/en/images/REF.gif" alt="Reference" /></a>Reference</label></td>
+				
+			</tr>
+			
 			</table>
 </fieldset>
 <!-- /TYPE LIMITS -->
@@ -106,44 +123,75 @@
 
 </div>
 </div>
-
 <div id="sidebar">
-
-<!-- TMPL_IF NAME="outer_subtype_limits_loop" -->
 <!-- SUBTYPE LIMITS -->
 		<fieldset>
 		<legend>Subtype limits</legend><p>
-		<!-- TMPL_LOOP NAME="outer_subtype_limits_loop" -->
-		<select name="<!-- TMPL_VAR NAME="name" -->" class="subtype">
-			<!-- TMPL_LOOP NAME="inner_subtype_limits_loop" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->" class="menuheader"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
-			<!-- /TMPL_LOOP -->
+		
+		<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>
-		<!-- /TMPL_LOOP --><a href="http://wiki.koha.org/?id=en:opachelp#" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#subtypes','Sub-types Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;">[ ? ]</a></p>
 
-</fieldset>
-<!-- /SUBTYPE LIMITS -->
-<!-- /TMPL_IF -->
+		<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>
 
 
-<!-- TMPL_IF NAME="itemtypeloop" -->
-<fieldset><legend>Collection Code Limits: </legend>
-			<p><select name="limit">
-			<option value="">All Item Types</option>
-		<!-- TMPL_LOOP NAME="itemtypeloop" -->
-			<option value="collection-code:<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
-		<!-- /TMPL_LOOP -->
+		<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>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="itypeloop" -->
-            <select name="limit">
-            <option value="">All Collection Codes</option>
-        <!-- TMPL_LOOP NAME="itypeloop" -->
-            <option value="collection-code:<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
-        <!-- /TMPL_LOOP -->
-		</select></p></fieldset>
-<!-- /TMPL_IF -->
 
+		<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>
+		<a href="http://wiki.koha.org/?id=en:opachelp#" class="help"  onclick="window.open('http://wiki.koha.org/?id=en:opachelp#subtypes','Sub-types Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return false;">[ ? ]</a></p>
+
+</fieldset>
+<!--/TMPL_IF -->
+<!--TMPL_IF Name="UNIMARC" -->
+<!--/TMPL_IF-->
+<!--/TMPL_IF-->
 <!-- AVAILABILITY LIMITS -->
 	<fieldset><legend>Location and availability: </legend>
 		<p><select name="limit" id="branchloop">
@@ -171,8 +219,8 @@
 <!-- RANK LIMITS -->
 <p></p>
 <!-- SEARCH BUTTONS -->
-        	<p><input class="submit" type="submit" accesskey="s" title="Search" value="Search"/>
-<!-- TMPL_IF NAME="expanded_options" -->
+        	<p><input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search"/>
+            <!-- TMPL_IF NAME="expanded_options" -->
 			<a href="search.pl">[Fewer Options]</a>
 			<!-- TMPL_ELSE -->
 			<a href="search.pl?expanded_options=1">[More options]</a>





More information about the Koha-cvs mailing list