[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.58,1.59 additem-nomarc.pl,1.5,1.6 additem.pl,1.30,1.31

[Paul POULAIN]

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

Modified Files:
        addbiblio.pl additem-nomarc.pl additem.pl 
Log Message:
synch'ing 2.2 and head

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** addbiblio.pl        19 Jul 2005 16:48:15 -0000      1.58
--- addbiblio.pl        4 Aug 2005 12:12:13 -0000       1.59
***************
*** 178,182 ****
        # it's a thesaurus / authority field
        } elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
!               $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE 
READONLY> <a 
href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
        # it's a plugin field
        } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
--- 178,182 ----
        # it's a thesaurus / authority field
        } elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
!               $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"77\" maxlength=\"255\" DISABLE 
READONLY> <a 
href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
        # it's a plugin field
        } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
***************
*** 191,206 ****
                my $extended_param = 
plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
                my ($function_name,$javascript) = 
plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
!               $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\"  value=\"$value\" size=\"47\" maxlength=\"255\" 
OnFocus=\"javascript:Focus$function_name($i)\" 
OnBlur=\"javascript:Blur$function_name($i)\"> <a 
href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
        # it's an hidden field
        } elsif  ($tag eq '') {
                $subfield_data{marc_value}="<input type=\"hidden\" 
name=\"field_value\" value=\"$value\">";
        } elsif  ($tagslib->{$tag}->{$subfield}->{'hidden'}) {
!               $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"50\" maxlength=\"255\" DISABLE 
READONLY>";
        # it's a standard field
        } else {
!               if (length($value) >200) {
!                       $subfield_data{marc_value}="<textarea 
name=\"fieldvalue\" cols=\"50\" rows=\"5\" >$value</textarea>";
                } else {
!                       $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"50\">"; #"
                }
        }
--- 191,206 ----
                my $extended_param = 
plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
                my ($function_name,$javascript) = 
plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
!               $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\"  value=\"$value\" size=\"77\" maxlength=\"255\" 
OnFocus=\"javascript:Focus$function_name($i)\" 
OnBlur=\"javascript:Blur$function_name($i)\"> <a 
href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
        # it's an hidden field
        } elsif  ($tag eq '') {
                $subfield_data{marc_value}="<input type=\"hidden\" 
name=\"field_value\" value=\"$value\">";
        } elsif  ($tagslib->{$tag}->{$subfield}->{'hidden'}) {
!               $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"80\" maxlength=\"255\" DISABLE 
READONLY>";
        # it's a standard field
        } else {
!               if (length($value) >100) {
!                       $subfield_data{marc_value}="<textarea 
name=\"field_value\" cols=\"80\" rows=\"5\" >$value</textarea>";
                } else {
!                       $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\" value=\"$value\" size=\"80\">"; #"
                }
        }
***************
*** 225,236 ****
        # if MARC::Record is not empty => use it as master loop, then add 
missing subfields that should be in the tab.
        # if MARC::Record is empty => use tab as master loop.
!                       if ($record ne -1 && $record->field($tag)) {
!                               my @fields = $record->field($tag);
                                foreach my $field (@fields)  {
                                        my @subfields_data;
                                        if ($tag<10) {
!                                               my $value=$field->data();
!                                               my $subfield="@";
                                                next if 
($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
                                                push(@subfields_data, 
&create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth));
                                                $i++;
--- 225,248 ----
        # if MARC::Record is not empty => use it as master loop, then add 
missing subfields that should be in the tab.
        # if MARC::Record is empty => use tab as master loop.
!                       if ($record ne -1 && ($record->field($tag) || $tag eq 
'000')) {
!                               my @fields;
!                               if ($tag ne '000') {
!                                       @fields = $record->field($tag);
!                               } else {
!                                       push @fields,$record->leader();
!                               }
                                foreach my $field (@fields)  {
                                        my @subfields_data;
                                        if ($tag<10) {
!                                               my ($value,$subfield);
!                                               if ($tag ne '000') {
!                                                       $value=$field->data();
!                                                       $subfield="@";
!                                               } else {
!                                                       $value = $field;
!                                                       $subfield='@';
!                                               }
                                                next if 
($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
+                                               next if 
($tagslib->{$tag}->{$subfield}->{kohafield} eq 'biblio.biblionumber');
                                                push(@subfields_data, 
&create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth));
                                                $i++;

Index: additem-nomarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem-nomarc.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** additem-nomarc.pl   4 May 2005 08:45:33 -0000       1.5
--- additem-nomarc.pl   4 Aug 2005 12:12:13 -0000       1.6
***************
*** 21,25 ****
  
  # $Log$
! # Revision 1.5  2005/05/04 08:45:33  tipaul
  # synch'ing 2.2 and head
  #
--- 21,25 ----
  
  # $Log$
! # Revision 1.6  2005/08/04 12:12:13  tipaul
  # synch'ing 2.2 and head
  #

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** additem.pl  1 Aug 2005 14:36:49 -0000       1.30
--- additem.pl  4 Aug 2005 12:12:13 -0000       1.31
***************
*** 145,150 ****
  $indicators{995}='  ';
  # now, build existiing item list
! my $temp = MARCgetbiblio($dbh,$bibid);
! my @fields = $temp->fields();
  my %witness; #---- stores the list of subfields used at least once, with the 
"meaning" of the code
  my @big_array;
--- 145,151 ----
  $indicators{995}='  ';
  # now, build existiing item list
! # my $temp = MARCgetbiblio($dbh,$bibid);
! # my @fields = $temp->fields();
! my @fields = $record->fields();
  my %witness; #---- stores the list of subfields used at least once, with the 
"meaning" of the code
  my @big_array;
***************
*** 306,309 ****
--- 307,318 ----
        }
  }
+ my ($template, $loggedinuser, $cookie)
+     = get_template_and_user({template_name => "acqui.simple/additem.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {editcatalogue => 1},
+                            debug => 1,
+                            });
  
  # what's the next op ? it's what we are not in : an add if we're editing, 
otherwise, and edit.