/[suikacvs]/test/cvs
Suika

Diff of /test/cvs

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

revision 1.26 by wakaba, Sun Jun 16 10:45:54 2002 UTC revision 1.39 by wakaba, Fri Jul 26 12:42:00 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 31  push @ISA, qw(Message::Field::Structured Line 32  push @ISA, qw(Message::Field::Structured
32      -_METHODS   => [qw|field field_exist field_type add replace count delete subject id is|],      -_METHODS   => [qw|field field_exist field_type add replace count delete subject id is|],
33      -_MEMBERS   => [qw|value|],      -_MEMBERS   => [qw|value|],
34      -_VALTYPE_DEFAULT   => ':default',      -_VALTYPE_DEFAULT   => ':default',
35      -by => 'name',      ## (Reserved for method level option)      -by => 'name',
36      -field_format_pattern       => '%s: %s',      -field_format_pattern       => '%s: %s',
37      -field_name_case_sensible   => 0,      -field_name_case_sensible   => 0,
38      -field_name_unsafe_rule     => 'NON_ftext',      -field_name_unsafe_rule     => 'NON_ftext',
39      -field_name_validation      => 1,   ## Method level option.      -field_name_validation      => 0,
40      -field_sort => 0,      -field_sort => 0,
41      #-format    => 'mail-rfc2822',      -format     => 'mail-rfc2822',
42      -linebreak_strict   => 0,   ## Not implemented completely      -header_default_charset     => 'iso-2022-int-1',
43        -header_default_charset_input       => 'iso-2022-int-1',
44        -hook_init_fill_options     => sub {},
45        -hook_stringify_fill_fields => sub {},
46        -linebreak_strict   => 0,
47      -line_length_max    => 60,  ## For folding      -line_length_max    => 60,  ## For folding
48      #ns_default_phuri      #ns_default_phuri
49      -output_bcc => 0,      -output_bcc => 0,
50      -output_folding     => 1,      -output_folding     => 1,
51      -output_mail_from   => 0,      -output_mail_from   => 0,
52      #-parse_all => 0,      #parse_all
53      -translate_underscore       => 1,      -translate_underscore       => 1,
54      #-uri_mailto_safe      #uri_mailto_safe
55      -uri_mailto_safe_level      => 4,      -uri_mailto_safe_level      => 4,
56      -use_folding        => 1,      -use_folding        => 1,
57      #-value_type      #value_type
 );  
   
 $DEFAULT{-value_type} = {  
         ':default'      => ['Message::Field::Unstructured'],  
           
         p3p     => ['Message::Field::Params'],  
         link    => ['Message::Field::ValueParams'],  
           
         'user-agent'    => ['Message::Field::UA'],  
         server  => ['Message::Field::UA'],  
 };  
 for (qw(date expires))  
   {$DEFAULT{-value_type}->{$_} = ['Message::Field::Date']}  
 for (qw(accept accept-charset accept-encoding accept-language uri))  
   {$DEFAULT{-value_type}->{$_} = ['Message::Field::CSV']}  
 for (qw(location referer))  
   {$DEFAULT{-value_type}->{$_} = ['Message::Field::URI']}  
   
 my %header_goodcase = (  
         'article-i.d.'  => 'Article-I.D.',  
         etag    => 'ETag',  
         'pics-label'    => 'PICS-Label',  
         te      => 'TE',  
         url     => 'URL',  
         'www-authenticate'      => 'WWW-Authenticate',  
58  );  );
59    
60  ## taken from L<HTTP::Header>  ## taken from L<HTTP::Header>
# Line 122  sub _init ($;%) { Line 102  sub _init ($;%) {
102    $self->SUPER::_init (%$DEFAULT, %options);    $self->SUPER::_init (%$DEFAULT, %options);
103    $self->{value} = [];    $self->{value} = [];
104    $self->_ns_load_ph ('default');    $self->_ns_load_ph ('default');
105    $self->_ns_load_ph ('rfc822');    $self->_ns_load_ph ('x-rfc822');
106    $self->{option}->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'rfc822'}    $self->_ns_load_ph ('x-http');
107      $self->{option}->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-rfc822'}
108      unless $self->{option}->{ns_default_phuri};      unless $self->{option}->{ns_default_phuri};
109        
110      ## For text/rfc822-headers
111      if (ref $options{entity_header}) {
112        $self->{entity_header} = $options{entity_header};
113        delete $options{entity_header};
114      }
115    my @new_fields = ();    my @new_fields = ();
116    for my $name (keys %options) {    for my $name (keys %options) {
117      unless (substr ($name, 0, 1) eq '-') {      unless (substr ($name, 0, 1) eq '-') {
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 147  sub _init ($;%) { Line 134  sub _init ($;%) {
134  sub _init_by_format ($$\%) {  sub _init_by_format ($$\%) {
135    my $self = shift;    my $self = shift;
136    my ($format, $option) = @_;    my ($format, $option) = @_;
137    if ($format =~ /cgi/) {    if ($format =~ /http/) {
138      unshift @header_order, qw(content-type location);      $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-http'};
139      $option->{field_sort} = 'good-practice';      if ($format =~ /cgi/) {
140      $option->{use_folding} = 0;        unshift @header_order, qw(content-type location);
141    } elsif ($format =~ /http/) {        $option->{field_sort} = 'good-practice';
142      $option->{field_sort} = 'good-practice';        $option->{use_folding} = 0;
143        } else {
144          $option->{field_sort} = 'good-practice';
145        }
146      } elsif ($format =~ /mail|news|mime/) {       ## RFC 822
147        $option->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'x-rfc822'};
148    }    }
149    if ($format =~ /uri-url-mailto/) {    if ($format =~ /uri-url-mailto/) {
150      $option->{output_bcc} = 0;      $option->{output_bcc} = 0;
# Line 194  sub parse ($$;%) { Line 186  sub parse ($$;%) {
186    my $class = shift;    my $class = shift;
187    my $header = shift;    my $header = shift;
188    my $self = bless {}, $class;    my $self = bless {}, $class;
189    $self->_init (@_);    ## BUG: don't check linebreak_strict    $self->_init (@_);
190    $header =~ s/\x0D?\x0A$REG{WSP}/\x20/gos if $self->{option}->{use_folding};    if ($self->{option}->{linebreak_strict}) {
191        $header =~ s/\x0D\x0A$REG{WSP}/\x20/gos if $self->{option}->{use_folding};
192      } else {
193        $header =~ s/\x0D?\x0A$REG{WSP}/\x20/gos if $self->{option}->{use_folding};
194      }
195      my %option = (%{ $self->{option} });
196      $option{parse_all} = 0;
197    for my $field (split /\x0D?\x0A/, $header) {    for my $field (split /\x0D?\x0A/, $header) {
198      if ($field =~ /$REG{M_fromline}/) {      if ($field =~ /$REG{M_fromline}/) {
199        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
200          ('mail-from' => $1, $self->{option});          ('mail-from' => $1, \%option);
201        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
202      } elsif ($field =~ /$REG{M_field}/) {      } elsif ($field =~ /$REG{M_field}/) {
203        my ($name, $body) = ($1, $2);        my ($name, $body) = ($1, $2);
204        $body =~ s/$REG{WSP}+$//;        $body =~ s/$REG{WSP}+$//;
205        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
206          ($name => $body, $self->{option});          ($name => $body, \%option);
207        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
208      } elsif (length $field) {      } elsif (length $field) {
209        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
210          ('x-unknown' => $field, $self->{option});          ('x-unknown' => $field, \%option);
211        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
212      }      }
213    }    }
214      $self->_ns_associate_numerical_prefix;        ## RFC 2774 namespace
215      for (@{ $self->{value} }) {
216        no strict 'refs';
217        $_->{name}
218          = &{ ${ &_NS_uri2package ($_->{ns}).'::OPTION' }{n11n_name} }
219          ($self, &_NS_uri2package ($_->{ns}), $_->{name});
220        $_->{body} = $self->_parse_value ($_->{name} => $_->{body}, ns => $_->{ns})
221          if $self->{option}->{parse_all};
222      }
223    $self;    $self;
224  }  }
225    
# Line 265  sub parse_array ($\@;%) { Line 272  sub parse_array ($\@;%) {
272      }      }
273      last if $#$header < 0;      last if $#$header < 0;
274    }    }
275      $self->_ns_associate_numerical_prefix;        ## RFC 2774 namespace
276    $self;    $self;
277  }  }
278    
# Line 290  sub _item_match ($$\$\%\%) { Line 298  sub _item_match ($$\$\%\%) {
298    my ($by, $i, $list, $option) = @_;    my ($by, $i, $list, $option) = @_;
299    return 0 unless ref $$i;  ## Already removed    return 0 unless ref $$i;  ## Already removed
300    if ($by eq 'name') {    if ($by eq 'name') {
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 303  sub _item_match ($$\$\%\%) { Line 311  sub _item_match ($$\$\%\%) {
311      return 1 if $l{$$i->{name} . ':' . $$i->{ns}};      return 1 if $l{$$i->{name} . ':' . $$i->{ns}};
312    } elsif ($by eq 'ns') {    } elsif ($by eq 'ns') {
313      return 1 if $list->{ $$i->{ns} };      return 1 if $list->{ $$i->{ns} };
314      } elsif ($by eq 'http-ns-define') {
315        if ($$i->{ns} eq $self->{ns}->{phname2uri}->{'x-http'}
316         || $$i->{ns} eq $self->{ns}->{phname2uri}->{'x-http-c'}) {
317          my $n = $$i->{name};
318          if ($n eq 'opt' || $n eq 'c-opt' || $n eq 'man' || $n eq 'c-man') {
319            $option->{parse} = 0;
320            $$i->{body} = $self->_parse_value ($$i->{name} => $$i->{body}, ns => $$i->{ns});
321            for my $j (0..$$i->{body}->count-1) {
322              return 1 if $list->{ ($$i->{body}->value ($j))[0]->value };
323            }
324          }
325        }
326    }    }
327    0;    0;
328  }  }
# Line 323  sub _item_return_value ($\$\%) { Line 343  sub _item_return_value ($\$\%) {
343    
344  ## Returns returned (new created) item value    $name, \%option  ## Returns returned (new created) item value    $name, \%option
345  sub _item_new_value ($$\%) {  sub _item_new_value ($$\%) {
346      my ($s,undef,$value) = $_[0]->_value_to_arrayitem    my $self = shift;
347          ($_[1] => '', $_[2]);    my ($name, $option) = @_;
348      if ($option->{by} eq 'http-ns-define') {
349        my $value = $self->_parse_value (opt => '', ns => $self->{ns}->{phname2uri}->{'x-http'});
350        ($value->value (0))[0]->value ($name);
351        {name => 'opt', body => $value, ns => $self->{ns}->{phname2uri}->{'x-http'}};
352      } else {
353        my ($s,undef,$value) = $self->_value_to_arrayitem
354            ($name => '', $option);
355      $s? $value: undef;      $s? $value: undef;
356      }
357  }  }
358    
359    
# Line 337  sub _parse_value ($$$;%) { Line 365  sub _parse_value ($$$;%) {
365    my $value = shift;  return $value if ref $value;    my $value = shift;  return $value if ref $value;
366    my %option = @_;    my %option = @_;
367    my $vtype; { no strict 'refs';    my $vtype; { no strict 'refs';
368      my $vt = ${&_NS_uri2phpackage ($option{ns}).'::OPTION'}{value_type};      my $vt = ${&_NS_uri2package ($option{ns}).'::OPTION'}{value_type};
369      if (ref $vt) {      if (ref $vt) {
370        $vtype = $vt->{$name} || $vt->{$self->{option}->{_VALTYPE_DEFAULT}};        $vtype = $vt->{$name} || $vt->{$self->{option}->{_VALTYPE_DEFAULT}};
371      }      }
# Line 349  sub _parse_value ($$$;%) { Line 377  sub _parse_value ($$$;%) {
377    my %vopt = %{$vtype->[1]} if ref $vtype->[1];    my %vopt = %{$vtype->[1]} if ref $vtype->[1];
378    if ($vpackage eq ':none:') {    if ($vpackage eq ':none:') {
379      return $value;      return $value;
380    } elsif (defined $value) {    } elsif (length $value) {
381      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: $@};
382      return $vpackage->parse ($value,      return $vpackage->parse ($value,
383        -format   => $self->{option}->{format},        -format   => $self->{option}->{format},
384        -field_ns => $option{ns},        -field_ns => $option{ns},
385        -field_name       => $name,        -field_name       => $name,
386        -header_default_charset     => $self->{option}->{header_default_charset},
387        -header_default_charset_input       => $self->{option}->{header_default_charset_input},
388        -internal_charset_name      => $self->{option}->{internal_charset_name},
389        -parse_all        => $self->{option}->{parse_all},        -parse_all        => $self->{option}->{parse_all},
390      %vopt);      %vopt);
391    } else {    } else {
# Line 363  sub _parse_value ($$$;%) { Line 394  sub _parse_value ($$$;%) {
394        -format   => $self->{option}->{format},        -format   => $self->{option}->{format},
395        -field_ns => $option{ns},        -field_ns => $option{ns},
396        -field_name       => $name,        -field_name       => $name,
397        -header_default_charset     => $self->{option}->{header_default_charset},
398        -header_default_charset_input       => $self->{option}->{header_default_charset_input},
399        -internal_charset_name      => $self->{option}->{internal_charset_name},
400        -parse_all        => $self->{option}->{parse_all},        -parse_all        => $self->{option}->{parse_all},
401      %vopt);      %vopt);
402    }    }
403  }  }
404    
405    ## Defined for text/rfc822-headers
406    sub entity_header ($;$) {
407      my $self = shift;
408      my $new_header = shift;
409      if (ref $new_header) {
410        $self->{header} = $new_header;
411      }
412      $self->{header};
413    }
414    
415  =head2 $self->field_name_list ()  =head2 $self->field_name_list ()
416    
417  Returns list of all C<field-name>s.  (Even if there are two  Returns list of all C<field-name>s.  (Even if there are two
# Line 387  sub namespace_ph_default ($;$) { Line 431  sub namespace_ph_default ($;$) {
431    if (defined $_[0]) {    if (defined $_[0]) {
432      no strict 'refs';      no strict 'refs';
433      $self->{option}->{ns_default_phuri} = $_[0];      $self->{option}->{ns_default_phuri} = $_[0];
434      $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});
435    }    }
436    $self->{option}->{ns_default_phuri};    $self->{option}->{ns_default_phuri};
437  }  }
# Line 428  sub _value_to_arrayitem ($$$\%) { Line 472  sub _value_to_arrayitem ($$$\%) {
472    if (ref $value eq 'ARRAY') {    if (ref $value eq 'ARRAY') {
473      ($value, %$value_option) = @$value;      ($value, %$value_option) = @$value;
474    }    }
475    my $nsuri = $self->{option}->{ns_default_phuri};    my $default_ns = $option->{ns_default_phuri};
476      my $nsuri = $default_ns;
477      $name =~ s/^$REG{WSP}+//;  $name =~ s/$REG{WSP}+$//;
478        
479    no strict 'refs';    no strict 'refs';
480    if ($value_option->{ns}) {    if ($value_option->{ns}) {
481      $nsuri = $value_option->{ns};      $nsuri = $value_option->{ns};
482    } elsif ($option->{ns}) {    } elsif ($option->{ns}) {
483      $nsuri = $option->{ns};      $nsuri = $option->{ns};
484    } elsif ($name =~ s/^([Xx]-[A-Za-z]+|[A-Za-z]+)-//) {    } elsif (($default_ns eq $self->{ns}->{uri2phname}->{'x-http'}
485      my $oprefix = $1;         && $name =~ s/^([0-9]+)-//)
486        || ($name =~ s/^x-http-([0-9]+)-//i)) {     ## Numric namespace prefix, RFC 2774
487        my $prefix = 0+$1;
488        $nsuri = $self->{ns}->{number2uri}->{ $prefix };
489        unless ($nsuri) {
490          $self->{ns}->{number2uri}->{ $prefix } = 'urn:x-suika-fam-cx:msgpm:header:x-temp:'.$prefix;
491          $nsuri = $self->{ns}->{number2uri}->{ $prefix };
492        }
493      } elsif (
494        ${ &_NS_uri2package ($default_ns).'::OPTION' }{use_ph_namespace}
495        && (
496           ($name =~ s/^([Xx]-[A-Za-z0-9]+|[A-Za-z]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-
497                        ([Xx]-[A-Za-z0-9]+|[A-Za-z0-9]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-//x)
498         || $name =~ s/^([Xx]-[A-Za-z0-9]+|[A-Za-z0-9]*[A-WYZa-wyz0-9][A-Za-z0-9]*)-//
499        )) {
500        my ($prefix1, $prefix2) = ($1, $2);
501        my $original_prefix = $&;  my $one_prefix = 0;
502        unless ($prefix2) {
503          $prefix2 = $prefix1;
504          $prefix1 = $self->{ns}->{uri2phname}->{ $default_ns };
505          $one_prefix = 1;
506        }
507      my $prefix      my $prefix
508        = &{${&_NS_uri2phpackage ($nsuri).'::OPTION'}{n11n_prefix}}        = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }
509          ($self, &_NS_uri2phpackage ($nsuri), $oprefix);          ($self, &_NS_uri2package ($nsuri), $prefix1.'-'.$prefix2);
510      $self->_ns_load_ph ($prefix);      $self->_ns_load_ph ($prefix);
511      $nsuri = $self->{ns}->{phname2uri}->{$prefix};      $nsuri = $self->{ns}->{phname2uri}->{ $prefix };
512      unless ($nsuri) {      unless ($nsuri) {
513        $name = $oprefix . '-' . $name;        $nsuri = $default_ns;
514        $nsuri = $self->{option}->{ns_default_phuri};        $prefix
515            = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_prefix} }
516              ($self, &_NS_uri2package ($nsuri), $one_prefix? $prefix2: $prefix1);
517          $self->_ns_load_ph ($prefix);
518          $nsuri = $self->{ns}->{phname2uri}->{ $prefix };
519          if ($nsuri) {
520            $name = $prefix2 . '-' . $name unless $one_prefix;
521          } else {
522            $name = $original_prefix . $name;
523            $nsuri = $default_ns;
524          }
525      }      }
526    }    }
527    $name    $name
528      = &{${&_NS_uri2phpackage ($nsuri).'::OPTION'}{n11n_name}}      = &{ ${ &_NS_uri2package ($nsuri).'::OPTION' }{n11n_name} }
529        ($self, &_NS_uri2phpackage ($nsuri), $name);        ($self, &_NS_uri2package ($nsuri), $name);
530    Carp::croak "$name: invalid field-name"    Carp::croak "$name: invalid field-name"
531      if $option->{field_name_validation}      if $option->{field_name_validation}
532        && $name =~ /$REG{$option->{field_name_unsafe_rule}}/;        && $name =~ /$REG{ $option->{field_name_unsafe_rule} }/;
533    $value = $self->_parse_value ($name => $value, ns => $nsuri)    $value = $self->_parse_value ($name => $value, ns => $nsuri)
534      if $$option{parse} || $$option{parse_all};      if $option->{parse} || $option->{parse_all};
535    $$option{parse} = 0;    $option->{parse} = 0;
536    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});
537  }  }
538  *_add_hash_check = \&_value_to_arrayitem;  *_add_hash_check = \&_value_to_arrayitem;
# Line 562  sub _scan_sort ($\@\%) { Line 639  sub _scan_sort ($\@\%) {
639  }  }
640    
641  sub _n11n_field_name ($$) {  sub _n11n_field_name ($$) {
642      no strict 'refs';
643    my $self = shift;    my $self = shift;
644    my $s = shift;    my $s = shift;
645    $s =~ s/^$REG{WSP}+//; $s =~ s/$REG{WSP}+$//;    $s =~ s/^$REG{WSP}+//; $s =~ s/$REG{WSP}+$//;
646    $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};
647    $s;    $s;
648  }  }
649    
# Line 595  sub stringify ($;%) { Line 673  sub stringify ($;%) {
673    my %params = @_;    my %params = @_;
674    my %option = %{$self->{option}};    my %option = %{$self->{option}};
675    $option{format} = $params{-format} if $params{-format};    $option{format} = $params{-format} if $params{-format};
676    $self->_init_by_format ($option{format}, \%option);    $self->_init_by_format ($option{format}, \%option)
677        if $self->{option}->{format} ne $option{format};
678    for (grep {/^-/} keys %params) {$option{substr ($_, 1)} = $params{$_}}    for (grep {/^-/} keys %params) {$option{substr ($_, 1)} = $params{$_}}
679      ## Fill required fields
680        my %exist;
681        for ($self->field_name_list) {$exist{$_} = 1}
682        &{ $option{hook_stringify_fill_fields} } ($self, \%exist, \%option);
683    my @ret;    my @ret;
684      ## RFC 2774 numerical field name prefix
685      my %nprefix;
686      {no strict 'refs';
687        %nprefix = reverse %{ $self->{ns}->{number2uri} };
688        my $i = (sort { $a <=> $b } keys %{ $self->{ns}->{number2uri} })[-1] + 1;
689        $i = 10 if $i < 10;
690        my $hprefix = ${ &_NS_uri2package
691                           ($self->{ns}->{phname2uri}->{'x-http'})
692                           .'::OPTION' } {namespace_phname_goodcase};
693        for my $uri (keys %nprefix) {
694          if ($nprefix{ $uri } < 10) {
695            $nprefix{ $uri } = $i++;
696          }
697          my $nsfs = $self->item ($uri, -by => 'http-ns-define');
698          for my $i (0..$nsfs->count-1) {
699            my $nsf = ($nsfs->value ($i))[0];
700            if ($nsf->value eq $uri) {
701              $nsf->replace (ns => $nprefix{ $uri });
702              $nprefix{ $uri } = $hprefix . '-' . $nprefix{ $uri };
703              last;
704            }
705          }
706        }
707      }
708    my $_stringify = sub {    my $_stringify = sub {
709      no strict 'refs';      no strict 'refs';
710        my ($name, $body, $nsuri) = ($_[1]->{name}, $_[1]->{body}, $_[1]->{ns});        my ($name, $body, $nsuri) = ($_[1]->{name}, $_[1]->{body}, $_[1]->{ns});
711        return unless length $name;        return unless length $name;
712        return if $option{output_mail_from} && $name eq 'mail-from';        return if $option{output_mail_from} && $name eq 'mail-from';
713        return if !$option{output_bcc} && ($name eq 'bcc' || $name eq 'resent-bcc');        $body = '' if !$option{output_bcc} && $name eq 'bcc';
714        my $nspackage = &_NS_uri2phpackage ($nsuri);        my $nspackage = &_NS_uri2package ($nsuri);
715        my $oname;        ## Outputed field-name        my $oname;        ## Outputed field-name
716        my $prefix = ${$nspackage.'::OPTION'} {namespace_phname_goodcase}        my $prefix = $nprefix{ $nsuri }
717                  || $self->{ns}->{uri2phname}->{$nsuri};                  || ${$nspackage.'::OPTION'} {namespace_phname_goodcase}
718        $prefix = undef if $nsuri eq $self->{option}->{ns_default_phuri};                  || $self->{ns}->{uri2phname}->{ $nsuri };
719          my $default_prefix = ${ &_NS_uri2package ($option{ns_default_phuri})
720                                  .'::OPTION'} {namespace_phname_goodcase};
721          $prefix = '' if $prefix eq $default_prefix;
722          $prefix =~ s/^\Q$default_prefix\E-//;
723        my $gc = ${$nspackage.'::OPTION'} {to_be_goodcase};        my $gc = ${$nspackage.'::OPTION'} {to_be_goodcase};
724        if (ref $gc) { $oname = &$gc ($self, $nspackage, $name, \%option) }        if (ref $gc) { $oname = &$gc ($self, $nspackage, $name, \%option) }
725        else { $oname = $name }        else { $oname = $name }
# Line 633  sub stringify ($;%) { Line 744  sub stringify ($;%) {
744        } else {        } else {
745          $fbody = $body;          $fbody = $body;
746        }        }
747        return unless length $fbody;        unless (${$nspackage.'::OPTION'} {field}->{$name}->{empty_body}) {
748            return unless length $fbody;
749          }
750        unless ($option{linebreak_strict}) {        unless ($option{linebreak_strict}) {
751          ## bare \x0D and bare \x0A are unsafe          ## bare \x0D and bare \x0A are unsafe
752          $fbody =~ s/\x0D(?=[^\x09\x0A\x20])/\x0D\x20/g;          $fbody =~ s/\x0D(?=[^\x09\x0A\x20])/\x0D\x20/g;
# Line 719  sub _fold ($$;%) { Line 832  sub _fold ($$;%) {
832    $max = 20 if $max < 20;    $max = 20 if $max < 20;
833        
834    my $l = $option{-initial_length} || 0;    my $l = $option{-initial_length} || 0;
835    $string =~ s{((?:^|[\x09\x20])[^\x09\x20]+)}{    $l += length $1 if $string =~ /^([^\x09\x20]+)/;
836      $string =~ s{([\x09\x20][^\x09\x20]+)}{
837      my $s = $1;      my $s = $1;
838      if ($l + length $s > $max) {      if (($l + length $s) > $max) {
839        $s = "\x0D\x0A\x20" . $s;        $s = "\x0D\x0A\x20" . $s;
840        $l = length ($s) - 2;        $l = 1 + length $s;
841      } else { $l += length $s }      } else { $l += length $s }
842      $s;      $s;
843    }gex;    }gex;
# Line 739  sub _ns_load_ph ($$) { Line 853  sub _ns_load_ph ($$) {
853    $self->{ns}->{uri2phname}->{$self->{ns}->{phname2uri}->{$name}} = $name;    $self->{ns}->{uri2phname}->{$self->{ns}->{phname2uri}->{$name}} = $name;
854  }  }
855    
856    sub _ns_associate_numerical_prefix ($) {
857      my $self = shift;
858      $self->scan (sub {shift;
859        my $f = shift;  return unless $f->{name};
860        if ($f->{ns} eq $self->{ns}->{phname2uri}->{'x-http'}
861         || $f->{ns} eq $self->{ns}->{phname2uri}->{'x-http-c'}) {
862          my $fn = $f->{name};
863          if ($fn eq 'opt' || $fn eq 'man') {
864            $f->{body} = $self->_parse_value ($fn => $f->{body}, ns => $f->{ns});
865            for ($f->{body}->value (0..$f->{body}->count-1)) {
866              my ($nsuri, $number) = ($_->value, $_->item ('ns'));
867              if ($number && $nsuri) {
868                $self->{ns}->{number2uri}->{ $number } = $nsuri;
869              }
870            }
871          }
872        }
873      });
874      $self->scan (sub {shift;
875        my $f = shift;
876        if ($f->{ns} =~ /urn:x-suika-fam-cx:msgpm:header:x-temp:([0-9]+)$/ && $self->{ns}->{number2uri}->{ $1 }) {
877          $f->{ns} = $self->{ns}->{number2uri}->{ $1 };
878        }
879      });
880    }
881    
882    ## $package_name = Message::Header::_NS_uri2phpackage ($nsuri)
883    ## (For internal use of Message::* modules)
884  sub _NS_uri2phpackage ($) {  sub _NS_uri2phpackage ($) {
885    $NS_uri2phpackage{$_[0]}    $NS_uri2phpackage{$_[0]}
886    || $NS_uri2phpackage{$Message::Header::Default::OPTION{namespace_uri}};    || $NS_uri2phpackage{$Message::Header::Default::OPTION{namespace_uri}};
887  }  }
888    sub _NS_uri2package ($) {
889      $NS_uri2package{$_[0]}
890      || $NS_uri2phpackage{$_[0]}
891      || $NS_uri2phpackage{$Message::Header::Default::OPTION{namespace_uri}};
892    }
893    
894  =head2 $self->clone ()  =head2 $self->clone ()
895    
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.39
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24