[Koha-cvs] CVS: koha help.pl,1.1,1.2 mainpage.pl,1.9,1.10 MARCdetail.pl,1.27,1.28

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418

Modified Files:
        help.pl mainpage.pl MARCdetail.pl 
Log Message:
synch'ing 2.2 and head

Index: help.pl
===================================================================
RCS file: /cvsroot/koha/koha/help.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** help.pl     3 Jun 2004 10:22:59 -0000       1.1
--- help.pl     20 Jun 2005 14:37:51 -0000      1.2
***************
*** 30,34 ****
        unless (-e "$htdocs/$theme/$lang/$tmplbase") {
                $tmplbase="help/nohelp.tmpl";
!               my ($theme, $lang) = themelanguage($htdocs, $tmplbase, 
"intranet");
        }
        my $template = HTML::Template->new(filename      => 
"$htdocs/$theme/$lang/$tmplbase",
--- 30,34 ----
        unless (-e "$htdocs/$theme/$lang/$tmplbase") {
                $tmplbase="help/nohelp.tmpl";
!               ($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
        }
        my $template = HTML::Template->new(filename      => 
"$htdocs/$theme/$lang/$tmplbase",

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mainpage.pl 22 Dec 2003 14:54:53 -0000      1.9
--- mainpage.pl 20 Jun 2005 14:37:52 -0000      1.10
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys 
%$authtypes) {
+       my %row =(value => $thisauthtype,
+                               authtypetext => 
$authtypes->{$thisauthtype}{'authtypetext'},
+                       );
+       push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => address@hidden);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** MARCdetail.pl       15 Jun 2005 16:09:44 -0000      1.27
--- MARCdetail.pl       20 Jun 2005 14:37:52 -0000      1.28
***************
*** 66,74 ****
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, 
it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless 
$bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless 
$biblionumber;
! my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
--- 66,78 ----
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
+ my $itemtype = $query->param('frameworkcode');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, 
it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless 
$bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless 
$biblionumber;
! $itemtype = &MARCfind_frameworkcode($dbh,$bibid) if not ($itemtype);
! $itemtype = '' if ($itemtype eq 'Default');
! warn "itemtype :".$itemtype;
! 
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
***************
*** 84,87 ****
--- 88,115 ----
                             });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from 
biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+       push @select_fwk, $fwk;
+       $select_fwk{$fwk} = $description;
+ }
+ $curfwk=$itemtype;
+ warn "current fwk :".$curfwk ;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+                       -id => 'Frameworks',
+                       -default => $curfwk,
+                       -OnChange => 'Changefwk(this);',
+                       -values   => address@hidden,
+                       -labels   => \%select_fwk,
+                       -size     => 1,
+                       -multiple => 0 );
+ 
+ $template->param( framework => $framework);
  # fill arrays
  my @loop_data =();