[Koha-cvs] koha catalogue/search.pl koha-tmpl/intranet-tmp... [rel_3_0]

Henri-Damien LAURENT laurenthdl at alinto.com
Thu Oct 26 08:59:21 CEST 2006 

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/10/26 06:59:21

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

Log message:
	Adding some more advanced features.
	Opensearch servers to comme by the end of the week.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
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.4&r2=1.1.2.5

Patches:
Index: catalogue/search.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- catalogue/search.pl	23 Oct 2006 08:54:03 -0000	1.1.2.2
+++ catalogue/search.pl	26 Oct 2006 06:59:21 -0000	1.1.2.3
@@ -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.2 2006/10/23 08:54:03 hdl Exp $
+# $Header: /cvsroot/koha/koha/catalogue/Attic/search.pl,v 1.1.2.3 2006/10/26 06:59:21 hdl Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -240,15 +240,14 @@
 # $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);
-}
+# my @languages_options = displayLanguages($cgi);
+# my $languages_count = @languages_options;
+# if($languages_count > 1){
+#         $template->param(languages => \@languages_options);
+# }
 
 # The following should only be loaded if we're bringing up the advanced search template
 if ( $template_name eq "catalogue/advsearch.tmpl" ) {
-    warn "template name is 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,);
@@ -293,7 +292,8 @@
 				left_content => " <select name='op'><option value='and' selected='selected'>and</option><option value='or'>or</option><option value='not'>not</option></select>",};
 		}
 	}
-	$template->param(search_boxes_loop => \@search_boxes_array,);
+	$template->param(uc(C4::Context->preference("marcflavour")) => 1,
+                      search_boxes_loop => \@search_boxes_array);
 
 	# load the language limits (for search)
 	my $languages_limit_loop = displayLanguagesLimit();
@@ -386,7 +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";
+# 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
@@ -399,7 +399,7 @@
 };
 if ($@ || $error) {
 	$template->param(query_error => $error.$@);
-	warn "error: ".$error.$@;
+# 	warn "error: ".$error.$@;
 	output_html_with_http_headers $cgi, $cookie, $template->output;
 	exit;
 }
@@ -461,7 +461,6 @@
 } #/end of the for loop
 #$template->param(FEDERATED_RESULTS => \@results_array);
 
-$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary")) if (C4::Context->preference("Disable_Dictionary"));
 
 $template->param(
             #classlist => $classlist,

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.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl	23 Oct 2006 08:54:03 -0000	1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl	26 Oct 2006 06:59:21 -0000	1.1.2.5
@@ -190,6 +190,195 @@
 </fieldset>
 <!--/TMPL_IF -->
 <!--TMPL_IF Name="UNIMARC" -->
+</div></div>
+<div id="sidebar">
+<!-- SUBTYPE LIMITS -->
+		<fieldset>
+		<legend>Champs Cod&eacute;s</legend><p>
+		
+		<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>
+		
+        <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>
+		
+		
+		<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>
+		
+        
+        <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>
+        
+        <select name="limit" class="subtype" size="1">
+				<option value=" ">Code 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>
+
+		
+		<select name="limit" class="subtype">
+			<option value="" >Code 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>
+        
+
+		<select name="limit" class="subtype">
+            <option value=" ">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>
+		<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>
+		<select name="limit" class="subtype">
+			<option value="">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>
+		<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 -->

More information about the Koha-cvs mailing list