/[pub]/suikawiki/script/lib/suikawiki.pl

Diff of /suikawiki/script/lib/suikawiki.pl

Parent Directory | Revision Log | View Patch Patch

-revision 1.2 by wakaba,
Thu Mar 27 07:18:51 2003 UTC
+revision 1.3 by wakaba,
Thu Apr  3 01:09:07 2003 UTC
 Line 2
  use strict;
  package main;
+ our $VERSION = '2.'.do{my @r=(q$Revision$=~/\d+/g);sprintf "%d."."%02d" x $#r,@r};
  binmode STDOUT; binmode STDIN;
- require Yuki::YukiWikiCache;
  use Fcntl;
+ require Yuki::YukiWikiCache;
+ require SuikaWiki::Name::Space;
+ require SuikaWiki::View;
  require SuikaWiki::Plugin;
  our %fmt;       ## formatter objects
  our %embed_command = (
-         searched        => '^\[\[#searched:([^\]]+)\]\]$',
+         searched        => '^\[\[#searched:([^\]]+)\]\]$',      ## Deprecated
          form    => qr/\[\[\#form(?:\(([A-Za-z0-9-]+)\))?:'((?:[^'\\]|\\.)*)':'((?:[^'\\]|\\.)*)'(?::'((?:[^'\\]|\\.)*)')?\]\]/,
  );
  our ($modifier_dbtype,$url_cgi,%uri,%PathTo);
- our (%PageName,$kanjicode,$lang,%ViewDefinition);
+ our (%PageName,$kanjicode,$lang);
  my %form;
  our %database;
-Line 67 
 sub do_view {
+Line 70 
 sub do_view {
    my $o = bless {param => \%form, page => $form{mypage}, toc => [],
                   magic => $magic, content => $content,
                   formatter => $fmt{view}, &_compatible_options ()}, 'SuikaWiki::Plugin';
-   if (!ref $ViewDefinition{$view} || !&{$ViewDefinition{$view}->{check}} ($o)) {
+   my $view_def = SuikaWiki::View->definition ($view);
+   if (!$view_def->check ($o)) {
      print "Status: 406 Unsupported Media Type\n";
      $view = '-UnsupportedMediaType';
+     $view_def = SuikaWiki::View->definition ($view);
    }
-   my $media = $ViewDefinition{$view}->{media};
+   my $media = $view_def->properties->{media};
-   if ($ViewDefinition{$view}->{xmedia} && $UA =~ /Gecko/) {
+   if ($view_def->properties->{xmedia} && $UA =~ /Gecko/) {
-     $media = $ViewDefinition{$view}->{xmedia};
+     $media = $view_def->properties->{xmedia};
      $o->{media} = $media;
    } elsif ($UA =~ m#Mozilla/0\..+Windows#) {
      $kanjicode = 'shift_jis';
-Line 87 
 sub do_view {
+Line 92 
 sub do_view {
                                     -magic => $magic, -last_modified => $lm, o => $o);
      }
    if ($kanjicode ne 'euc') {
-     my $s = $fmt{view}->replace ($ViewDefinition{$view}->{template} => $o);
+     my $s = $fmt{view}->replace ($view_def->as_string => $o, {formatter => $fmt{view}});
      print &code_convert (\$s => $kanjicode);
    } else {
-     print $fmt{view}->replace ($ViewDefinition{$view}->{template} => $o);
+     print $fmt{view}->replace ($view_def->as_string => $o, {formatter => $fmt{view}});
    }
  }
-Line 99 
 sub _do_view_msg (%) {
+Line 104 
 sub _do_view_msg (%) {
    &load_formatter ('view');
    my $o = bless {param => \%form, page => $option{-page}, toc => [], condition => \%option,
                   formatter => $fmt{view}, &_compatible_options ()}, 'SuikaWiki::Plugin';
-   unless (&{$ViewDefinition{$option{-view}}->{check}} ($o)) {
+   my $view_def = SuikaWiki::View->definition ($option{-view});
+   unless ($view_def->check ($o)) {
      print "Status: 406 Unsupported Media Type\n";
      $option{-view} = '-UnsupportedMediaType';
+     $view_def = SuikaWiki::View->definition ($option{-view});
    }
-   my $media = $ViewDefinition{$option{-view}}->{media};
+   my $media = $view_def->properties->{media};
-   if ($ViewDefinition{$option{-view}}->{xmedia} && $UA =~ /Gecko/) {
+   if ($view_def->properties->{xmedia} && $UA =~ /Gecko/) {
-     $media = $ViewDefinition{$option{-view}}->{xmedia};
+     $media = $view_def->properties->{xmedia};
      $o->{media} = $media;
    }
    &print_header($option{-page}, -media => $media, o => $o, -goto => $option{-goto});
-   print $fmt{view}->replace ($ViewDefinition{$option{-view}}->{template} => $o);
+   print $fmt{view}->replace ($view_def->as_string => $o, {formatter => $fmt{view}});
  }
  sub id_and_name ($) {
-Line 497 
 sub make_wikilink ($%) {
+Line 504 
 sub make_wikilink ($%) {
    $option{latest} = $option{latest} ? qq(mycmd=default;x-param=@{[time.[0..9]->[rand 10]]};mypage=) : '';
    ## Namespace
-   if ($wiki::page::ns::delimiter && ($name =~ m#\Q$wiki::page::ns::delimiter\E#
+   #if ($SuikaWiki::Name::Space::VERSION) {
-                                   || $name eq $wiki::page::ns::parent
+     $name = SuikaWiki::Name::Space::normalize_name (    ## Foo// + .//Bar -> Foo////Bar
-                                   || $name eq $wiki::page::ns::self)) {
+               SuikaWiki::Name::Space::resolve_relative_name (
-     my @name = split m#\Q$wiki::page::ns::delimiter\E#, $name;
+                 SuikaWiki::Name::Space::normalize_name ($option{base}, -might_be_ns_path => 1)
-     my @base = split m#\Q$wiki::page::ns::delimiter\E#, $option{base};
+                   =>
-     if ($name[0] eq $wiki::page::ns::self) {    ## .//Foo//Bar
+                 SuikaWiki::Name::Space::normalize_name ($name)));
-       @name = (@base, @name[1..$#name]);
+   #}
-     } elsif ($name[0] eq $wiki::page::ns::parent) {     ## ..//Foo//Bar
-       @base = grep {$_} @base; $#base--;
-       @name = (@base, @name[1..$#name]);
-     }
-     $name = join $wiki::page::ns::delimiter, grep {$_} @name;
-   }
    $name ||= $PageName{FrontPage};
    if ($database{$name}) {
-Line 632 
 sub init_form {
+Line 633 
 sub init_form {
      }
      $form{mypage} ||= $PageName{FrontPage};
      $form{mypage} =~ tr/\x00-\x1F\x7F//d;
+     $form{mypage} = SuikaWiki::Name::Space::normalize_name ($form{mypage});
      $form{mycmd} ||= 'default';
      # mypreview_edit        -> do_edit, with preview.
-Line 648 
 sub init_form {
+Line 650 
 sub init_form {
      # $form{mycmd} is frozen here.
      #
-     for (grep /^wikiform__/, keys %form) {
+     for (grep /^(?:wikiform__|pi_)/, keys %form) {
          $form{$_} = &code_convert (\$form{$_}, $kanjicode);
      }
      $form{mymsg} = &code_convert(\$form{mymsg}, $kanjicode);
-Line 756 
 EOD
+Line 758 
 EOD
  sub is_editable {
      my ($page) = @_;
-     if ($page =~ /[\x00-\x20\x7F]/) {
+     if ($page =~ /[\x00-\x20\[\]\x7F]/) {
        return 0;
      } elsif ($wiki::page::ns::delimiter) {      ## Use namespace
        if ($page eq $wiki::page::ns::delimiter
-Line 1167 
 sub __get_datetime ($) { main::get_now (
+Line 1169 
 sub __get_datetime ($) { main::get_now (
  sub resource ($$;%) { shift; &main::Resource (@_) }
  sub uri ($$) { $main::uri{$_[1]} }
  sub user_agent_names ($) { $main::UA }
  sub formatter ($$) {
    &main::load_formatter ($_[1]);
    $main::fmt{$_[1]};
-Line 1176 
 sub format_converter ($$$) {
+Line 1179 
 sub format_converter ($$$) {
    $main::fmt{format}->{($_[1]=~/([A-Za-z0-9]\S+)/?$1:'SuikaWiki/0.9').'_to_'.$_[2]}
    || $main::fmt{format}->{($_[1]=~/([A-Za-z0-9](?:(?!\/)\S)+)/?$1:'SuikaWiki').'_to_'.$_[2]};
  }
+ sub formatter_replace_if_not_parsed_yet ($$$$) {
+   my ($o, $context, $p, $attr_name) = @_;
+   &main::load_formatter ($context);
+   index ($p->{-option}->{$attr_name}, 'p') > -1 ?
+     $p->{$attr_name}    ## Already parsed
+     :
+     $main::fmt{$context}->replace ($p->{$attr_name}, $o, {formatter => $main::fmt{$context}})
+   ;
+ }
  sub cache ($$) {
    our %Cache;
    my (undef, $name, %option) = @_;
-Line 1238 
 sub get ($;\%) {
+Line 1251 
 sub get ($;\%) {
    for my $lang (sort {$option->{accept_language}->{$b} <=> $option->{accept_language}->{$a}} grep {$option->{accept_language}->{$_}!=0} keys %{$option->{accept_language}}) {
      while (length $lang) {
        unless ($option->{accept_language}->{defined $option->{accept_language}->{$lang} ? $lang : '*'} == 0) {
-         $option->{resource}->{$lang} ||= &wiki::suikawikiconst::to_hash ($main::database{'WikiResource:'.$lang});
+         $option->{resource}->{$lang} ||= &wiki::suikawikiconst::to_hash ($main::database{$main::PageName{ResourceNS}.$lang});
          $v = $option->{resource}->{$lang}->{$resname};
          last if defined $v;
        }

 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.3
 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.3
-Removed from v.1.2
+Added in v.1.3

admin@suikawiki.org	ViewVC Help
Powered by ViewVC 1.1.24