/[suikacvs]/test/cvs
Suika

Diff of /test/cvs

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

revision 1.32 by wakaba, Sat Jul 6 11:37:01 2002 UTC revision 1.36 by wakaba, Sat Jul 13 09:34:50 2002 UTC
# Line 41  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 116  sub _init ($;%) { Line 118  sub _init ($;%) {
118        push @new_fields, ($name => $options{$name});        push @new_fields, ($name => $options{$name});
119      }      }
120    }    }
121      &{ $self->{option}->{hook_init_fill_options} } ($self, $self->{option});
122    $self->_init_by_format ($self->{option}->{format}, $self->{option});    $self->_init_by_format ($self->{option}->{format}, $self->{option});
123    # Make alternative representations of @header_order.  This is used    # Make alternative representations of @header_order.  This is used
124    # for sorting.    # for sorting.
# Line 140  sub _init_by_format ($$\%) { Line 143  sub _init_by_format ($$\%) {
143      } else {      } else {
144        $option->{field_sort} = 'good-practice';        $option->{field_sort} = 'good-practice';
145      }      }
146    } else {      ## RFC 822    } elsif ($format =~ /mail|news/) {    ## RFC 822
147      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-rfc822'};      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-rfc822'};
148    }    }
149    if ($format =~ /uri-url-mailto/) {    if ($format =~ /uri-url-mailto/) {
# Line 298  sub _item_match ($$\$\%\%) { Line 301  sub _item_match ($$\$\%\%) {
301      my %o = %$option; #$o{parse} = 0;      my %o = %$option; #$o{parse} = 0;
302      my %l;      my %l;
303      for (keys %$list) {      for (keys %$list) {
304        my ($s, undef, $v) = $self->_value_to_arrayitem ($_, '', %o);        my ($s, undef, $v) = $self->_value_to_arrayitem ($_, '', \%o);
305        if ($s) {        if ($s) {
306          $l{$v->{name} . ':' . ( $option->{ns} || $v->{ns} ) } = 1;          $l{$v->{name} . ':' . ( $option->{ns} || $v->{ns} ) } = 1;
307        } else {        } else {
# Line 467  sub _value_to_arrayitem ($$$\%) { Line 470  sub _value_to_arrayitem ($$$\%) {
470    if (ref $value eq 'ARRAY') {    if (ref $value eq 'ARRAY') {
471      ($value, %$value_option) = @$value;      ($value, %$value_option) = @$value;
472    }    }
473    my $nsuri = $self->{option}->{ns_default_phuri};    my $default_ns = $option->{ns_default_phuri};
474      my $nsuri = $default_ns;
475    $name =~ s/^$REG{WSP}+//;  $name =~ s/$REG{WSP}+$//;    $name =~ s/^$REG{WSP}+//;  $name =~ s/$REG{WSP}+$//;
476        
477    no strict 'refs';    no strict 'refs';
# Line 475  sub _value_to_arrayitem ($$$\%) { Line 479  sub _value_to_arrayitem ($$$\%) {
479      $nsuri = $value_option->{ns};      $nsuri = $value_option->{ns};
480    } elsif ($option->{ns}) {    } elsif ($option->{ns}) {
481      $nsuri = $option->{ns};      $nsuri = $option->{ns};
482    } elsif (($option->{ns_default_phuri} eq $self->{ns}->{uri2phname}->{'x-http'}    } elsif (($default_ns eq $self->{ns}->{uri2phname}->{'x-http'}
483         && $name =~ s/^([0-9]+)-//)         && $name =~ s/^([0-9]+)-//)
484      || ($name =~ s/^x-http-([0-9]+)-//i)) {     ## Numric namespace prefix, RFC 2774      || ($name =~ s/^x-http-([0-9]+)-//i)) {     ## Numric namespace prefix, RFC 2774
485      my $prefix = 0+$1;      my $prefix = 0+$1;
# Line 484  sub _value_to_arrayitem ($$$\%) { Line 488  sub _value_to_arrayitem ($$$\%) {
488        $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;
489        $nsuri = $self->{ns}->{number2uri}->{ $prefix };        $nsuri = $self->{ns}->{number2uri}->{ $prefix };
490      }      }
491    } elsif (($name =~ s/^([Xx]-[A-Za-z]+|[A-YZa-yz][A-Za-z]*)-    } elsif (
492                         ([Xx]-[A-Za-z]+|[A-YZa-yz][A-Za-z]*)-//x)      ${ &_NS_uri2package ($default_ns).'::OPTION' }{use_ph_namespace}
493      || $name =~ s/^([Xx]-[A-Za-z]+|[A-Za-z]+)-//) {      && (
494           ($name =~ s/^([Xx]-[A-Za-z0-9]+|[A-Za-z]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-
495                        ([Xx]-[A-Za-z0-9]+|[A-Za-z0-9]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-//x)
496         || $name =~ s/^([Xx]-[A-Za-z0-9]+|[A-Za-z0-9]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-//
497        )) {
498      my ($prefix1, $prefix2) = ($1, $2);      my ($prefix1, $prefix2) = ($1, $2);
499      my $original_prefix = $&;  my $one_prefix = 0;      my $original_prefix = $&;  my $one_prefix = 0;
500      unless ($prefix2) {      unless ($prefix2) {
501        $prefix2 = $prefix1;        $prefix2 = $prefix1;
502        $prefix1 = $self->{ns}->{uri2phname}->{ $option->{ns_default_phuri} };        $prefix1 = $self->{ns}->{uri2phname}->{ $default_ns };
503        $one_prefix = 1;        $one_prefix = 1;
504      }      }
505      my $prefix      my $prefix
# Line 500  sub _value_to_arrayitem ($$$\%) { Line 508  sub _value_to_arrayitem ($$$\%) {
508      $self->_ns_load_ph ($prefix);      $self->_ns_load_ph ($prefix);
509      $nsuri = $self->{ns}->{phname2uri}->{ $prefix };      $nsuri = $self->{ns}->{phname2uri}->{ $prefix };
510      unless ($nsuri) {      unless ($nsuri) {
511        $nsuri = $self->{option}->{ns_default_phuri};        $nsuri = $default_ns;
512        $prefix        $prefix
513          = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }          = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }
514            ($self, &_NS_uri2package ($nsuri), $one_prefix? $prefix2: $prefix1);            ($self, &_NS_uri2package ($nsuri), $one_prefix? $prefix2: $prefix1);
# Line 510  sub _value_to_arrayitem ($$$\%) { Line 518  sub _value_to_arrayitem ($$$\%) {
518          $name = $prefix2 . '-' . $name unless $one_prefix;          $name = $prefix2 . '-' . $name unless $one_prefix;
519        } else {        } else {
520          $name = $original_prefix . $name;          $name = $original_prefix . $name;
521          $nsuri = $self->{option}->{ns_default_phuri};          $nsuri = $default_ns;
522        }        }
523      }      }
524    }    }
525    $name    $name
526      = &{${&_NS_uri2package ($nsuri).'::OPTION'}{n11n_name}}      = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_name} }
527        ($self, &_NS_uri2package ($nsuri), $name);        ($self, &_NS_uri2package ($nsuri), $name);
528    Carp::croak "$name: invalid field-name"    Carp::croak "$name: invalid field-name"
529      if $option->{field_name_validation}      if $option->{field_name_validation}
530        && $name =~ /$REG{$option->{field_name_unsafe_rule}}/;        && $name =~ /$REG{ $option->{field_name_unsafe_rule} }/;
531    $value = $self->_parse_value ($name => $value, ns => $nsuri)    $value = $self->_parse_value ($name => $value, ns => $nsuri)
532      if $$option{parse} || $$option{parse_all};      if $option->{parse} || $option->{parse_all};
533    $$option{parse} = 0;    $option->{parse} = 0;
534    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});
535  }  }
536  *_add_hash_check = \&_value_to_arrayitem;  *_add_hash_check = \&_value_to_arrayitem;
# Line 663  sub stringify ($;%) { Line 671  sub stringify ($;%) {
671    my %params = @_;    my %params = @_;
672    my %option = %{$self->{option}};    my %option = %{$self->{option}};
673    $option{format} = $params{-format} if $params{-format};    $option{format} = $params{-format} if $params{-format};
674    $self->_init_by_format ($option{format}, \%option);    $self->_init_by_format ($option{format}, \%option)
675        if $self->{option}->{format} ne $option{format};
676    for (grep {/^-/} keys %params) {$option{substr ($_, 1)} = $params{$_}}    for (grep {/^-/} keys %params) {$option{substr ($_, 1)} = $params{$_}}
677      ## Fill required fields
678        my %exist;
679        for ($self->field_name_list) {$exist{$_} = 1}
680        &{ $option{hook_stringify_fill_fields} } ($self, \%exist, \%option);
681    my @ret;    my @ret;
682    ## RFC 2774 numerical field name prefix    ## RFC 2774 numerical field name prefix
683    my %nprefix;    my %nprefix;
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.36
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24