[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc result.tmpl,1.7,1.8 search.tmpl,1.5,1.6

Jerome Vizcaino plugz at users.sourceforge.net
Tue Jul 8 14:04:22 CEST 2003


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

Modified Files:
	result.tmpl search.tmpl 
Log Message:
Updates and fixes to use the modified SearchMarc.pm v1.8 and search.marc/search.pl v1.10
Users can search using more than 3 criterias (criterias are now added dynamically)
Results can be displayed using 20,50 or 100 results per page.
Added arrows and numbers to walk through the results (as in OPAC)


Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** result.tmpl	5 Jun 2003 14:19:58 -0000	1.7
--- result.tmpl	8 Jul 2003 12:04:20 -0000	1.8
***************
*** 1,3 ****
! <TMPL_IF NAME="opac">
      <TMPL_INCLUDE NAME="opac-top.inc">
  <TMPL_ELSE>
--- 1,3 ----
! <<TMPL_IF NAME="opac">
      <TMPL_INCLUDE NAME="opac-top.inc">
  <TMPL_ELSE>
***************
*** 5,10 ****
  </TMPL_IF>
  
! <span style="font-size:2em; text-align:left;">MARC Search</span>
! <br/>
  
  <center>
--- 5,41 ----
  </TMPL_IF>
  
! <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>
***************
*** 13,26 ****
  	<tr
  	<TMPL_IF NAME="opac">
! 			bgcolor=#99cccc background=/images/background-opac.gif
  		<TMPL_ELSE>
! 			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>
- </thead>
  <tbody>
  	<TMPL_LOOP name="result">
--- 44,55 ----
  	<tr
  	<TMPL_IF NAME="opac">
! 			bgcolor=#99cccc background=/images/background-opac.gif>
  		<TMPL_ELSE>
! 			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">
***************
*** 28,36 ****
  			<td><a href="../MARCdetail.pl?bibid=<TMPL_VAR name="bibid">"><TMPL_VAR name="bibid"></a></td>
  			<td><TMPL_VAR name="author"></td>
! 			<td><a href="../MARCdetail.pl?bibid=<TMPL_VAR name="bibid">"><TMPL_VAR name="title"></a></td>
  		</tr>
  	</TMPL_LOOP>
- </tbody>
  </table>
  
  <TMPL_IF NAME="opac">
--- 57,88 ----
  			<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>
+ 			</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="opac">

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** search.tmpl	5 Jun 2003 14:19:58 -0000	1.5
--- search.tmpl	8 Jul 2003 12:04:20 -0000	1.6
***************
*** 5,18 ****
  </TMPL_IF>
  
! <span style="font-size:2em; text-align:left;">MARC Search</span>
  
  <center>
  <form name="f" method="post">
  <input type="hidden" name="type" value="intranet">
  	<table border=0 cellspacing=0 cellpadding=2 width="80%>
  		<tr align="center">
  			<td colspan=3>
  				<div name="sql">
- 				<input type="hidden" name="op" value="do_search">
  				<textarea name="sql" rows=5 cols=60 disabled readonly></textarea>
  				</div>
--- 5,21 ----
  </TMPL_IF>
  
! <span style="font-size:2em; text-align:left;">Recherche MARC</span>
  
  <center>
  <form name="f" method="post">
+ 
+ <input type="hidden" name="op" value="do_search">
  <input type="hidden" name="type" value="intranet">
+ <input type="hidden" name="nbstatements" value="<TMPL_VAR NAME="nbstatements">">
+ 
  	<table border=0 cellspacing=0 cellpadding=2 width="80%>
  		<tr align="center">
  			<td colspan=3>
  				<div name="sql">
  				<textarea name="sql" rows=5 cols=60 disabled readonly></textarea>
  				</div>
***************
*** 21,112 ****
  				<span style="color:#FFFFFF;">
  					<b>HELP :</b><br/>
! 					Build your request using MARC fields and subfields.
! 					OK will show the list of the corresponding biblios in your library.
  				</span>
  			</td>
  		</tr>
  
! 		<!-- 000000000000000000000000000000000000000000000000000000 -->
! 		<tr>
! 			<td>
! 				<input type=hidden name="and_or" value="">&nbsp;
! 			</td>
! 			<td><TMPL_VAR name="marclist"></td>
! 			<td>
! 				<select name="excluding" size="1" onchange="sql_update()">
! 					<option value=""> </option>
! 					<option value="not">not</option>
! 				</select>
! 			</td>
! 			<td>
! 				<select name="operator" size="1" onchange="sql_update()">
! 					<option value="=">equals</option>
! 					<option value=">">is more than</option>
! 					<option value=">=">is more than or equal to</option>
! 					<option value="<">is less than</option>
! 					<option value="<=">is less than or equal to</option>
! 					<option value="start">starts with</option>
! 					<option value="contains">contains</option>
! 				</select>
! 			</td>
! 			<td><input type="text" name="value" onChange="sql_update()"></td>
! 		</tr>
! 		<tr>
! 			<td>
! 				<select name="and_or" size="1" onchange="sql_update()">
! 					<option value="and">and</option>
! 					<option value="or">or</option>
! 				</select>
! 			</td>
! 			<td><TMPL_VAR name="marclist"></td>
! 			<td>
! 				<select name="excluding" size="1" onchange="sql_update()">
! 					<option value=""> </option>
! 					<option value="not">not</option>
! 				</select>
! 			</td>
! 			<td>
! 				<select name="operator" size="1" onchange="sql_update()">
! 					<option value="=">equals</option>
! 					<option value=">">is more than</option>
! 					<option value=">=">is more than or equal to</option>
! 					<option value="<">is less than</option>
! 					<option value="<=">is less than or equal to</option>
! 					<option value="start">starts with</option>
! 					<option value="contains">contains</option>
! 				</select>
! 			</td>
! 			<td><input type="text" name="value" onChange="sql_update()"></td>
! 		</tr>
  		<tr>
  			<td>
! 				<select name="and_or" size="1" onchange="sql_update()">
! 					<option value="and">and</option>
! 					<option value="or">or</option>
! 				</select>
  			</td>
  			<td><TMPL_VAR name="marclist"></td>
  			<td>
  				<select name="excluding" size="1" onchange="sql_update()">
! 					<option value=""> </option>
! 					<option value="not">not</option>
  				</select>
  			</td>
  			<td>
  				<select name="operator" size="1" onchange="sql_update()">
! 					<option value="=">equals</option>
! 					<option value=">">is more than</option>
! 					<option value=">=">is more than or equal to</option>
! 					<option value="<">is less than</option>
! 					<option value="<=">is less than or equal to</option>
! 					<option value="start">starts with</option>
! 					<option value="contains">contains</option>
  				</select>
  			</td>
! 			<td><input type="text" name="value" onChange="sql_update()"></td>
  		</tr>
! 		<tr><td colspan=5 align=center><input type="submit" value="OK"></td></tr>
  	</table>
  </form>
  <script>
  function sql_update() {
--- 24,85 ----
  				<span style="color:#FFFFFF;">
  					<b>HELP :</b><br/>
! 					Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search.
! 					Search commits the request and displays the results.
  				</span>
  			</td>
  		</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="eq">selected</TMPL_IF> value="=">Is equal to</option>
! 					<option <TMPL_IF NAME="start">selected</TMPL_IF> value="start">Starts with</option>
! 					<option <TMPL_IF NAME="contains">selected</TMPL_IF> value="contains">Contains</option>
! 					<option <TMPL_IF NAME="gt">selected</TMPL_IF> value=">">Is greater than</option>
! 					<option <TMPL_IF NAME="ge">selected</TMPL_IF> value=">=">Is greater or equal to</option>
! 					<option <TMPL_IF NAME="lt">selected</TMPL_IF> value="<">Is lower than</option>
! 					<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>
! 	</table>
! 	<br>
! 
! 	<table width="90%">
! 	<tr>
! 	<td align="left" width="33%"><input type="button" value="Add criteria" onClick="AddStatement()"></td>
! 	<td align="middle" width="33%"><input type="submit" value="Search"></td>
! 	<td align="right" width="33%">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>
! 	</tr>
  	</table>
  </form>
+ </center>
+ 
  <script>
  function sql_update() {
***************
*** 117,126 ****
  										document.f.and_or[i].value + ' (' +
  										document.f.excluding[i].value + ' ' +
! 										document.f.marclist[i].value + '' +
! 										document.f.operator[i].value + '' +
  										'\''+document.f.value[i].value + '\') ';
  		}
  	}
  }
  </script>
  <TMPL_IF NAME="opac">
--- 90,106 ----
  										document.f.and_or[i].value + ' (' +
  										document.f.excluding[i].value + ' ' +
! 										document.f.marclist[i].value + ' ' +
! 										document.f.operator[i].value + ' ' +
  										'\''+document.f.value[i].value + '\') ';
  		}
  	}
  }
+ 
+ function AddStatement() {
+ 
+ 	document.forms[0].op.value="AddStatement";
+ 	document.f.submit();
+ }
+ 
  </script>
  <TMPL_IF NAME="opac">
***************
*** 129,130 ****
--- 109,111 ----
      <TMPL_INCLUDE NAME="cat-bottom.inc">
  </TMPL_IF>
+ 





More information about the Koha-cvs mailing list