/[suikacvs]/test/cvs
Suika

Diff of /test/cvs

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.31 by wakaba, Sat Jul 6 10:30:10 2002 UTC revision 1.41 by wakaba, Sun Jul 28 00:31:38 2002 UTC
# Line 22  push @ISA, qw(Message::Field::Structured Line 22  push @ISA, qw(Message::Field::Structured
22    
23  ## Namespace support  ## Namespace support
24          our %NS_phname2uri;     ## PH-namespace name -> namespace URI          our %NS_phname2uri;     ## PH-namespace name -> namespace URI
25          our %NS_uri2phpackage;  ## namespace URI -> PH-package name          our %NS_uri2package;    ## namespace URI -> Package name
26            our %NS_uri2phpackage;  ## namespace URI -> PH-Package name
27          require Message::Header::Default;       ## Default namespace          require Message::Header::Default;       ## Default namespace
28    
29  ## Initialize of this class -- called by constructors  ## Initialize of this class -- called by constructors
# Line 40  push @ISA, qw(Message::Field::Structured Line 41  push @ISA, qw(Message::Field::Structured
41      -format     => 'mail-rfc2822',      -format     => 'mail-rfc2822',
42      -header_default_charset     => 'iso-2022-int-1',      -header_default_charset     => 'iso-2022-int-1',
43      -header_default_charset_input       => 'iso-2022-int-1',      -header_default_charset_input       => 'iso-2022-int-1',
44        -hook_init_fill_options     => sub {},
45        -hook_stringify_fill_fields => sub {},
46      -linebreak_strict   => 0,      -linebreak_strict   => 0,
47      -line_length_max    => 60,  ## For folding      -line_length_max    => 60,  ## For folding
48      #ns_default_phuri      #ns_default_phuri
# Line 54  push @ISA, qw(Message::Field::Structured Line 57  push @ISA, qw(Message::Field::Structured
57      #value_type      #value_type
58  );  );
59    
 ## taken from L<HTTP::Header>  
 # "Good Practice" order of HTTP message headers:  
 #    - General-Headers  
 #    - Request-Headers  
 #    - Response-Headers  
 #    - Entity-Headers  
 # (From draft-ietf-http-v11-spec-rev-01, Nov 21, 1997)  
 my @header_order = qw(  
   mail-from x-envelope-from relay-version path status  
   
    cache-control connection date pragma transfer-encoding upgrade trailer via  
   
    accept accept-charset accept-encoding accept-language  
    authorization expect from host  
    if-modified-since if-match if-none-match if-range if-unmodified-since  
    max-forwards proxy-authorization range referer te user-agent  
   
    accept-ranges age location proxy-authenticate retry-after server vary  
    warning www-authenticate  
   
    mime-version  
    allow content-base content-encoding content-language content-length  
    content-location content-md5 content-range content-type  
    etag expires last-modified content-style-type content-script-type  
    link  
   
   xref  
 );  
 my %header_order;  
   
60  =head1 CONSTRUCTORS  =head1 CONSTRUCTORS
61    
62  The following methods construct new C<Message::Header> objects:  The following methods construct new C<Message::Header> objects:
# Line 115  sub _init ($;%) { Line 88  sub _init ($;%) {
88        push @new_fields, ($name => $options{$name});        push @new_fields, ($name => $options{$name});
89      }      }
90    }    }
91      &{ $self->{option}->{hook_init_fill_options} } ($self, $self->{option});
92    $self->_init_by_format ($self->{option}->{format}, $self->{option});    $self->_init_by_format ($self->{option}->{format}, $self->{option});
   # Make alternative representations of @header_order.  This is used  
   # for sorting.  
   my $i = 1;  
   for (@header_order) {  
       $header_order{$_} = $i++ unless $header_order{$_};  
   }  
     
93    $self->add (@new_fields, -parse => $self->{option}->{parse_all})    $self->add (@new_fields, -parse => $self->{option}->{parse_all})
94      if $#new_fields > -1;      if $#new_fields > -1;
95  }  }
# Line 133  sub _init_by_format ($$\%) { Line 100  sub _init_by_format ($$\%) {
100    if ($format =~ /http/) {    if ($format =~ /http/) {
101      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-http'};      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-http'};
102      if ($format =~ /cgi/) {      if ($format =~ /cgi/) {
103        unshift @header_order, qw(content-type location);        #unshift @header_order, qw(content-type location);
104        $option->{field_sort} = 'good-practice';        $option->{field_sort} = 'good-practice';
105        $option->{use_folding} = 0;        $option->{use_folding} = 0;
106      } else {      } else {
107        $option->{field_sort} = 'good-practice';        $option->{field_sort} = 'good-practice';
108      }      }
109    } else {      ## RFC 822    } elsif ($format =~ /mail|news|mime/) {       ## RFC 822
110      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-rfc822'};      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-rfc822'};
111    }    }
112    if ($format =~ /uri-url-mailto/) {    if ($format =~ /uri-url-mailto/) {
# Line 188  sub parse ($$;%) { Line 155  sub parse ($$;%) {
155    } else {    } else {
156      $header =~ s/\x0D?\x0A$REG{WSP}/\x20/gos if $self->{option}->{use_folding};      $header =~ s/\x0D?\x0A$REG{WSP}/\x20/gos if $self->{option}->{use_folding};
157    }    }
158      my %option = (%{ $self->{option} });
159      $option{parse_all} = 0;
160    for my $field (split /\x0D?\x0A/, $header) {    for my $field (split /\x0D?\x0A/, $header) {
161      if ($field =~ /$REG{M_fromline}/) {      if ($field =~ /$REG{M_fromline}/) {
162        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
163          ('mail-from' => $1, $self->{option});          ('mail-from' => $1, \%option);
164        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
165      } elsif ($field =~ /$REG{M_field}/) {      } elsif ($field =~ /$REG{M_field}/) {
166        my ($name, $body) = ($1, $2);        my ($name, $body) = ($1, $2);
167        $body =~ s/$REG{WSP}+$//;        $body =~ s/$REG{WSP}+$//;
168        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
169          ($name => $body, $self->{option});          ($name => $body, \%option);
170        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
171      } elsif (length $field) {      } elsif (length $field) {
172        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
173          ('x-unknown' => $field, $self->{option});          ('x-unknown' => $field, \%option);
174        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
175      }      }
176    }    }
177    $self->_ns_associate_numerical_prefix;        ## RFC 2774 namespace    $self->_ns_associate_numerical_prefix;        ## RFC 2774 namespace
178      for (@{ $self->{value} }) {
179        no strict 'refs';
180        $_->{name}
181          = &{ ${ &_NS_uri2package ($_->{ns}).'::OPTION' }{n11n_name} }
182          ($self, &_NS_uri2package ($_->{ns}), $_->{name});
183        $_->{body} = $self->_parse_value ($_->{name} => $_->{body}, ns => $_->{ns})
184          if $self->{option}->{parse_all};
185      }
186    $self;    $self;
187  }  }
188    
# Line 287  sub _item_match ($$\$\%\%) { Line 264  sub _item_match ($$\$\%\%) {
264      my %o = %$option; #$o{parse} = 0;      my %o = %$option; #$o{parse} = 0;
265      my %l;      my %l;
266      for (keys %$list) {      for (keys %$list) {
267        my ($s, undef, $v) = $self->_value_to_arrayitem ($_, '', %o);        my ($s, undef, $v) = $self->_value_to_arrayitem ($_, '', \%o);
268        if ($s) {        if ($s) {
269          $l{$v->{name} . ':' . ( $option->{ns} || $v->{ns} ) } = 1;          $l{$v->{name} . ':' . ( $option->{ns} || $v->{ns} ) } = 1;
270        } else {        } else {
# Line 351  sub _parse_value ($$$;%) { Line 328  sub _parse_value ($$$;%) {
328    my $value = shift;  return $value if ref $value;    my $value = shift;  return $value if ref $value;
329    my %option = @_;    my %option = @_;
330    my $vtype; { no strict 'refs';    my $vtype; { no strict 'refs';
331      my $vt = ${&_NS_uri2phpackage ($option{ns}).'::OPTION'}{value_type};      my $vt = ${&_NS_uri2package ($option{ns}).'::OPTION'}{value_type};
332      if (ref $vt) {      if (ref $vt) {
333        $vtype = $vt->{$name} || $vt->{$self->{option}->{_VALTYPE_DEFAULT}};        $vtype = $vt->{$name} || $vt->{$self->{option}->{_VALTYPE_DEFAULT}};
334      }      }
# Line 363  sub _parse_value ($$$;%) { Line 340  sub _parse_value ($$$;%) {
340    my %vopt = %{$vtype->[1]} if ref $vtype->[1];    my %vopt = %{$vtype->[1]} if ref $vtype->[1];
341    if ($vpackage eq ':none:') {    if ($vpackage eq ':none:') {
342      return $value;      return $value;
343    } elsif (defined $value) {    } elsif (length $value) {
344      eval "require $vpackage" or Carp::croak qq{<parse>: $vpackage: Can't load package: $@};      eval "require $vpackage" or Carp::croak qq{<parse>: $vpackage: Can't load package: $@};
345      return $vpackage->parse ($value,      return $vpackage->parse ($value,
346        -format   => $self->{option}->{format},        -format   => $self->{option}->{format},
# Line 371  sub _parse_value ($$$;%) { Line 348  sub _parse_value ($$$;%) {
348        -field_name       => $name,        -field_name       => $name,
349      -header_default_charset     => $self->{option}->{header_default_charset},      -header_default_charset     => $self->{option}->{header_default_charset},
350      -header_default_charset_input       => $self->{option}->{header_default_charset_input},      -header_default_charset_input       => $self->{option}->{header_default_charset_input},
351        -internal_charset_name      => $self->{option}->{internal_charset_name},
352        -parse_all        => $self->{option}->{parse_all},        -parse_all        => $self->{option}->{parse_all},
353      %vopt);      %vopt);
354    } else {    } else {
# Line 381  sub _parse_value ($$$;%) { Line 359  sub _parse_value ($$$;%) {
359        -field_name       => $name,        -field_name       => $name,
360      -header_default_charset     => $self->{option}->{header_default_charset},      -header_default_charset     => $self->{option}->{header_default_charset},
361      -header_default_charset_input       => $self->{option}->{header_default_charset_input},      -header_default_charset_input       => $self->{option}->{header_default_charset_input},
362        -internal_charset_name      => $self->{option}->{internal_charset_name},
363        -parse_all        => $self->{option}->{parse_all},        -parse_all        => $self->{option}->{parse_all},
364      %vopt);      %vopt);
365    }    }
# Line 415  sub namespace_ph_default ($;$) { Line 394  sub namespace_ph_default ($;$) {
394    if (defined $_[0]) {    if (defined $_[0]) {
395      no strict 'refs';      no strict 'refs';
396      $self->{option}->{ns_default_phuri} = $_[0];      $self->{option}->{ns_default_phuri} = $_[0];
397      $self->_ns_load_ph (${&_NS_uri2phpackage ($self->{option}->{ns_default_phuri}).'::OPTION'}{namespace_phname});      $self->_ns_load_ph (${&_NS_uri2package ($self->{option}->{ns_default_phuri}).'::OPTION'}{namespace_phname});
398    }    }
399    $self->{option}->{ns_default_phuri};    $self->{option}->{ns_default_phuri};
400  }  }
# Line 456  sub _value_to_arrayitem ($$$\%) { Line 435  sub _value_to_arrayitem ($$$\%) {
435    if (ref $value eq 'ARRAY') {    if (ref $value eq 'ARRAY') {
436      ($value, %$value_option) = @$value;      ($value, %$value_option) = @$value;
437    }    }
438    my $nsuri = $self->{option}->{ns_default_phuri};    my $default_ns = $option->{ns_default_phuri};
439      my $nsuri = $default_ns;
440    $name =~ s/^$REG{WSP}+//;  $name =~ s/$REG{WSP}+$//;    $name =~ s/^$REG{WSP}+//;  $name =~ s/$REG{WSP}+$//;
441        
442    no strict 'refs';    no strict 'refs';
# Line 464  sub _value_to_arrayitem ($$$\%) { Line 444  sub _value_to_arrayitem ($$$\%) {
444      $nsuri = $value_option->{ns};      $nsuri = $value_option->{ns};
445    } elsif ($option->{ns}) {    } elsif ($option->{ns}) {
446      $nsuri = $option->{ns};      $nsuri = $option->{ns};
447    } elsif (($option->{ns_default_phuri} eq $self->{ns}->{uri2phname}->{'x-http'}    } elsif (($default_ns eq $self->{ns}->{phname2uri}->{'x-http'}
448         && $name =~ s/^([0-9]+)-//)         && $name =~ s/^([0-9]+)-//)
449      || ($name =~ s/^x-http-([0-9]+)-//i)) {     ## Numric namespace prefix, RFC 2774      || ($name =~ s/^x-http-([0-9]+)-//i)) {     ## Numric namespace prefix, RFC 2774
450      my $prefix = 0+$1;      my $prefix = 0+$1;
# Line 473  sub _value_to_arrayitem ($$$\%) { Line 453  sub _value_to_arrayitem ($$$\%) {
453        $self->{ns}->{number2uri}->{ $prefix } = 'urn:x-suika-fam-cx:msgpm:header:x-temp:'.$prefix;        $self->{ns}->{number2uri}->{ $prefix } = 'urn:x-suika-fam-cx:msgpm:header:x-temp:'.$prefix;
454        $nsuri = $self->{ns}->{number2uri}->{ $prefix };        $nsuri = $self->{ns}->{number2uri}->{ $prefix };
455      }      }
456    } elsif (($name =~ s/^([Xx]-[A-Za-z]+|[A-YZa-yz][A-Za-z]*)-    } elsif (
457                         ([Xx]-[A-Za-z]+|[A-YZa-yz][A-Za-z]*)-//x)      ${ &_NS_uri2package ($default_ns).'::OPTION' }{use_ph_namespace}
458      || $name =~ s/^([Xx]-[A-Za-z]+|[A-Za-z]+)-//) {      && (
459           ($name =~ s/^([Xx]-[A-Za-z0-9]+|[A-Za-z]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-
460                        ([Xx]-[A-Za-z0-9]+|[A-Za-z0-9]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-//x)
461         || $name =~ s/^([Xx]-[A-Za-z0-9]+|[A-Za-z0-9]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-//
462        )) {
463      my ($prefix1, $prefix2) = ($1, $2);      my ($prefix1, $prefix2) = ($1, $2);
464      my $original_prefix = $&;  my $one_prefix = 0;      my $original_prefix = $&;  my $one_prefix = 0;
465      unless ($prefix2) {      unless ($prefix2) {
466        $prefix2 = $prefix1;        $prefix2 = $prefix1;
467        $prefix1 = $self->{ns}->{uri2phname}->{ $option->{ns_default_phuri} };        $prefix1 = $self->{ns}->{uri2phname}->{ $default_ns };
468        $one_prefix = 1;        $one_prefix = 1;
469      }      }
470      my $prefix      my $prefix
471        = &{ ${ &_NS_uri2phpackage ($nsuri).'::OPTION' }{n11n_prefix} }        = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }
472          ($self, &_NS_uri2phpackage ($nsuri), $prefix1.'-'.$prefix2);          ($self, &_NS_uri2package ($nsuri), $prefix1.'-'.$prefix2);
473      $self->_ns_load_ph ($prefix);      $self->_ns_load_ph ($prefix);
474      $nsuri = $self->{ns}->{phname2uri}->{ $prefix };      $nsuri = $self->{ns}->{phname2uri}->{ $prefix };
475      unless ($nsuri) {      unless ($nsuri) {
476        $nsuri = $self->{option}->{ns_default_phuri};        $nsuri = $default_ns;
477        $prefix        $prefix
478          = &{ ${ &_NS_uri2phpackage ($nsuri).'::OPTION' }{n11n_prefix} }          = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }
479            ($self, &_NS_uri2phpackage ($nsuri), $one_prefix? $prefix2: $prefix1);            ($self, &_NS_uri2package ($nsuri), $one_prefix? $prefix2:
480               $prefix1);
481        $self->_ns_load_ph ($prefix);        $self->_ns_load_ph ($prefix);
482        $nsuri = $self->{ns}->{phname2uri}->{ $prefix };        $nsuri = $self->{ns}->{phname2uri}->{ $prefix };
483        if ($nsuri) {        if ($nsuri) {
484          $name = $prefix2 . '-' . $name unless $one_prefix;          $name = $prefix2 . '-' . $name unless $one_prefix;
485        } else {        } else {
486          $name = $original_prefix . $name;          unless ($one_prefix) {
487          $nsuri = $self->{option}->{ns_default_phuri};            $prefix
488                = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }
489                  ($self, &_NS_uri2package ($nsuri),
490                   $self->{ns}->{uri2phname}->{ $default_ns } . '-' . $prefix1);
491              $self->_ns_load_ph ($prefix);
492              $nsuri = $self->{ns}->{phname2uri}->{ $prefix };
493              if ($nsuri) {
494                $name = $prefix2 . '-' . $name;
495              }
496            }
497            unless ($nsuri) {
498              $name = $original_prefix . $name;
499              $nsuri = $default_ns;
500            }
501        }        }
502      }      }
503    }    }
504    $name    $name
505      = &{${&_NS_uri2phpackage ($nsuri).'::OPTION'}{n11n_name}}      = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_name} }
506        ($self, &_NS_uri2phpackage ($nsuri), $name);        ($self, &_NS_uri2package ($nsuri), $name);
507    Carp::croak "$name: invalid field-name"    Carp::croak "$name: invalid field-name"
508      if $option->{field_name_validation}      if $option->{field_name_validation}
509        && $name =~ /$REG{$option->{field_name_unsafe_rule}}/;        && $name =~ /$REG{ $option->{field_name_unsafe_rule} }/;
510    $value = $self->_parse_value ($name => $value, ns => $nsuri)    $value = $self->_parse_value ($name => $value, ns => $nsuri)
511      if $$option{parse} || $$option{parse_all};      if $option->{parse} || $option->{parse_all};
512    $$option{parse} = 0;    $option->{parse} = 0;
513    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});
514  }  }
515  *_add_hash_check = \&_value_to_arrayitem;  *_add_hash_check = \&_value_to_arrayitem;
# Line 597  sub rename ($%) { Line 595  sub rename ($%) {
595    $self if defined wantarray;    $self if defined wantarray;
596  }  }
597    
598    sub resent_item ($$$;%) {
599      my $self = shift;
600      my ($index, $item_name, %option) = @_;
601      ## TODO: implement this
602    }
603    
604  =item $self->scan(\&doit)  =item $self->scan(\&doit)
605    
# Line 608  for each value. Line 611  for each value.
611  =cut  =cut
612    
613  sub _scan_sort ($\@\%) {  sub _scan_sort ($\@\%) {
614      no strict 'refs';
615    my $self = shift;    my $self = shift;
616    my ($array, $option) = @_;    my ($array, $option) = @_;
617    my $sort;    my $nspack = &_NS_uri2package ($self->{option}->{ns_default_phuri});
618    $sort = \&_header_cmp if $option->{field_sort} eq 'good-practice';    my $sort = ${ $nspack.'::OPTION' }{field_sort};
619    $sort = {$a cmp $b} if $option->{field_sort} eq 'alphabetic';    if ($option->{field_sort} eq 'good-practice' && $sort->{'good-practice'}) {
620    return ( sort $sort @$array ) if ref $sort;      return $self->Message::Header::Default::sort_good_practice ($array, $nspack, $option);
621      } elsif ($option->{field_sort} eq 'alphabetic' && $sort->{'alphabetic'}) {
622        ## TODO: How treat namespace prefix?
623        return sort {$a->{name} cmp $b->{name}} @$array;
624      }
625    @$array;    @$array;
626  }  }
627    
# Line 622  sub _n11n_field_name ($$) { Line 630  sub _n11n_field_name ($$) {
630    my $self = shift;    my $self = shift;
631    my $s = shift;    my $s = shift;
632    $s =~ s/^$REG{WSP}+//; $s =~ s/$REG{WSP}+$//;    $s =~ s/^$REG{WSP}+//; $s =~ s/$REG{WSP}+$//;
633    $s = lc $s unless ${&_NS_uri2phpackage ($self->{option}->{ns_default_phuri}).'::OPTION'}{case_sensible};    $s = lc $s unless ${&_NS_uri2package ($self->{option}->{ns_default_phuri}).'::OPTION'}{case_sensible};
634    $s;    $s;
635  }  }
636    
 # Compare function which makes it easy to sort headers in the  
 # recommended "Good Practice" order.  
 ## taken from HTTP::Header  
 sub _header_cmp  
 {  
   my ($na, $nb) = ($a->{name}, $b->{name});  
     # Unknown headers are assign a large value so that they are  
     # sorted last.  This also helps avoiding a warning from -w  
     # about comparing undefined values.  
     $header_order{$na} = 999 unless defined $header_order{$na};  
     $header_order{$nb} = 999 unless defined $header_order{$nb};  
   
     $header_order{$na} <=> $header_order{$nb} || $na cmp $nb;  
 }  
637    
638  =head2 $self->stringify ([%option])  =head2 $self->stringify ([%option])
639    
# Line 652  sub stringify ($;%) { Line 646  sub stringify ($;%) {
646    my %params = @_;    my %params = @_;
647    my %option = %{$self->{option}};    my %option = %{$self->{option}};
648    $option{format} = $params{-format} if $params{-format};    $option{format} = $params{-format} if $params{-format};
649    $self->_init_by_format ($option{format}, \%option);    $self->_init_by_format ($option{format}, \%option)
650        if $self->{option}->{format} ne $option{format};
651    for (grep {/^-/} keys %params) {$option{substr ($_, 1)} = $params{$_}}    for (grep {/^-/} keys %params) {$option{substr ($_, 1)} = $params{$_}}
652      ## Fill required fields
653        my %exist;
654        for ($self->field_name_list) {$exist{$_} = 1}
655        &{ $option{hook_stringify_fill_fields} } ($self, \%exist, \%option);
656    my @ret;    my @ret;
657    ## RFC 2774 numerical field name prefix    ## RFC 2774 numerical field name prefix
658    my %nprefix;    my %nprefix;
# Line 661  sub stringify ($;%) { Line 660  sub stringify ($;%) {
660      %nprefix = reverse %{ $self->{ns}->{number2uri} };      %nprefix = reverse %{ $self->{ns}->{number2uri} };
661      my $i = (sort { $a <=> $b } keys %{ $self->{ns}->{number2uri} })[-1] + 1;      my $i = (sort { $a <=> $b } keys %{ $self->{ns}->{number2uri} })[-1] + 1;
662      $i = 10 if $i < 10;      $i = 10 if $i < 10;
663      my $hprefix = ${ &_NS_uri2phpackage      my $hprefix = ${ &_NS_uri2package
664                         ($self->{ns}->{phname2uri}->{'x-http'})                         ($self->{ns}->{phname2uri}->{'x-http'})
665                         .'::OPTION' } {namespace_phname_goodcase};                         .'::OPTION' } {namespace_phname_goodcase};
666      for my $uri (keys %nprefix) {      for my $uri (keys %nprefix) {
# Line 685  sub stringify ($;%) { Line 684  sub stringify ($;%) {
684        return unless length $name;        return unless length $name;
685        return if $option{output_mail_from} && $name eq 'mail-from';        return if $option{output_mail_from} && $name eq 'mail-from';
686        $body = '' if !$option{output_bcc} && $name eq 'bcc';        $body = '' if !$option{output_bcc} && $name eq 'bcc';
687        my $nspackage = &_NS_uri2phpackage ($nsuri);        my $nspackage = &_NS_uri2package ($nsuri);
688        my $oname;        ## Outputed field-name        my $oname;        ## Outputed field-name
689        my $prefix = $nprefix{ $nsuri }        my $prefix = $nprefix{ $nsuri }
690                  || ${$nspackage.'::OPTION'} {namespace_phname_goodcase}                  || ${$nspackage.'::OPTION'} {namespace_phname_goodcase}
691                  || $self->{ns}->{uri2phname}->{ $nsuri };                  || $self->{ns}->{uri2phname}->{ $nsuri };
692        my $default_prefix = ${ &_NS_uri2phpackage ($option{ns_default_phuri})        my $default_prefix = ${ &_NS_uri2package ($option{ns_default_phuri})
693                                .'::OPTION'} {namespace_phname_goodcase};                                .'::OPTION'} {namespace_phname_goodcase};
694        $prefix = '' if $prefix eq $default_prefix;        $prefix = '' if $prefix eq $default_prefix;
695        $prefix =~ s/^\Q$default_prefix\E-//;        $prefix =~ s/^\Q$default_prefix\E-//;
       #$prefix = undef if $nsuri eq $option{ns_default_phuri};  
       #if ($prefix && $prefix eq $nprefix{ $nsuri }) {  ## RFC 2774 prefix  
       #  $prefix = ${ &_NS_uri2phpackage ($self->{ns}->{phname2uri}->{'x-http'})  
       #               .'::OPTION' } {namespace_phname_goodcase} . '-' . $prefix  
       #  unless $option{ns_default_phuri} eq $self->{ns}->{phname2uri}->{'x-http'};  
       #}  
696        my $gc = ${$nspackage.'::OPTION'} {to_be_goodcase};        my $gc = ${$nspackage.'::OPTION'} {to_be_goodcase};
697        if (ref $gc) { $oname = &$gc ($self, $nspackage, $name, \%option) }        if (ref $gc) { $oname = &$gc ($self, $nspackage, $name, \%option) }
698        else { $oname = $name }        else { $oname = $name }
# Line 829  sub _ns_load_ph ($$) { Line 822  sub _ns_load_ph ($$) {
822    my $name = shift;     ## normalized prefix (without HYPHEN-MINUS)    my $name = shift;     ## normalized prefix (without HYPHEN-MINUS)
823    return if $self->{ns}->{phname2uri}->{$name};    return if $self->{ns}->{phname2uri}->{$name};
824    $self->{ns}->{phname2uri}->{$name} = $NS_phname2uri{$name};    $self->{ns}->{phname2uri}->{$name} = $NS_phname2uri{$name};
825    return unless $self->{ns}->{phname2uri}->{$name};    $self->{ns}->{uri2phname}->{ $self->{ns}->{phname2uri}->{$name} } = $name;
   $self->{ns}->{uri2phname}->{$self->{ns}->{phname2uri}->{$name}} = $name;  
826  }  }
827    
828  sub _ns_associate_numerical_prefix ($) {  sub _ns_associate_numerical_prefix ($) {
# Line 865  sub _NS_uri2phpackage ($) { Line 857  sub _NS_uri2phpackage ($) {
857    $NS_uri2phpackage{$_[0]}    $NS_uri2phpackage{$_[0]}
858    || $NS_uri2phpackage{$Message::Header::Default::OPTION{namespace_uri}};    || $NS_uri2phpackage{$Message::Header::Default::OPTION{namespace_uri}};
859  }  }
860    sub _NS_uri2package ($) {
861      $NS_uri2package{$_[0]}
862      || $NS_uri2phpackage{$_[0]}
863      || $NS_uri2phpackage{$Message::Header::Default::OPTION{namespace_uri}};
864    }
865    
866  =head2 $self->clone ()  =head2 $self->clone ()
867    
Legend:
Removed from v.1.31  
changed lines
  Added in v.1.41
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24