merging arens + my modifs/bugfixes

diff --git a/C4/Output.pm b/C4/Output.pm
index facf0fb..3f57557 100644 (file)
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -115,7 +115,7 @@ sub themelanguage {
   THEME:
   foreach my $th (@themes) {
     foreach my $la (@languages) {
-       warn "File = $htdocs/$th/$la/$tmpl\n";
+#      warn "File = $htdocs/$th/$la/$tmpl\n";
        if (-e "$htdocs/$th/$la/$tmpl") {
            $theme = $th;
            $lang = $la;

diff --git a/acqui.simple/marcimport.pl b/acqui.simple/marcimport.pl
index d8f3e47..92f75f4 100755 (executable)
--- a/acqui.simple/marcimport.pl
+++ b/acqui.simple/marcimport.pl
@@ -247,7 +247,6 @@ sub ListFileRecords {
     $dbh = C4::Context->dbh;
 
     my $template=gettemplate('marcimport/ListFileRecords.tmpl');
-
     # File can be z3950 search query or uploaded MARC data
 
     # if z3950 results
@@ -744,8 +743,7 @@ sub AcceptBiblioitem {
     my $file= MARC::File::USMARC->indata($input->param('file'));
     my $numrecord = $input->param('numrecord');
     if ($numrecord) {
-       for (my $i==1;$i<$numrecord;$i++) {
-               # FIXME - This "==" was supposed to be a "=", right?
+       for (my $i=1;$i<$numrecord;$i++) {
            $record=$file->next;
        }
     } else {
@@ -998,6 +996,9 @@ sub FormatMarcText {
 
 #---------------
 # $Log$
+# Revision 1.18  2002/10/14 07:41:04  tipaul
+# merging arens + my modifs/bugfixes
+#
 # Revision 1.17  2002/10/13 07:39:26  arensb
 # Added magic RCS comment.
 # Removed trailing whitespace.

diff --git a/moredetail.pl b/moredetail.pl
index 0380376..003cde4 100755 (executable)
--- a/moredetail.pl
+++ b/moredetail.pl
@@ -26,13 +26,7 @@ use C4::Koha;
 use CGI;
 use C4::Search;
 use C4::Acquisitions;
-<<<<<<< moredetail.pl
-use C4::Output;
-
-=======
 use C4::Output; # contains gettemplate
-
->>>>>>> 1.14
 my $query=new CGI;
 
 my $includes = C4::Context->config('includes') ||

diff --git a/search.pl b/search.pl
index a46f82a..5d1a994 100755 (executable)
--- a/search.pl
+++ b/search.pl
@@ -28,10 +28,12 @@ use C4::Output;
 
 my $query=new CGI;
 my $type=$query->param('type');
-(-e "opac") && ($type='opac');
+warn $type;
 
-my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
+#(-e "opac") && ($type='opac');
 
+my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
+warn $type;
 
 my $startfrom=$query->param('startfrom');
 ($startfrom) || ($startfrom=0);
@@ -177,6 +179,11 @@ if ($count>10) {
 }
 
 $template->param(numbers => \@numbers);
+if (C4::Context->preference('acquisitions') eq 'simple') {
+       $template->param(script => "MARCdetail.pl");
+} else {
+       $template->param(script => "detail.pl");
+}
 
 # Print the page
 print $query->header(-cookie => $cookie), $template->output;