[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,NONE,1.1 result.tmpl,1.11,1.12 search.tmpl,1.15,1.16

Paul POULAIN tipaul at users.sourceforge.net
Fri Apr 16 09:28:25 CEST 2004


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28364/koha-tmpl/intranet-tmpl/default/en/search.marc

Modified Files:
	result.tmpl search.tmpl 
Added Files:
	suggest.tmpl 
Log Message:
improving Search :
* adding "suggestion", that popup a windows. The popup windows shows, for each word entered in the search form, the 10 words that sounds like the word entered, and that are used most often.
* fixes some minor bugs 

Still to do :
* good support of ' and ,

--- NEW FILE ---
<!-- TMPL_IF NAME="opac" -->
    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<!-- TMPL_ELSE -->
    <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
<!-- /TMPL_IF -->
<div id="mainbloc">
	<h1 class="catalogue">Catalogue search</h1>
	<div id="bloc25">
		<table>
			<tr>
				<th class="catalogue">
					Initial word
				</th>
				<th class="catalogue">
					Suggested
				</th>
				<th class="catalogue">
					Used X times
				</th>
			</tr>
		<!-- TMPL_LOOP name="loop" -->
			<tr>
				<td>
					<!-- TMPL_VAR name="word" -->
				</td>
				<td>
					<a href="javascript:Import('<!-- TMPL_VAR name="word" -->','<!-- TMPL_VAR name="suggestion" -->')">
						<!-- TMPL_VAR name="suggestion" -->
					</a>
				</td>
				<td>
					<!-- TMPL_VAR name="count" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table>
	</div>
</div>
<script>
	function Import(Replaced,ReplaceBy) {
		for (i=0 ; i<opener.document.f.value.length ; i++) {
				opener.document.forms[0].value[i].value = opener.document.forms[0].value[i].value.replace(Replaced,ReplaceBy);
//			if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
//				strQuery += "&isbn="+document.forms[0].field_value[i].value;
//			}
//			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR name="oldbiblionumber" -->&breedingid="+GetThisOne;
//			self.close();
//			return false;
		}
	}
</script>

<!-- TMPL_IF NAME="opac" -->
    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- TMPL_ELSE -->
    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
<!-- /TMPL_IF -->


Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** result.tmpl	30 Mar 2004 16:13:29 -0000	1.11
--- result.tmpl	16 Apr 2004 07:28:22 -0000	1.12
***************
*** 5,69 ****
  <!-- /TMPL_IF -->
  <div id="mainbloc">
! <span style="font-size:2em; text-align:left;">MARC search results</span>
! <br>
! 
! <center>
! <table align=middle border=0 cellpadding=0 cellspacing=0 width="80%">
! <tr>
! 	</tr>
! 		<tr><tr height=20></tr>
! 		<td align=middle>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
  				<!-- TMPL_IF NAME=highlight -->
! 			 	 <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 			  	  <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
! 				</td>
  			</tr>
! 
  		</table>
! </center>
! 
! <!-- TMPL_IF name=total -->
! &nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
! <!-- TMPL_ELSE -->
! &nbsp No results found.<br>
! <!-- /TMPL_IF -->
! 
! <center>
! <table border=0 cellspacing=0 cellpadding=2 width="90%">
! <thead>
! 	<!-- TMPL_IF NAME="opac" -->
! 	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
! 		<!-- TMPL_ELSE -->
! 	<tr bgcolor="#ad11ad">
! 		<!-- /TMPL_IF -->
! 	<th align="left"><span style="color:#FFFFFF;">Biblio #</span></th>
! 	<th align="left"><span style="color:#FFFFFF;">Author</span></th>
! 	<th align="left"><span style="color:#FFFFFF;">Title</span></th>
! 	</tr>
! <tbody>
! 	<!-- TMPL_LOOP name="result" -->
! 		<tr>
! 			<td><a href="../MARCdetail.pl?bibid=<!-- TMPL_VAR name="bibid" -->"><!-- TMPL_VAR name="bibid" --></a></td>
! 			<td><!-- TMPL_VAR name="author" --></td>
! 			<td><!-- TMPL_VAR name="title" --></td>
! 		</tr>
! 	<!-- /TMPL_LOOP -->
! </table>
! 
! <table align=middle border=0 cellpadding=0 cellspacing=0 width="80%">
! <tr>
! 	</tr>
! 		<tr><tr height=20></tr>
! 		<td align=middle>
  			<!-- TMPL_IF NAME=displayprev -->
  			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
--- 5,59 ----
  <!-- /TMPL_IF -->
  <div id="mainbloc">
! 	<h1 class="catalogue">MARC search results</h1>
! 	<div id="resultnumber">
! 		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
! 					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
! 				</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
  				<!-- TMPL_IF NAME=highlight -->
! 					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
! 				<!-- /TMPL_IF -->
! 		</p>
! 		<p>
! 			<!-- TMPL_IF name=total -->
! 			&nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
! 			<!-- TMPL_ELSE -->
! 			&nbsp No results found.<br>
! 			<!-- /TMPL_IF -->
! 		</p>
! 	</div>
! 	<div id="resultlist">
! 		<table>
! 		<thead>
! 			<!-- TMPL_IF NAME="opac" -->
! 			<tr>
! 				<!-- TMPL_ELSE -->
! 			<tr>
  				<!-- /TMPL_IF -->
! 			<th class="catalogue">Biblio #</th>
! 			<th class="catalogue">Author</th>
! 			<th class="catalogue">Title</th>
  			</tr>
! 		<tbody>
! 			<!-- TMPL_LOOP name="result" -->
! 				<tr>
! 					<td><a href="../MARCdetail.pl?bibid=<!-- TMPL_VAR name="bibid" -->"><!-- TMPL_VAR name="bibid" --></a></td>
! 					<td><!-- TMPL_VAR name="author" --></td>
! 					<td><!-- TMPL_VAR name="title" --></td>
! 				</tr>
! 			<!-- /TMPL_LOOP -->
  		</table>
! 	</div>
! 	<div id="resultnumber">
! 		<p>
  			<!-- TMPL_IF NAME=displayprev -->
  			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
***************
*** 71,77 ****
  			<!-- TMPL_LOOP NAME=numbers -->
  				<!-- TMPL_IF NAME=highlight -->
! 			 	 <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 			  	  <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 61,67 ----
  			<!-- TMPL_LOOP NAME=numbers -->
  				<!-- TMPL_IF NAME=highlight -->
! 				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 79,88 ****
  			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
! 				</td>
! 			</tr>
! 
! 		</table>
! </center>
! 
  </div>
  <!-- TMPL_IF NAME="opac" -->
--- 69,74 ----
  			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
! 		</p>
! 	</div>	
  </div>
  <!-- TMPL_IF NAME="opac" -->

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** search.tmpl	13 Apr 2004 08:55:20 -0000	1.15
--- search.tmpl	16 Apr 2004 07:28:22 -0000	1.16
***************
*** 6,10 ****
  <div id="mainbloc">
  
! <h1>Catalogue search</h1>
  
  <form name="f" method="post">
--- 6,10 ----
  <div id="mainbloc">
  
! <h1 class="catalogue">Catalogue search</h1>
  
  <form name="f" method="post">
***************
*** 12,121 ****
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<table class="noborder">
! 		<tr>
! 			<th colspan=4>
!     Quick search
! 			</th>
! 		</tr>
! 		<tr>
! 			<td>
! 				Keyword <input type="hidden" name="marclist" value="">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 			</td>
! 			<td>
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" onchange="sql_update()">
! 			</td>
! 			<td>
!     Illustrator<input type="hidden" name="marclist" value="biblioitems.illus">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 			</td>
! 			<td>
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" onchange="sql_update()">
! 			</td>
! 		</tr>
! 		<tr>
! 			<td>
! 				Title <input type="hidden" name="marclist" value="biblio.title">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 			</td>
! 			<td>
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" onchange="sql_update()">
! 			</td>
! 			<td>
! 				Dewey<input type="hidden" name="marclist" value="biblioitems.dewey">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 			</td>
! 			<td>
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" onchange="sql_update()">
! 			</td>
! 		</tr>
! 		<tr>
! 			<td>
! 				author <input type="hidden" name="marclist" value="biblio.author">
  				<input type="hidden" name="and_or" value="and">
  				<input type="hidden" name="excluding" value="">
- 			</td>
- 			<td>
  				<input type="hidden" name="operator" value="contains">
  				<input type="text" name="value" onchange="sql_update()">
! 			</td>
! 			<td>
! 				Item Type <input type="hidden" name="marclist" value="items.itemtype">
  				<input type="hidden" name="and_or" value="and">
  				<input type="hidden" name="excluding" value="">
- 			</td>
- 			<td>
  				<input type="hidden" name="operator" value="=">
! 				<input type="text" name="value" onchange="sql_update()">
! 			</td>
! 		</tr>
! 		<tr>
! 			<td>
! 				barcode
! 			</td>
! 			<td>
! 				<input type="hidden" name="marclist" value="items.barcode">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value">
! 			</td>
! 		</tr>
! 	</table>
! 
! 	<table class="noborder">
! 		<tr>
! 			<th colspan=5>
! 				Complete (MARC) search
! 			</th>
! 		</tr>
  		<!-- TMPL_LOOP NAME="statements" -->
! 		<tr>
! 			<td>
! 				<!-- TMPL_IF NAME="first" -->
! 					<input type="hidden" name="and_or" value="">&nbsp;
! 				<!-- TMPL_ELSE -->
! 					<select name="and_or" size="1" onchange="sql_update()">
! 						<option value="and">and</option>
! 						<option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">or</option>
! 					</select>
! 				<!-- /TMPL_IF -->
! 			</td>
! 			<td><!-- TMPL_VAR name="marclist" --></td>
! 			<td>
  				<select name="excluding" size="1" onchange="sql_update()">
  					<option value="0"> </option>
  					<option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">not</option>
  				</select>
- 			</td>
- 			<td>
  				<select name="operator" size="1" onchange="sql_update()">
  					<option <!-- TMPL_IF NAME="contains" -->selected<!-- /TMPL_IF --> value="contains">Contains</option>
--- 12,96 ----
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="catalogue">Search on</h2>
! 		<p>
! 			<label class="label20">Keyword</label>
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label20">Title</label>
! 			<input type="hidden" name="marclist" value="biblio.title">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label20">author</label> <input type="hidden" name="marclist" value="biblio.author">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" onchange="sql_update()">
! 		</p>
! 	<p>
! 				<label class="label20">barcode</label>
! 				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
  				<input type="hidden" name="excluding" value="">
  				<input type="hidden" name="operator" value="contains">
  				<input type="text" name="value" onchange="sql_update()">
! 	</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2 class="catalogue">Search on</h2>
! 		<p>
! 			<label class="label20">Illustrator</label>
! 			<input type="hidden" name="marclist" value="biblioitems.illus">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label20">Dewey</label><input type="hidden" name="marclist" value="biblioitems.dewey">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label20">Item Type</label> <input type="hidden" name="marclist" value="biblioitems.itemtype">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
! 			<!-- TMPL_VAR name="CGIitemtype" -->
! 		</p>
! 						<p>
! 				<label class="label20">branch</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
  				<input type="hidden" name="excluding" value="">
  				<input type="hidden" name="operator" value="=">
! 				<!-- TMPL_VAR name="CGIbranch" -->
! 	</p>
! 
! 	</div>
! 	<div id="bloc25">
! 		<h2 class="catalogue">More fields</h2>
  		<!-- TMPL_LOOP NAME="statements" -->
! 			<p>
! 				<select name="and_or" size="1" onchange="sql_update()">
! 					<option value="and">and</option>
! 					<option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">or</option>
! 				</select>
! 				<!-- TMPL_VAR name="marclist" -->
  				<select name="excluding" size="1" onchange="sql_update()">
  					<option value="0"> </option>
  					<option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">not</option>
  				</select>
  				<select name="operator" size="1" onchange="sql_update()">
  					<option <!-- TMPL_IF NAME="contains" -->selected<!-- /TMPL_IF --> value="contains">Contains</option>
***************
*** 127,171 ****
  					<option <!-- TMPL_IF NAME="le" -->selected<!-- /TMPL_IF --> value="<=">Is lower or equal to</option>
  				</select>
- 			</td>
- 			<td>
  				<input type="text" name="value" onChange="sql_update()" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF -->>
! 			</td>
! 		</tr>
  		<!-- /TMPL_LOOP -->
! 		<tr>
! 			<td align="left" colspan=2><input type="button" value="Add criteria" onClick="AddStatement()" class="button"></td>
! 			<td colspan=3>Warning : the "contains" statement does NOT work if you enter 2 or less letters</td>
! 		</tr>
! 
! 		<tr align="center">
! 			<td colspan="5">
! 				<div name="sql">
  				<textarea name="sql" rows=3 cols=70 disabled readonly></textarea>
! 				</div>
! 			</td>
! 		</tr>
! 	</table>
! 	<br>
! 
! 	<table class="noborder">
! 	<tr>
! 	<td align="right">Results per page :
! 		<select align="right" name="resultsperpage" size="1">
! 			<option value="20">20</option>
! 			<option value="50">50</option>
! 			<option value="100">100</option>
! 		</select>
! 	</td>
! 	<td>Ordered by
! 		<select name="orderby" size="1">
! 			<option value="biblio.title">Title</option>
! 			<option value="biblio.author">Author</option>
! 			<option value="biblioitems.dewey">Dewey</option>
! 			<option value="biblioitems.publicationyear">Publication Year</option>
! 			<option value="biblioitems.publishercode">Publisher</option>
! 		</select>
! 	<td align="middle"><input type="submit" value="Start search" class="button"></td>
! 	</tr>
! 	</table>
  </form>
  
--- 102,138 ----
  					<option <!-- TMPL_IF NAME="le" -->selected<!-- /TMPL_IF --> value="<=">Is lower or equal to</option>
  				</select>
  				<input type="text" name="value" onChange="sql_update()" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF -->>
! 			</p>
  		<!-- /TMPL_LOOP -->
! 		<p>
! 		<input type="button catalogue" value="Add criteria" onClick="AddStatement()" class="button catalogue">
! 		Warning : the "contains" statement does NOT work if you enter 2 or less letters
! 	</div>
! 	<div id="bloc25">
! 		<p>
! 			<div name="sql">
  				<textarea name="sql" rows=3 cols=70 disabled readonly></textarea>
! 			</div>
! 		</p>
! 		<p>Results per page :
! 			<select align="right" name="resultsperpage" size="1">
! 				<option value="20">20</option>
! 				<option value="50">50</option>
! 				<option value="100">100</option>
! 			</select>
! 		Ordered by
! 			<select name="orderby" size="1">
! 				<option value="biblio.title">Title</option>
! 				<option value="biblio.author">Author</option>
! 				<option value="biblioitems.dewey">Dewey</option>
! 				<option value="biblioitems.publicationyear">Publication Year</option>
! 				<option value="biblioitems.publishercode">Publisher</option>
! 			</select>
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a>
! 		</p>
! 	</div>
  </form>
  
***************
*** 174,178 ****
  document.f.sql.value="";
  	for (i=0 ; i<document.f.marclist.length ; i++) {
! 		if (document.f.marclist[i].value != '') {
  			document.f.sql.value = document.f.sql.value+
  										document.f.and_or[i].value + ' (' +
--- 141,145 ----
  document.f.sql.value="";
  	for (i=0 ; i<document.f.marclist.length ; i++) {
! 		if (document.f.value[i].value.length>0) {
  			document.f.sql.value = document.f.sql.value+
  										document.f.and_or[i].value + ' (' +
***************
*** 191,194 ****
--- 158,171 ----
  }
  
+ function PopupSuggestion() {
+     var strQuery="";
+ 	for (i=0 ; i<document.f.marclist.length ; i++) {
+ 		if (document.f.value[i].value.length>0) {
+ 		    strQuery += " "+document.f.value[i].value;
+ 		}
+ 	}
+ 	newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
+ }
+ 
  </script>
  </div>





More information about the Koha-cvs mailing list