[Koha-cvs] koha/search.marc search.pl [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/09/04 08:11:06

Modified files:
        search.marc    : search.pl 

Log message:
        sync with rel_2_2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/search.marc/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.33&r2=1.33.2.1

Patches:
Index: search.pl
===================================================================
RCS file: /sources/koha/koha/search.marc/search.pl,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -b -r1.33 -r1.33.2.1
--- search.pl   10 Aug 2006 13:08:28 -0000      1.33
+++ search.pl   4 Sep 2006 08:11:05 -0000       1.33.2.1
@@ -96,7 +96,15 @@
 
 my $startfrom=$query->param('startfrom');
 $startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
+my ($template, $loggedinuser, $cookie)
+               = get_template_and_user({template_name => 
"search.marc/result.tmpl",
+                               query => $query,
+                               type => $type,
+                               authnotrequired => 0,
+                               flagsrequired => {borrowers => 1},
+                               flagsrequired => {catalogue => 1},
+                               debug => 1,
+                               });
 my $searchdesc;
 my $resultsperpage;
 
@@ -158,15 +166,6 @@
        }
         exit
        }
-       ($template, $loggedinuser, $cookie)
-               = get_template_and_user({template_name => 
"search.marc/result.tmpl",
-                               query => $query,
-                               type => $type,
-                               authnotrequired => 0,
-                               flagsrequired => {borrowers => 1},
-                               flagsrequired => {catalogue => 1},
-                               debug => 1,
-                               });
 
        # multi page display gestion
        my $displaynext=0;