From 150f38baf05cc7b256f61540544ee86c3fee95ad Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Tue, 3 May 2005 15:00:32 +0000
Subject: [PATCH] Improving Interface.

---
 .../default/en/search.marc/dictionary.tmpl    | 59 ++++--------------
 search.marc/dictionary.pl                     | 60 ++++++++++---------
 2 files changed, 43 insertions(+), 76 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl
index de875df427..f5dd4421b6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl
@@ -18,19 +18,6 @@ function Help() {
 
 <link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css">
 <style type="text/css">
-.authority {
-	background-color: #6b7cbe;
-	color:#FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	background-image:none;
-	}
-a.authority:hover {
-	background-color: #6b7cbe;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
 .catalogue {
 	background-color:#ad11ad;
 	color:#FFFFFF;
@@ -63,7 +50,6 @@ a.catalogue:hover {
 		</div>
 	</form>
 
-<!-- TMPL_IF Name=result -->	
 	<div class="bloc100">
 		<h2 class="catalogue">Dictionary Search results</h2>
 		<!-- TMPL_IF NAME="authresult" -->
@@ -91,25 +77,26 @@ a.catalogue:hover {
 		<div id="resultlist">
 			<table>
 				<tr>
-					<th colspan="2" class="authority">Authorities</th>
+					<th colspan="2" class="catalogue">Authorities</th>
 				</tr>
 				<tr>
-					<th class="authority">Summary</th>
-					<th class="authority">Used</th>
+					<th class="catalogue">Summary</th>
+					<th class="catalogue">Used</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="authresult" -->
 					<tr>
 						<td><!-- TMPL_VAR NAME="summary" --></td>
 						<td>
-							<a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)
+							<a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button catalogue"><!-- TMPL_VAR NAME="used" --> biblio(s)
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
 			</table>
 		</div>
 		<!-- TMPL_ELSE -->
-			<h3 class="authority">No results in Authorities</h3>
+			<h3 class="catalogue">No results in Authorities</h3>
 		<!-- /TMPL_IF -->
+<!-- TMPL_IF Name=catresult -->	
 		<div id="resultnumber">
 			<p class="resultcount">
 			<!-- TMPL_IF NAME="total" -->
@@ -125,23 +112,16 @@ a.catalogue:hover {
 					<th class="catalogue">Location</th>
 					<th class="catalogue">&nbsp;</th>
 				</tr>
-				<!-- TMPL_LOOP NAME="result" -->
+				<!-- TMPL_LOOP NAME="catresult" -->
 				<tr>
 					<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
 								<!-- TMPL_IF name="MARC_ON" -->
-									<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+									<a class="transparent resultlist" href="search.pl?type=<!-- TMPL_VAR NAME="type" ESCAPE="URL" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;operator=contains&amp;op=do_search&amp;and_or=and&amp;value='<!-- TMPL_VAR Name=value ESCAPE="URL" -->'&amp;excluding="><!-- TMPL_VAR NAME="value" --></a>
 								<!-- TMPL_ELSE -->
-									<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>				<!-- /TMPL_IF -->
-							<p><!-- TMPL_VAR NAME="author" -->
-							<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
-						</p>
+									<a class="transparent resultlist" href="search.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a>				<!-- /TMPL_IF -->
 					</td>
 					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
-						<!-- TMPL_VAR NAME="totitem" -->
+						<!-- TMPL_VAR NAME="count" -->
 					</td>
 					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
 						<!-- TMPL_LOOP NAME="CN" -->
@@ -170,25 +150,6 @@ a.catalogue:hover {
 					</td>
 				</tr>
 				<!-- /TMPL_LOOP -->
-				<!-- TMPL_LOOP NAME="catresult" -->
-				<tr>
-					<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
-								<!-- TMPL_IF name="MARC_ON" -->
-									<a class="transparent resultlist" href="search.pl?type=<!-- TMPL_VAR NAME="type" ESCAPE="URL" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;operator=contains&amp;op=do_search&amp;and_or=and&amp;value='<!-- TMPL_VAR Name=value ESCAPE="URL" -->'&amp;excluding="><!-- TMPL_VAR NAME="value" --></a>
-								<!-- TMPL_ELSE -->
-									<a class="transparent resultlist" href="search.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a>				<!-- /TMPL_IF -->
-					</td>
-					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
-						<!-- TMPL_VAR NAME="count" -->
-					</td>
-					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
-						&nbsp;
-					</td>
-					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
-						&nbsp;
-					</td>
-				</tr>
-				<!-- /TMPL_LOOP -->
 			</table>
 		</div>
 		<div id="resultnumber">
diff --git a/search.marc/dictionary.pl b/search.marc/dictionary.pl
index 760384b0ac..8112b65324 100755
--- a/search.marc/dictionary.pl
+++ b/search.marc/dictionary.pl
@@ -75,10 +75,6 @@ if ($op eq "do_search") {
 	
  	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
  		push @tags, $dbh->quote("$tagfield$tagsubfield");
- 		push @and_or, "";
- 		push @operator, "contains";
- 		push @excluding, "";
- 		push @value, @search ;
  	}
 
 	$resultsperpage= $input->param('resultsperpage');
@@ -89,37 +85,47 @@ if ($op eq "do_search") {
 #	select distinct m1.bibid from biblio,biblioitems,marc_biblio,marc_word as m1 where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and (m1.word  like 'Paul' and m1.tagsubfield in ('200f','710a','711a','712a','701a','702a','700a')) order by biblio.title
 
 
-	my ($results,$total) = catalogsearch($dbh,\@tags ,\@and_or,
-										\@excluding, \@operator,  \@value,
-										$startfrom*$resultsperpage, $resultsperpage,$orderby);
-	my %seen = ();
-
-	foreach my $item (@$results) {
-		my $display;
-		$display="author" if ($field=~/author/);
-		$display="title" if ($field=~/title/);
-		$display="subject" if ($field=~/subject/);
-		$display="publishercode" if ($field=~/publisher/);
-	    $seen{$item->{$display}}++;
+	my @results, my $total;
+# 	my ($results,$total) = catalogsearch($dbh,\@tags ,\@and_or,
+# 										\@excluding, \@operator,  \@value,
+# 										$startfrom*$resultsperpage, $resultsperpage,$orderby);
+	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_word.tagsubfield in ";
+	my $listtags="(";
+	foreach my $tag (@tags){
+		$listtags .= $tag .",";
 	}
+	$listtags =~s/,$/)/;
+	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
+	warn "".$strsth;
+	my $value = uc($search[0]);
+	$value=~s/\*/%/g;
+	$value.= "%" if not($value=~m/%/);
+	warn " texte : ".$value;
+
+	$sth=$dbh->prepare($strsth);
+	$sth->execute($value);
+	my $total;
 	my @catresults;
-	foreach my $name (sort keys %seen){
-		push @catresults, { value => $name , count => $seen{$name}}
+	while (my ($value,$ctresults)=$sth->fetchrow) {
+		warn "countresults : ".$ctresults;
+		push @catresults,{value=> $value, 
+						  even=>($total-$startfrom*$resultsperpage)%2,
+						  count=>$ctresults
+						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
+		$total++;
 	}
+	
 
-	my $strsth="Select distinct authtypecode from marc_subfield_structure where ";
-	my $strtagfields="tagfield in (";
-	my $strtagsubfields=" and tagsubfield in (";
+	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
 	foreach my $listtags (@tags){
 		my @taglist=split /,/,$listtags;
 		foreach my $curtag (@taglist){
-			$strtagfields=$strtagfields."'".substr($curtag,1,3)."',";
-			$strtagsubfields=$strtagsubfields."'".substr($curtag,4,1)."',";
+			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
 		}
 	}
-	$strtagfields=~s/,$/)/;
-	$strtagsubfields=~s/,$/)/;
-	my $strsth = $strsth.$strtagfields.$strtagsubfields." and authtypecode is not NULL";
+	
+	$strsth=~s/ OR$/)/;
+	my $strsth = $strsth." and authtypecode is not NULL";
 	warn $strsth;
 	my $sth=$dbh->prepare($strsth);
 	$sth->execute;
@@ -185,7 +191,7 @@ if ($op eq "do_search") {
 	} else {
 		$to = (($startfrom+1)*$resultsperpage);
 	}
-	$template->param(result => $results,
+	$template->param(result => \@results,
 					 catresult=> \@catresults,
 						search => $search[0],
 						marclist =>$field,
-- 
2.20.1