french translation updated (again)

[koha.git] / opac / opac-search.pl

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 8e4fc55..b0e0e50 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -14,7 +14,7 @@ use C4::Search;
 use C4::Biblio;  # GetBiblioData
 use C4::Koha;
 use C4::Tags qw(get_tags);
-use POSIX qw(ceil floor);
+use POSIX qw(ceil floor strftime);
 use C4::Branch; # GetBranches
 
 # create a new CGI object
@@ -37,11 +37,14 @@ my $template_type;
 my @params = $cgi->param("limit");
 
 my $build_grouped_results = C4::Context->preference('OPACGroupResults');
-if ($build_grouped_results) {
+if  ($cgi->param("format") =~ /(rss|atom|opensearchdescription)/) {
+       $template_name = 'opac-opensearch.tmpl';
+}
+elsif ($build_grouped_results) {
     $template_name = 'opac-results-grouped.tmpl';
-} 
+}
 elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) {
-    $template_name = 'opac-results.tmpl';
+       $template_name = 'opac-results.tmpl';
 }
 else {
     $template_name = 'opac-advsearch.tmpl';
@@ -55,6 +58,18 @@ else {
     authnotrequired => 1,
     }
 );
+if ($cgi->param("format") eq 'rss2') {
+       $template->param("rss2" => 1);
+}
+elsif ($cgi->param("format") eq 'atom') {
+       $template->param("atom" => 1);
+    # FIXME - the timestamp is a hack - the biblio update timestamp should be used for each
+    # entry, but not sure if that's worth an extra database query for each bib
+    $template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime));
+}
+elsif ($cgi->param("format") eq 'opensearchdescription') {
+       $template->param("opensearchdescription" => 1);
+}
 if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
     $template->param('UNIMARC' => 1);
 }
@@ -110,25 +125,46 @@ my $categories = GetBranchCategories(undef,'searchdomain');
 
 $template->param(branchloop => \@branch_loop, searchdomainloop => $categories);
 
-# load the itemtypes
+# load the Type stuff
 my $itemtypes = GetItemTypes;
+# the index parameter is different for item-level itemtypes
+my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
 my @itemtypesloop;
 my $selected=1;
 my $cnt;
 my $imgdir = getitemtypeimagesrc('opac');
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
 
-foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
+       foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
     my %row =(  number=>$cnt++,
                 imageurl=> $itemtypes->{$thisitemtype}->{'imageurl'}?($imgdir."/".$itemtypes->{$thisitemtype}->{'imageurl'}):"",
+                               ccl => $itype_or_itemtype,
                 code => $thisitemtype,
                 selected => $selected,
                 description => $itemtypes->{$thisitemtype}->{'description'},
                 count5 => $cnt % 4,
             );
-    $selected = 0 if ($selected) ;
-    push @itemtypesloop, \%row;
+       $selected = 0 if ($selected) ;
+       push @itemtypesloop, \%row;
+       }
+       $template->param(itemtypeloop => \@itemtypesloop);
+} else {
+    my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
+       for my $thisitemtype (@$advsearchtypes) {
+               my %row =(
+                               number=>$cnt++,
+                imageurl=> $imgdir."/".$thisitemtype->{'imageurl'},
+                               ccl => $advanced_search_types,
+                code => $thisitemtype->{authorised_value},
+                selected => $selected,
+                description => $thisitemtype->{'lib'},
+                count5 => $cnt % 4,
+            );
+               push @itemtypesloop, \%row;
+       }
+       $template->param(itemtypeloop => \@itemtypesloop);
 }
-$template->param(itemtypeloop => \@itemtypesloop);
 
 # # load the itypes (Called item types in the template -- just authorized values for searching)
 # my ($itypecount,@itype_loop) = GetCcodes();
@@ -282,7 +318,7 @@ my $count = C4::Context->preference('OPACnumSearchResults') || 20;
 my $results_per_page = $params->{'count'} || $count;
 my $offset = $params->{'offset'} || 0;
 my $page = $cgi->param('page') || 1;
-#my $offset = ($page-1)*$results_per_page;
+$offset = ($page-1)*$results_per_page if $page>1;
 my $hits;
 my $expanded_facet = $params->{'expand'};
 
@@ -331,7 +367,7 @@ my @results_array;
 my $results_hashref;
 
 if ($tag) {
-       my $taglist = get_tags({term=>$tag});
+       my $taglist = get_tags({term=>$tag, approved=>1});
        $results_hashref->{biblioserver}->{hits} = scalar (@$taglist);
        my @biblist  = (map {GetBiblioData($_->{biblionumber})} @$taglist);
        my @marclist = (map {$_->{marc}} @biblist );
@@ -353,8 +389,7 @@ elsif (C4::Context->preference('NoZebra')) {
         ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
     };
 }
-use Data::Dumper;
-print STDERR "-" x 25, "\n", Dumper($results_hashref);
+# use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref);
 if ($@ || $error) {
     $template->param(query_error => $error.$@);
     output_html_with_http_headers $cgi, $cookie, $template->output;
@@ -387,7 +422,7 @@ for (my $i=0;$i<=@servers;$i++) {
                        $tag_quantity = C4::Context->preference('TagsShowOnList')) {
                        foreach (@newresults) {
                                my $bibnum = $_->{biblionumber} or next;
-                               $_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, 'sort'=>'-weight',
+                               $_ ->{'TagLoop'} = get_tags({biblionumber=>$bibnum, approved=>1, 'sort'=>'-weight',
                                                                                limit=>$tag_quantity });
                        }
                }
@@ -406,7 +441,13 @@ for (my $i=0;$i<=@servers;$i++) {
         ## If there's just one result, redirect to the detail page
         if ($total == 1) {         
             my $biblionumber=@newresults[0]->{biblionumber};
-            print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
+            if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {
+                print $cgi->redirect("/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=$biblionumber");
+            } elsif  (C4::Context->preference('BiblioDefaultView') eq 'marc') {
+                print $cgi->redirect("/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=$biblionumber");
+            } else {
+                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
+            } 
             exit;
         }
         if ($hits) {
@@ -557,4 +598,8 @@ if ( C4::Context->preference("kohaspsuggest") ) {
 }
 
 # VI. BUILD THE TEMPLATE
-output_html_with_http_headers $cgi, $cookie, $template->output;
+# NOTE: not using application/atom+xml or application/rss+xml beccause of Internet Explorer 6;
+# see bug 2078.
+my $content_type = $cgi->param('format') =~ /rss|atom/ ? "application/xml" :
+                   "text/html";
+output_html_with_http_headers $cgi, $cookie, $template->output, $content_type;