/[pub]/suikawiki/script/wiki.cgi

Diff of /suikawiki/script/wiki.cgi

Parent Directory | Revision Log | View Patch Patch

-revision 1.41 by wakaba,
Wed Dec 25 02:04:11 2002 UTC
+revision 1.51 by w,
Sun Jan 26 02:30:24 2003 UTC
 Line 1
  #!/usr/bin/perl
- # wiki.cgi - This is YukiWiki, yet another Wiki clone.
+ ## wiki.cgi - This is SuikaWiki, yet another WikiEngine
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the same terms as Perl itself.
  use strict;
- use lib qw(./WalWiki/lib);
+ use lib qw(./lib);
  use CGI::Carp qw(fatalsToBrowser);
- use Yuki::DiffText qw(difftext);
+ binmode STDOUT; binmode STDIN;
+ our $VERSION = do{my @r=(q$Revision$=~/\d+/g);sprintf "%d."."%02d" x $#r,@r};
+ require 'wikidata/suikawiki-config.ph'; ## site configuration script
+ require Yuki::YukiWikiCache;
  use Fcntl;
- #
+ our %fmt;       ## formatter objects
- # You MUST modify following '$modifier_...' variables.
+ our %embed_command = (
- #
- # my $modifier_dbtype = 'AnyDBM_File';  # Fast, not available on some server, page size limited.
- # my $modifier_dbtype = 'dbmopen';      # Fast, not available on some server, page size limited.
- my $modifier_dbtype = 'YukiWikiDB';     # Slow, available on all environment.
- my $modifier_dir_data = './wikidata'; # Your data directory.
- our $url_cgi = '/~wakaba/-temp/wiki/wiki';      ## MUST be started by '/'
- ##############################
- #
- # You MAY modify following variables.
- #
- $SuikaWiki::Plugin::plugin_directory = q(./SuikaWiki/Plugin/);
- my $file_touch = "$modifier_dir_data/touched.txt";
- our %uri;
- $uri{stylesheet} = $url_cgi.'?mycmd=TEXT_CSS;mypage=WikiHTMLStyle';
- $uri{cvs_wikipage} = '/gate/cvs/wakaba/suikawiki/wiki/';
- ##############################
- #
- # You MAY, but do NOT NEED modify following variables.
- #
- my $dataname = "$modifier_dir_data/wiki";
- my $infoname = "$modifier_dir_data/info";
- my $diffname = "$modifier_dir_data/diff";
- my $use_exists = 0; # If you can use 'exists' method for your DB.
- ##############################
- my $FrontPage = 'HomePage';
- my $IndexPage = 'IndexPage';
- my $SearchPage = 'SearchPage';
- my $CreatePage = 'CreatePage';
- my $ErrorPage = 'ErrorPage';
- my $RssPage = 'RssPage';
- my $AdminSpecialPage = 'Admin Special Page'; # must include spaces.
- ##############################
- my %fmt;        ## formatter objects
- my %embed_command = (
          searched        => '^\[\[#searched:([^\]]+)\]\]$',
-         form    => qw/\[\[\#form(?:\(([A-Za-z0-9-]+)\))?:'((?:[^'\\]|\\.)*)':'((?:[^'\\]|\\.)*)'(?::'((?:[^'\\]|\\.)*)')?\]\]/,
+         form    => qr/\[\[\#form(?:\(([A-Za-z0-9-]+)\))?:'((?:[^'\\]|\\.)*)':'((?:[^'\\]|\\.)*)'(?::'((?:[^'\\]|\\.)*)')?\]\]/,
- );
- ##############################
- my $info_LastModified = 'LastModified';
- my $info_IsFrozen = 'IsFrozen';
- ##############################
- my $kanjicode = 'euc';
- my $lang = 'ja';
- my %fixedpage = (
-     $IndexPage => 1,
-     $CreatePage => 1,
-     $ErrorPage => 1,
-     $RssPage => 1,
-     RecentChanges => 1,
-     $SearchPage => 1,
-     AdminChangePassword => 1,
-     CompletedSuccessfully => 1,
-     WikiUserAgentList => 1,
-     WikiPluginInfo    => 1,
  );
+ our ($modifier_dbtype,$url_cgi,%uri,%PathTo);
+ our (%PageName,$kanjicode,$lang,%ViewDefinition);
  my %form;
- my %database;
+ our %database;
- my %infobase;
+ our $database = bless {}, 'wiki::dummy';
- my %diffbase;
  my %interwiki;
- ##############################
- my %page_command = (
-     $IndexPage => 'index',
-     $SearchPage => 'searchform',
-     $CreatePage => 'create',
-     $RssPage => 'rss',
-     AdminChangePassword => 'adminchangepasswordform',
-     WikiPluginInfo       => 'x_WikiPluginInfo',
- );
  my %command_do = (
-     read => \&do_read,
+     default => \&do_view,
-     TEXT_CSS => \&do_output_css,
-     edit => \&do_edit,
-     adminedit => \&do_adminedit,
-     adminchangepasswordform => \&do_adminchangepasswordform,
      adminchangepassword => \&do_adminchangepassword,
      write => \&do_write,
-     index => \&do_index,
      searchform => \&do_searchform,
-     search => \&do_search,
-     create => \&do_create,
-     createresult => \&do_createresult,
      comment => \&do_comment,
      RandomJump  => \&do_random_jump,
-     rss => \&do_rss,
-     diff => \&do_diff,
      wikiform    => \&do_wikiform,
-     x_WikiPluginInfo    => \&do_wikiplugininfo,
-     map => \&do_map,
  );
- my $UA = '';  ## User agent name
+ our $UA = '';  ## User agent name
  $| = 1;
- ##############################
  sub main {
      $UA = $main::ENV{HTTP_USER_AGENT};
-Line 112 
 sub main {
+Line 40 
 sub main {
      if ($command_do{$form{mycmd}}) {
          &{$command_do{$form{mycmd}}};
      } else {
-         &{$command_do{$form{read}}};
+         &{$command_do{default}};
      }
      &close_db;
  }
- sub do_read {
+ sub do_view {
    my $content = $database{$form{mypage}};
-   #print "content-type:text/plain;charset=euc-jp\n\n".gmtime."Get Lastmodified\n";
+   my $lm = $database->mtime ($form{mypage});
-   my $lm = &get_info($form{mypage}, $info_LastModified);
    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
    wiki::useragent::add ($ENV{HTTP_USER_AGENT});
-   #print gmtime."Search...\n";
+   &load_formatter ('view');
-   my ($r, $c) = get_search_result ($form{mypage});
+     my $view = $form{mycmd};
-   my $rl = wiki::referer::list_html ($form{mypage});
+     if ($view eq 'edit') {
-   my @toc;
+       $view = 'adminedit' if $form{admin};
-   push @toc, qq(-<a href="#wikipage-see-also">@{[&Resource('SeeAlso',escape=>1)]}</a>) if $c;
+     } elsif ($view =~ /[^0-9A-Za-z]/) {
-   push @toc, qq(-<a href="#wikipage-referer">@{[&Resource('Referers',escape=>1)]}</a>) if $rl;
+       $view = 'default'
-     my $cf = 'SuikaWiki/0.9';
+     }
-     ## Should be support at least:
+     if ($view eq 'default' || !$view) {
-     ## - 'SuikaWiki/0.9' CRLF
+       ## BUG: this code is not strict
-     ## - 'H2H/' ("0.9" / "1.0" / "1.1") CRLF
+       if ($main::ENV{HTTP_COOKIE} =~ /SelectedMode=([0-9A-Za-z]+)/) {
-     ## - "/*" WSP* 'W3C-CSS/' ("1.0" / "2.0") "*/" CRLF
+         $view = $1;
-     $cf = $1 if $content =~ s#^(?:/\*\s*|[\#<]\?)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+##s;
+       } else {
-     if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
+         $view = 'read';
-     #print gmtime."Header...\n";
+       }
-       &print_header ($form{mypage}, -last_modified => $lm,
-         -content_format => $cf, -noindex => $cf =~ /obsoleted="yes"/);
-         #print "\n". gmtime."Body...\n";
-       &print_content ($content, content_format => $cf, last_modified => $lm,
-         -toc => \@toc);
-       print &text_to_html (q([[#comment]])) if $cf !~ /obsoleted="yes"/ && !$fixedpage{$form{mypage}};
-     } else {
-       &print_header($form{mypage}, -last_modified => $lm);
-       print "<pre>@{[&escape($content)]}</pre>";
-     }
-     if ($c) {
-       print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>@{[&Resource('SeeAlso',escape=>1)]}</h2>};
-       print $r;
-     }
-     if ($rl) {
-       print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
      }
-         #print "\n". gmtime."Footer...\n";
+   my ($magic, $content) = &SuikaWiki::Plugin::magic_and_content (undef, $content);
-   &print_footer($form{mypage}, $lm);
+   $magic ||= '#?SuikaWiki/0.9';
-         #print "\n". gmtime."Fin...\n";
+   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)) {
+     print "Status: 406 Unsupported Media Type\n";
+     $view = '-UnsupportedMediaType';
+   }
+   my $media = $ViewDefinition{$view}->{media};
+   if ($ViewDefinition{$view}->{xmedia} && $UA =~ /Gecko/) {
+     $media = $ViewDefinition{$view}->{xmedia};
+     $o->{media} = $media;
+   } elsif ($UA =~ m#Mozilla/0\..+Windows#) {
+     $kanjicode = 'shift_jis';
+   }
+     if ($magic =~ m!^\#\?SuikaWiki/0.9!) {
+       &print_header ($form{mypage}, -last_modified => ($magic =~ /interactive="yes"/ ? time : $lm),
+         -expires => ($magic =~ /interactive="yes"/ ? 1 : undef), o => $o,
+         -media => $media, -magic => $magic,  content => $content);
+     } else {
+       &print_header($form{mypage}, -media => $media,
+                                    -magic => $magic, -last_modified => $lm, o => $o);
+     }
+   if ($kanjicode ne 'euc') {
+     my $s = $fmt{view}->replace ($ViewDefinition{$view}->{template} => $o);
+     print &code_convert (\$s => $kanjicode);
+   } else {
+     print $fmt{view}->replace ($ViewDefinition{$view}->{template} => $o);
+   }
  }
- sub do_output_css {
+ sub _do_view_msg (%) {
-   wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+   my %option = @_;
-   wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+   &load_formatter ('view');
-   my $content = $database{$form{mypage}};
+   my $o = bless {param => \%form, page => $option{-page}, toc => [], condition => \%option,
-   if ($content =~ m#^\s*/\*\s*W3C-CSS#) {
+                  formatter => $fmt{view}, &_compatible_options ()}, 'SuikaWiki::Plugin';
-     my $lm = gmtime &get_info($form{mypage}, $info_LastModified);
+   unless (&{$ViewDefinition{$option{-view}}->{check}} ($o)) {
-     print "Content-Type: text/css; charset=@{[&get_charset_name($kanjicode)]}\n";
-     print "Last-Modified: $lm\n";
-     print "\n";
-     print $content;
-   } else {
      print "Status: 406 Unsupported Media Type\n";
-     &print_header('WikiPageIsNotCSS', -noindex => 1);
+     $option{-view} = '-UnsupportedMediaType';
-     &print_content($database{WikiPageIsNotCSS});
-     &print_footer('WikiPageIsNotCSS');
    }
+   my $media = $ViewDefinition{$option{-view}}->{media};
+   if ($ViewDefinition{$option{-view}}->{xmedia} && $UA =~ /Gecko/) {
+     $media = $ViewDefinition{$option{-view}}->{xmedia};
+     $o->{media} = $media;
+   }
+   &print_header($option{-page}, -media => $media, o => $o, -goto => $option{-goto});
+   print $fmt{view}->replace ($ViewDefinition{$option{-view}}->{template} => $o);
  }
  sub id_and_name ($) {
-Line 186 
 sub id_and_name ($) {
+Line 124 
 sub id_and_name ($) {
      }
  }
- sub do_edit {
-     my ($page) = &unarmor_name(&armor_name($form{mypage}));
-     &print_header($page, -noindex => 1);
-     if (not &is_editable($page)) {
-         &print_message(&Resource('Error:ThisPageIsUneditable'));
-     } elsif (&is_frozen($page)) {
-         &print_message(&Resource('Error:ThisPageIsUneditable'));
-     } else {
-         &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>0);
-     }
-     wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
-     wiki::useragent::add ($ENV{HTTP_USER_AGENT});
-     my ($r, $c) = get_search_result ($form{mypage});
-     my $rl = wiki::referer::list_html ($form{mypage});
-     if ($c) {
-       print qq{<h2 id="wikipage-see-also">@{[&Resource('SeeAlso',escape=>1)]}</h2>};
-       print $r;
-     }
-     if ($rl) {
-       print qq(<div id="wikipage-referer"><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
-     }
-     &print_footer($page);
- }
- sub do_adminedit {
-     my ($page) = &unarmor_name(&armor_name($form{mypage}));
-     &print_header($page, -noindex => 1);
-     if (not &is_editable($page)) {
-         &print_message(&Resource('Error:ThisPageIsUneditable'));
-     } else {
-         &print_message(&Resource('Error:PasswordIsNotSpecified'));
-         &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>1);
-     }
-     &print_footer($page);
- }
- sub do_adminchangepasswordform {
-     &print_header('AdminChangePassword', -noindex => 1);
-     &print_passwordform;
-     &print_footer('AdminChangePassword');
- }
  sub do_adminchangepassword {
      if ($form{mynewpassword} ne $form{mynewpassword2}) {
-         &print_error(&Resource('Error:PasswordMismatch'));
+         &_do_view_msg (-view => '-error', -page => $form{mypage},
+                        error_message => &Resource ('Error:PasswordMismatch'));
+         return;
      }
-     my ($validpassword_crypt) = &get_info($AdminSpecialPage, 'AdminPassword');
+     my ($validpassword_crypt) = $database->meta (AdminPassword => $PageName{AdminSpecialPage});
      if ($validpassword_crypt) {
          if (not &valid_password($form{myoldpassword})) {
- #            &send_mail_to_admin(<<"EOD", "AdminChangePassword");
+             &_do_view_msg (-view => '-error', -page => $form{mypage},
- #myoldpassword=$form{myoldpassword}
+                            error_message => &Resource ('Error:PasswordIsIncorrect'));
- #mynewpassword=$form{mynewpassword}
+             return;
- #mynewpassword2=$form{mynewpassword2}
- #EOD
-             &print_error(&Resource('Error:PasswordIsIncorrect'));
          }
      }
      my ($sec, $min, $hour, $day, $mon, $year, $weekday) = localtime(time);
-Line 248 
 sub do_adminchangepassword {
+Line 143 
 sub do_adminchangepassword {
      my $salt1 = $token[(time | $$) % scalar(@token)];
      my $salt2 = $token[($sec + $min*60 + $hour*60*60) % scalar(@token)];
      my $crypted = crypt($form{mynewpassword}, "$salt1$salt2");
-     &set_info($AdminSpecialPage, 'AdminPassword', $crypted);
+     $database->meta (AdminPassword => $PageName{AdminSpecialPage} => $crypted);
-     &print_header('CompletedSuccessfully', -noindex => 1);
+     &_do_view_msg (-view => '-wrote', -page => $form{mypage});
-     &print_message(&Resource('Error:PasswordIsChanged'));
-     &print_footer('CompletedSuccessfully');
  }
- sub do_index {
+ sub valid_password ($) {
-   wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+     my ($validpassword_crypt) = $database->meta (AdminPassword => $PageName{AdminSpecialPage});
-   wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+     return crypt (shift, $validpassword_crypt) eq $validpassword_crypt ? 1 : 0;
-     &print_header($IndexPage);
-     print qq(<ul>);
-     foreach my $page (sort keys %database) {
-         if (&is_editable($page)) {
-             print qq(<li><a href="$url_cgi?@{[&encode($page)]}">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</li>);
-         }
-     }
-     print qq(</ul>);
-     my ($r, $c) = get_search_result ($form{mypage});
-     if ($c) {
-       print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>@{[&Resource('SeeAlso',escape=>1)]}</h2>};
-       print $r;
-     }
-     my $rl = wiki::referer::list_html ($form{mypage});
-     if ($rl) {
-         print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
-     }
-     &print_footer($IndexPage);
  }
  sub do_write {
-Line 284 
 sub do_write {
+Line 159 
 sub do_write {
      }
      if (not &is_editable($form{mypage})) {
-         &print_header($form{mypage}, -noindex => 1);
+         &_do_view_msg (-view => '-error', -page => $form{mypage},
-         &print_message(&Resource('Error:ThisPageIsUneditable'));
+                        error_message => &Resource ('Error:ThisPageIsUneditable'));
-         &print_footer($form{mypage});
-         return;
-     }
-     if (&conflict($form{mypage}, $form{mymsg})) {
          return;
      }
-     # Making diff
+     ## Check confliction
-     {
+     if ($form{myLastModified} ne $database->mtime ($form{mypage})) {
-         &open_diff;
+       &_do_view_msg (-view => '-conflict', -page => $form{mypage});
-         my @msg1 = split(/\n/, $database{$form{mypage}});
+       return;
-         my @msg2 = split(/\n/, $form{mymsg});
-         $diffbase{$form{mypage}} = &difftext(\@msg1, \@msg2);
-         &close_diff;
      }
      if ($form{mymsg}) {
-         $database{$form{mypage}} = $form{mymsg};
+         if ($form{mytouch} || !ref $database) {
-         #&send_mail_to_admin($form{mypage}, "Modify");
+           $database{$form{mypage}} = $form{mymsg};
-         if ($form{mytouch}) {
+         } else {
-             &set_info($form{mypage}, $info_LastModified, time);
+           $database->STORE ($form{mypage} => $form{mymsg}, -touch => 0);
-             &update_recent_changes;
          }
-         &set_info($form{mypage}, $info_IsFrozen, 0 + $form{myfrozen});
+         $database->meta (IsFrozen => $form{mypage} => 0 + $form{myfrozen});
          my $fragment = '';
          $fragment .= qq(;after_edit_cmd=@{[&encode($form{after_edit_cmd})]}) if $form{after_edit_cmd};
          if ($form{__comment_anchor_index}) {
-Line 318 
 sub do_write {
+Line 184 
 sub do_write {
          } elsif ($form{__wikiform_anchor_index}) {
              $fragment .= qq(#wikiform-$form{__wikiform_anchor_index});
          }
-         &print_header('CompletedSuccessfully', -noindex => 1, -goto => $url_cgi.'?mycmd='.&encode($form{after_edit_cmd}||'read').';mypage='.&encode($form{mypage}).qq(;x-param=@{[time.[0..9]->[rand 10]]}$fragment));
+         &_do_view_msg (-view => '-wrote', -page => $form{mypage}, -goto => $url_cgi.'?mycmd='.&encode($form{after_edit_cmd}||'default').';mypage='.&encode($form{mypage}).qq(;x-param=@{[time.[0..9]->[rand 10]]}$fragment));
-         &print_message(&Resource('Error:SavedSuccessfully'));
-         &print_content(&Resource('Error:ContinueReading')." @{[&armor_name($form{mypage})]}");
-         &print_footer('CompletedSuccessfully');
      } else {
-         #&send_mail_to_admin($form{mypage}, "Delete");
          delete $database{$form{mypage}};
-         delete $infobase{$form{mypage}};
+         &_do_view_msg (-view => '-deleted', -page => $form{mypage});
-         if ($form{mytouch}) {
-             &update_recent_changes;
-         }
-         &print_header($form{mypage}, -noindex => 1);
-         &print_message(&Resource('Error:PageIsDeletedSuccessfully'));
-         &print_footer($form{mypage});
      }
  }
- sub do_searchform {
+ sub _compatible_options () {
-     &print_header($SearchPage);
+   (use_anchor_name => ($UA =~ m#Mozilla/[12]\.|Microsoft Internet Explorer# ? 1 : 0));
-     &print_searchform("");
-     &print_footer($SearchPage);
- }
- sub do_search {
-     my $word = $form{mymsg};
-     &print_header($SearchPage);
-     &print_searchform(&escape($word));
-     print scalar get_search_result ($word, -output_not_found => 1, -match_myself => 1);
-     &print_footer($SearchPage);
  }
  sub get_search_result ($;%) {
    my $word = lc shift;
+   my $SearchResult = SuikaWiki::Plugin->cache ('search');
    my %option = @_;
    my @r;
-   foreach my $page (keys %database) {
+   unless (defined $SearchResult->{$word}) {
-     next if !$option{-match_myself} && ($page eq $word);
+     for my $page (keys %database) {
-     my $content = lc $database{$page};
+       next if !$option{-match_myself} && ($page eq $word);
-     if (index (lc $page, $word) > -1) {
+       my $content = lc $database{$page};
-       my $c = $content =~ s/\Q$word\E//g;
+       $content =~ s/^[^\x0A\x0D]+[\x0D\x0A]+//s;
-       push @r, [$page, $c+20];
+       if (index (lc $page, $word) > -1) {
-     } elsif (index ($word, lc $page) > -1) {
+         my $c = $content =~ s/\Q$word\E//g;
-       my $c = $content =~ s/\Q$word\E//g;
+         push @r, [$page, $c+20];
-       push @r, [$page, $c+10];
+       } elsif (index ($word, lc $page) > -1) {
-     } elsif (my $c = $content =~ s/\Q$word\E//g) {
+         my $c = $content =~ s/\Q$word\E//g;
-       push @r, [$page, $c];
+         push @r, [$page, $c+10];
+       } elsif (my $c = $content =~ s/\Q$word\E//g) {
+         push @r, [$page, $c];
+       }
      }
+     @r = sort {$b->[1] <=> $a->[1] || $a->[0] cmp $b->[0]} @r;
+     $SearchResult->{$word} = join "\x1E", map {$_->[0]."\x1F".$_->[1]} @r;
+   } else {
+     @r = map {[split /\x1F/, $_, 2]} split /\x1E/, $SearchResult->{$word};
    }
    #my $em = sub { my $s = shift; $s =~ s#(\Q$word\E)#<em>$1</em>#gi; $s };
-   my $r = join "\n", map {qq(<li>[$_->[1]] <a href ="$url_cgi?@{[&encode($_->[0])]}" class="wiki">@{[&escape($_->[0])]}</a> <span class="wikipage-summary">@{[&escape(&get_subjectline($_->[0]))]}</span></li>)} sort {$b->[1] <=> $a->[1] || $a->[0] cmp $b->[0]} @r;
+   my $r = join "\n", map {qq(<li>[$_->[1]] <a href ="$url_cgi?@{[&encode($_->[0])]}" class="wiki">@{[&escape($_->[0])]}</a> <span class="wikipage-summary">@{[&escape(&get_subjectline($_->[0]))]}</span></li>)} @r;
    $r = qq|<ul class="search-result">$r</ul>| if $r;
    wantarray? ($r, scalar @r): $r;
  }
- sub do_create {
-     &print_header($CreatePage);
-     print <<"EOD";
- <form action="$url_cgi" method="post">
-     <input type="hidden" name="mycmd" value="edit">
-     <strong>@{[&Resource('InputPageNameEdited',escape=>1)]}</strong><br>
-     <input type="text" name="mypage" value="" size="20">
-     <input type="submit" value="@{[&Resource('WikiForm:Create',escape=>1)]}"><br>
- </form>
- EOD
-     &print_footer($CreatePage);
- }
  sub do_random_jump {
    my @list = keys %database;
    my $name = &encode ($list[rand @list]);
-   my $scheme = 'http';
+   print "Location: $uri{wiki}?$name\n";
-   $scheme = lc $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
-   print "Location: $scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi?$name\n";
    print "\n";
  }
- sub print_error {
-     my ($msg) = @_;
-     &print_header($ErrorPage, -noindex => 1);
-     print qq(<p><strong class="error">$msg</strong></p>);
-     &print_footer($ErrorPage);
-     exit(0);
- }
  sub print_header ($;%) {
      my ($page, %option) = @_;
      my @head;
-     $option{body_class} = &is_frozen($page) ? 'frozen' : 'normal';
+     $option{o}->{-header}->{class} = &is_frozen($page) ? 'frozen' : '';
-     $option{body_class} .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
+     $option{o}->{-header}->{class} .= " wiki-page-obsoleted" if $option{-magic} =~ /obsoleted="yes"/;
      if ($option{-goto}) {
        if ($UA =~ m#Opera|MSIE 2\.#) {
            ## WARNING: This code may output unsafe HTML document if
-Line 414 
 sub print_header ($;%) {
+Line 245 
 sub print_header ($;%) {
            $option{-goto} =~ tr/;/&/ if $UA =~ m#Opera#;
            print qq{Refresh: 0; url=$option{-goto}\n};
            push @head, qq(<meta http-equiv="refresh" content="0; url=$option{-goto}">);
+       } elsif ($UA =~ /Gecko/) {
+           print qq{Refresh: 0; url="$option{-goto}"\n};
+           push @head, qq(<meta http-equiv="refresh" content="0; url=&quot;@{[&escape($option{-goto})]}&quot;" />);
        } else {
            $option{-goto} =~ tr/;/&/ if $UA =~ m#Mozilla/[1-4]\.#;
            print qq{Refresh: 0; url="$option{-goto}"\n};
-Line 421 
 sub print_header ($;%) {
+Line 255 
 sub print_header ($;%) {
        }
      }
      print qq{Last-Modified: @{[scalar gmtime $option{-last_modified}]}\n} if $option{-last_modified};
-     if ($UA =~ m#Mozilla/2#) {
+     if ($option{-expires} != -1) {
-         my $ct = qq{text/html; charset=@{[&get_charset_name($kanjicode,compatible=>1)]}};
+       if (defined $option{-expires}) {  ## TODO: Don't use asctime
+         print qq{Expires: @{[scalar gmtime (time + $option{-expires})]}\n};
+       } elsif ($option{-media}->{expires} != -1) {
+         print qq{Expires: @{[scalar gmtime (time + $option{-media}->{expires})]}\n};
+       }
+     }
+     if ($option{-media}->{charset} && $UA =~ m#Mozilla/[12]\.#) {
+         my $ct = qq{$option{-media}->{type}; charset=@{[&get_charset_name($kanjicode,compatible=>1)]}};
          print qq{Content-Type: $ct\n};
-         push @head, qq{<meta http-equiv="content-type" content="$ct">};
+         $option{o}->{-header}->{meta_ct} = qq{<meta http-equiv="content-type" content="$ct">\n};
-     } elsif ($UA =~ m#Infomosaic#) {
+     } elsif (!$option{-media}->{charset} || $UA =~ m#Infomosaic|Mozilla/0\.#) {
-         print qq{Content-Type: text/html\n};
+         print qq{Content-Type: $option{-media}->{type}\n};
-     } else {
+         $option{o}->{-header}->{meta_ct} = qq{<meta http-equiv="content-type" content="$option{-media}->{type}; charset=@{[&get_charset_name($kanjicode,compatible=>1)]}">\n};
-         print qq{Content-Type: text/html; charset=@{[&get_charset_name($kanjicode)]}\n};
+     } else {
+         my $type = $option{-media}->{type};
+         $type = 'application/xml' if $type eq 'application/rss+xml';
+         print qq{Content-Type: $type; charset=@{[&get_charset_name($kanjicode)]}\n};
      }
-     push @head, qq(<title>@{[&escape($page)]}</title>);
+     print <<"EOD";      ## TODO:
-     push @head, qq(<link rel="stylesheet" type="text/css" href="@{[&escape($uri{stylesheet})]}")
-       if $UA !~ m#Mozilla/[1-4]\.# || $UA =~ m#MSIE (?:[4-9]\.|\d\d)#;
-     push @head, q(<meta name="ROBOTS" content="NOINDEX">) if $option{-noindex};
-     my ($Links, $links) = &make_navigate_links ($page);
-     #print $Links;      ## Link: fields
-     $links = join "\n", (@head, $links);
-     print <<"EOD";
  Content-Language: $lang
  Content-Style-Type: text/css
- <!-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
- <html lang="$lang" class="$option{body_class}">
- <head profile="http://suika.fam.cx/~wakaba/-temp/wiki/wiki?WikiHTMLMetaProfile">
- $links
- </head>
- <body class="$option{body_class}">
- EOD
-     &print_navigate_links ($page);
-     print <<EOD;
- <h1 class="header">@{[&escape($page)]}</h1>
  EOD
+   $option{o}->{-header}->{links} = join "\n", (@head);
  }
  sub get_charset_name ($;%) {
-Line 467 
 sub get_charset_name ($;%) {
+Line 294 
 sub get_charset_name ($;%) {
      $charset;
  }
- sub print_navigate_links (@) {
-   my ($page) = @_;
-   my $editable = (&is_editable($page) && !&is_frozen($page)) ? 1 : 0;
-   my $cookedpage = &encode($page);
-   print <<EOH;
- <div class="tools">
-     @{[ $editable
-         ? qq(<a title="@{[&Resource('EditThisPageLong',escape=>1)]}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E" class="wiki-cmd">@{[&Resource('EditThisPage',escape=>1)]}</a> | )
-         : qq()
-     ]}
-     <a href="$url_cgi?mycmd=read;mypage=$cookedpage;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki-cmd" title="@{[&Resource('ViewThisPageLong',escape=>1)]}">@{[&Resource('ViewThisPage',escape=>1)]}</a> |
-     <a href="$url_cgi?mycmd=map;mypage=$cookedpage" class="wiki-cmd" title="@{[&Resource('ShowMapOfThisPageLong',escape=>1)]}">@{[&Resource('ShowMapOfThisPage',escape=>1)]}</a> |
-     <a href="$url_cgi?$CreatePage" class="wiki" title="@{[&Resource('GoToCreatePageLong',escape=>1)]}">@{[&Resource('GoToCreatePage',escape=>1)]}</a> |
-     <a href="$url_cgi?$IndexPage" class="wiki" title="@{[&Resource('GoToIndexPageLong',escape=>1)]}">@{[&Resource('GoToIndexPage',escape=>1)]}</a> |
-     <a href="$url_cgi?$FrontPage" class="wiki" title="@{[&Resource('GoToHomePageLong',escape=>1)]}">@{[&Resource('GoToHomePage',escape=>1)]}</a> |
-     <a href="$url_cgi?$SearchPage" class="wiki" title="@{[&Resource('GoToSearchPageLong',escape=>1)]}">@{[&Resource('GoToSearchPage',escape=>1)]}</a> |
-     <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink" title="@{[&Resource('GoSomewhereLong',escape=>1)]}">@{[&Resource('GoSomewhere',escape=>1)]}</a> |
-     <a href="$url_cgi?RecentChanges" class="wiki" title="@{[&Resource('GoToRecentChangesLong',escape=>1)]}">@{[&Resource('GoToRecentChanges',escape=>1)]}</a>
- </div>
- EOH
- }
- sub make_navigate_links ($) {
-     my $page = shift;
-     my @link;
-     push @link, {rel=>'edit', href=>"$url_cgi?mycmd=edit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>&Resource('EditThisPageLink')} if &is_editable ($page) && !&is_frozen ($page);
-     push @link, {rel=>'edit', href=>"$url_cgi?mycmd=adminedit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>&Resource('AdminEditThisPageLink')} if &is_editable ($page) || &is_frozen ($page);
-     push @link, {rel=>'view', href=>"$url_cgi?mycmd=read;mypage=@{[&encode($page)]};x-p=@{[time.[0..9]->[rand 10]]}", class=>'wiki-command', title=>&Resource('ViewThisPageLink')};
-     push @link, {rel=>'myself', href=>"$url_cgi?@{[&encode($page)]}", class=>'wiki', title=>&Resource('GoToMyselfLink')};
-     push @link, {rel=>'index', href=>"$url_cgi?$IndexPage", class=>'wiki', title=>&Resource('GoToIndexPageLink')};
-     push @link, {rel=>'home', href=>"$url_cgi?$FrontPage", class=>'wiki', title=>&Resource('GoToHomePageLink')};
-     push @link, {rel=>'News', href=>"$url_cgi?WikiNews", class=>'wiki', title=>&Resource('GoToWikiNewsLink')};
-     push @link, {rel=>'News', href=>"$url_cgi?RecentChanges", class=>"wiki", title=>&Resource('GoToRecentChangesLink')};
-     push @link, {rel=>'News', href=>"$url_cgi?$RssPage", class=>"wiki", title=>&Resource('GoToRssPageLink'), type=>'application/xml'};
-     push @link, {rel=>'search', href=>"$url_cgi?$SearchPage", class=>'wiki', title=>&Resource('GoToSearchPageLink')};
-     push @link, {rel=>'help', href=>"$url_cgi?WikiHelp", class=>'wiki', title=>&Resource('GoToWikiHelpLink')};
-     push @link, {rel=>'copyright', href=>"$url_cgi?WikiPageLicense", class=>'wiki', title=>&Resource('GoToWikiPageLicenseLink')};
-     push @link, {rel=>'jump', href=>qq(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='$url_cgi%3F'+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>&Resource('JumpToLink')};
-     push @link, {rel=>'jump', href=>qq(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='$url_cgi%3Fmycmd=edit;mypage='+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>&Resource('JumpToEditLink')};
-     push @link, {rel=>'lucky', href=>"$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}", class=>'wiki randomlink', title=>&Resource('GoSomewhereLink')};
-     push @link, {rel=>'history', href=>$uri{cvs_wikipage}.do{my $s=$page;$s=~s/(.)/sprintf '%02X', ord $1/ges;$s}.'.txt', title=>&Resource('ViewHistoryOfThisPageLink'),hreflang=>'en'} if $uri{cvs_wikipage};
-     push @link, {rel=>'history', href=>"$url_cgi?mycmd=diff;mypage=@{[&encode($page)]}", title=>&Resource('ViewDiffOfThisPageLink'), class=>'wiki-command'};
-     push @link, {rel=>'contents', href=>"$url_cgi?mycmd=map;mypage=@{[&encode($page)]}", title=>&Resource('ShowMapOfThisPageLink'), class=>'wiki-command'};
-     my ($Links, $links) = ('', '');
-     for my $e (@link) {
-         $links .= qq(<link);
-         $Links .= qq(Link: <$e->{href}>);
-         for my $attr (qw/rel rev href title class type hreflang charset/) {
-             $links .= qq( $attr="@{[&escape($e->{$attr})]}") if $e->{$attr};
-         }
-         for my $attr (qw/rel rev title/) {
-             $Links .= qq(; $attr="@{[do{$e->{$attr} =~ s/([\\\"])/\\$1/g; $e->{$attr}}]}") if $e->{$attr};
-         }
-         $links .= qq(>\n);
-         $Links .= qq(\n);
-     }
-     wantarray ? ($Links, $links) : $Links;
- }
- sub print_footer {
-     my ($page, $lm) = @_;
-     my $epage = &encode ($page);
-   my $cvslog1 = q$Revision$;
-   my $cvslog2 = q$Date$;
-   print_navigate_links ($page);
-   print <<"EOD";
- @{[ $lm ? qq(<div id="wikipage-last-modified">@{[&Resource('LastModified=',escape=>1)]}@{[&_rfc3339_date ($lm)]}</div>) : '' ]}
- <div class="footer">
- <a href="http://www.hyuki.com/yukiwiki/" title="YukiWiki 2.0.beta1.2002-05-29 &copy; 2000-2002 by Hiroshi Yuki">@{[&Resource('About:Name:YukiWiki',escape=>1)]}</a> <a href="http://digit.que.ne.jp/work/" title="WalWiki 2.0.beta1.wal.1 &copy; 2000-2002 by Makio Tsukamoto">@{[&Resource('About:Name:WalWiki',escape=>1)]}</a>
- <a href="/gate/cvs/wakaba/wiki/" title="@{[&Resource('About:SuikaWiki:JumpToCVS',escape=>1)]} ($cvslog2)">@{[&Resource('About:Name:SuikaWiki',escape=>1)]} $cvslog1</a>
- </div>
- </body>
- </html>
- EOD
- }
  sub escape {
      my $s = shift;
-     $s =~ s|\r\n|\n|g;
+     $s =~ s|\x0D\x0A|\x0A|g;
      $s =~ s|&|&amp;|g;
      $s =~ s|<|&lt;|g;
      $s =~ s|>|&gt;|g;
-Line 563 
 sub unescape {
+Line 314 
 sub unescape {
      return $s;
  }
- sub print_content ($;$) {
+ sub convert_format ($$$;%) {
-     my ($rawcontent, %option) = @_;
+   my ($content, $d => $t, %option) = @_;
-     print &text_to_html($rawcontent, toc=>1, %option);
+   &load_formatter ('format');
+   my $f = SuikaWiki::Plugin->format_converter ($d => $t);
+   if (ref $f) {
+     $option{content} = $content;
+     $option{from} = $d;
+     $option{to} = $t;
+     &$f ({}, bless (\%option, 'SuikaWiki::Plugin'));
+   } elsif ($t =~ /HTML|xml/) {
+     length $content ? '<pre>'.&escape($content).'</pre>' : '';
+   } else {
+     $content;
+   }
  }
  sub text_to_html {
      my ($txt, %option) = @_;
-     my @toc;
+     my $toc = $option{-toc} || (ref $option{toc} ? $option{toc} : []);
-     my @toc2 = @{$option{-toc}||[]};
      my $tocnum = 0;
      ## Load constants
      my %const;
-     if ($option{content_format} =~ /import="([^"]+)"/) {
+     if ($option{magic} =~ /import="([^"]+)"/) {
        for (split /\s*,\s*/, $1) {
          my $wp = $database{$_};
-         if ($wp =~ m!^\#\?SuikaWikiConst/1.0!) {
+         if ($wp =~ m!^\#\?SuikaWikiConst/(?:0.9|1.0)!) {
            wiki::suikawikiconst::to_hash ($wp => \%const);
          }
        }
-Line 593 
 sub text_to_html {
+Line 354 
 sub text_to_html {
      foreach (@txt) {
          chomp;
          if (/^\*\*\*\*\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(----- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [5, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h6 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h6>');
+             push(@result, splice(@saved), qq(<h6 @{[&id_and_name("i$tocnum")]}>) . &inline($1, %option, const => \%const) . '</h6>');
              $tocnum++;
          } elsif (/^\*\*\*\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(---- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [4, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h5 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h5>');
+             push(@result, splice(@saved), qq(<h5 @{[&id_and_name("i$tocnum")]}>) . &inline($1, %option, const => \%const) . '</h5>');
              $tocnum++;
          } elsif (/^\*\*\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(--- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [3, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h4 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h4>');
+             push(@result, splice(@saved), qq(<h4 @{[&id_and_name("i$tocnum")]}>) . &inline($1, %option, const => \%const) . '</h4>');
              $tocnum++;
          } elsif (/^\*\*([^\x0D\x0A]*)/) {
          # if (/^\*\*(.*)/) {
          # Walrus mod (6) end
-             push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [2, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h3 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h3>');
+             push(@result, splice(@saved), qq(<h3 @{[&id_and_name("i$tocnum")]}>) . &inline($1, %option, const => \%const) . '</h3>');
              $tocnum++;
          } elsif (/^\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [1, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h2 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h2>');
+             push(@result, splice(@saved), qq(<h2 @{[&id_and_name("i$tocnum")]}>) . &inline($1, %option, const => \%const) . '</h2>');
              $tocnum++;
          } elsif (/^(={1,6})(.*)/) {
              &back_push('ol', length($1), \@saved, \@result);
-             push(@result, '<li>' . &inline($2, const => \%const) . '</li>');
+             push(@result, '<li>' . &inline($2, %option, const => \%const) . '</li>');
          } elsif (/^(-{1,6})(.*)/) {
            &back_push('ul', length($1), \@saved, \@result);
            my ($pf, $l) = ('', $2);
-Line 624 
 sub text_to_html {
+Line 385 
 sub text_to_html {
              my $num = 0+$1;
              $pf = qq(<a name="anchor-$num" id="anchor-$num" class="anchor">[$num]</a>);
            }
-           push(@result, '<li>' . $pf . &inline ($l, const => \%const) . '</li>');
+           push(@result, '<li>' . $pf . &inline ($l, %option, const => \%const) . '</li>');
          } elsif (/^:([^:]+):(.*)/) {
              &back_push('dl', 1, \@saved, \@result);
-             push(@result, '<dt>' . &inline($1, const => \%const) . '</dt>', '<dd>' . &inline($2, const => \%const) . '</dd>');
+             push(@result, '<dt>' . &inline($1, %option, const => \%const) . '</dt>', '<dd>' . &inline($2, %option, const => \%const) . '</dd>');
          } elsif (/^(?!>>\d)(>{1,5})(.*)/) {
              &back_push('blockquote', length($1), \@saved, \@result);
              push @result, "<p>";
-             push(@result, &inline($2, const => \%const));
+             push(@result, &inline($2, %option, const => \%const));
              unshift @saved, "</p>";
          } elsif (/^\s*$/) {
              push(@result, splice(@saved));
-Line 639 
 sub text_to_html {
+Line 400 
 sub text_to_html {
              unshift(@saved, "</p>");
          } elsif (/^(\s+.*)$/) {
              &back_push('pre', 1, \@saved, \@result);
-             push(@result, &inline($1, const => \%const));
+             push(@result, &inline($1, %option, const => \%const));
          } elsif (/^\,(.*?)[\x0D\x0A]*$/) {
              &back_push('table', 1, \@saved, \@result);
              #######
-Line 655 
 sub text_to_html {
+Line 416 
 sub text_to_html {
                          $colspan[$i]++;
                      }
                      $colspan[$i] = ($colspan[$i] > 1) ? sprintf(' colspan="%d"', $colspan[$i]) : '';
-                     $value[$i] = sprintf('<td%s%s>%s</td>', $align[$i], $colspan[$i], &inline($value[$i], const => \%const));
+                     $value[$i] = sprintf('<td%s%s>%s</td>', $align[$i], $colspan[$i], &inline($value[$i], %option, const => \%const));
                  } else {
                      $value[$i] = '';
                  }
-Line 672 
 sub text_to_html {
+Line 433 
 sub text_to_html {
          } elsif (/^\[([0-9]+)\](.*)$/ && !$main::_EMBEDED) {
            my $num = 0+$1;
            push @result, qq(<a name="anchor-$num" id="anchor-$num" class="anchor">[$num]</a>);
-           push @result, &inline ($2, const => \%const);
+           push @result, &inline ($2, %option, const => \%const);
          } else {
-             push(@result, &inline($_, const => \%const));
+             push(@result, &inline($_, %option, const => \%const));
          }
      }
      push(@result, splice(@saved));
-     my $toc = '';
+     my $r = join("\n", @result);
-     if ($option{toc}) {
+     $r =~ s#<p>\x0D?\x0A</p>##g;
-         # Convert @toc (table of contents) to HTML.
+     $r =~ s#[\x0D\x0A]+</#</#g;
-         # This part is taken from Makio Tsukamoto's WalWiki.
+     $r =~ s#<pre>\x0D?\x0A#<pre>#g;
-         my (@tocsaved, @tocresult);
+     $r;
-         foreach (@toc,@toc2) {
-             if (/^(-{1,6})(.*)$/) {
-                 &back_push('ul', length($1), \@tocsaved, \@tocresult);
-                 push(@tocresult, '<li>' . $2 . '</li>');
-             }
-         }
-         push(@tocresult, splice(@tocsaved));
-         $toc = join("\n", @tocresult);
-         $toc = $toc ? qq(<div id="wikipage-toc">$toc</div>) : '';
-     }
-     $toc .= join("\n", @result);
-     $toc =~ s#<p>\n</p>##g;
-     $toc =~ s#[\x0D\x0A]+</#</#g;
-     $toc =~ s#<pre>\n#<pre>#g;
-     $toc;
  }
  sub back_push {
-Line 718 
 sub back_push {
+Line 464 
 sub back_push {
  sub inline ($;%) {
      my ($line, %option) = @_;
      $line = &escape($line);
-     $line =~ s{$embed_command{form}}{&make_custom_form ($1, $2, $3, $4)}ge;
+     $line =~ s{$embed_command{form}}{&make_custom_form ($1, $2, $3, $4, \%option)}ge;
      $line =~ s{\[(INS|DEL|SUP|SUB|VAR|CODE|KBD|SAMP|DFN)(?:\(([A-Za-z0-9\x20-]+)\))?\[(.+?)\]\]}{<@{[lc $1]}@{[$2 ? qq( class="$2") : '']}>$3</@{[lc $1]}>}g;
      $line =~ s:\[(WEAK)\[(.+?)\]\]:<span class="@{[lc $1]}">$2</span>:g;
      $line =~ s:\[ABBR\[([^]]+)\] \[([^]]+)\]\]:<acronym title="$2">$1</acronym>:g;
      $line =~ s:\[RUBYB\[([^]]+)\] \[([^]]+)\] \[([^]]+)\]\]:<span class="ruby"><ruby class="rb"><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby><span class="rp"> (</span><span class="rt-below">$3</span><span class="rp">) </span></span>:g;
      $line =~ s:\[RUBY\[([^]]+)\] \[([^]]+)\]\]:<ruby><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby>:g;
      $line =~ s:\[RUBYB\[([^]]+)\] \[([^]]+)\]\]:<span class="ruby"><span class="rb">$1</span><span class="rp"> (</span><span class="rt-below">$2</span><span class="rp">) </span></span>:g;
-     $line =~ s%\[Q\[([^]]+)\](?: \[&lt;([\x21-\x5A\x5E-\x7E]+)&gt;\])?\]%��<q@{[$2?qq( cite="$2"):'']}>$1</q>��%g;
      $line =~ s|'''([^']+)'''|<strong>$1</strong>|g;
      $line =~ s|''([^']+)''|<em>$1</em>|g;
      $line =~ s{
-Line 736 
 sub inline ($;%) {
+Line 481 
 sub inline ($;%) {
      }{
        my ($l, $page,$anchor, $anum, $uri) = ($1, $3,$4, 0+$5, $6);
        if ($l) {
-         return &embedded_to_html($1);
+         &embedded_to_html($1);
        } elsif (defined $page) {
          &make_wikilink ($page, anchor => 0+$anchor);
        } elsif ($anum) {
-Line 751 
 sub inline ($;%) {
+Line 496 
 sub inline ($;%) {
  sub make_wikilink ($%) {
    my ($ename, %option) = @_;
    my $name = &unescape ($ename);
+   $option{latest} = $option{latest} ? qq(mycmd=default;x-param=@{[time.[0..9]->[rand 10]]};mypage=) : '';
    if ($database{$name}) {
      my $subject = &escape (&get_subjectline ($name, delimiter => ''));
      if ($option{anchor}) {
-       return qq(<a title="$subject" href="$url_cgi?@{[&encode($name)]}#anchor-$option{anchor}" class="wiki">$ename&gt;&gt;$option{anchor}</a>);
+       return qq(<a title="$subject" href="$uri{wiki}?$option{latest}@{[&encode($name)]}#anchor-$option{anchor}" class="wiki">$ename&gt;&gt;$option{anchor}</a>);
      } else {
-       return qq(<a title="$subject" href="$url_cgi?@{[&encode($name)]}" class="wiki">$ename</a>);
+       return qq(<a title="$subject" href="$uri{wiki}?$option{latest}@{[&encode($name)]}" class="wiki">$ename</a>);
      }
    } else {
-     return qq(<a title="@{[&Resource('JumpAndEditWikiPage',escape=>1)]}" href="$url_cgi?mycmd=edit;mypage=@{[&escape($name)]}" class="wiki not-exist">$ename<span class="mark">@{[&Resource('JumpAndEditWikiPageMark',escape=>1)]}</span></a>);
+     return qq(<a title="@{[&Resource('JumpAndEditWikiPage',escape=>1)]}" href="$uri{wiki}?$option{latest}@{[&escape($name)]}" class="wiki not-exist">$ename<span class="mark">@{[&Resource('JumpAndEditWikiPageMark',escape=>1)]}</span></a>);
    }
  }
-Line 802 
 sub make_urilink ($;%) {
+Line 548 
 sub make_urilink ($;%) {
    }
  }
- {my $FormIndex = 0;
+ {my %FormIndex;
- sub make_custom_form ($$$$) {
+ sub make_custom_form ($$$$%) {
-     my ($wfname, $definition, $template, $option) = @_;
+     my ($wfname, $definition, $template, $foption, $option) = @_;
-     ## $template and $option is currently not used in this procedure.
+     ## $template is currently not used in this procedure.
-     unless ($main::_EMBEDED) {
+     #unless ($main::_EMBEDED) {
-         $FormIndex++;
+         $FormIndex{$option->{page}}++;
          if (length $definition) {
-             my $param = bless {}, 'SuikaWiki::Plugin';
+             my $param = bless {depth=>10}, 'SuikaWiki::Plugin';
-             my $lastmodified = &get_info($form{mypage}, $info_LastModified);
+             my $lastmodified = $database->mtime ($option->{page});
              &load_formatter (qw/form_input form_option/);
              $definition = &unescape ($definition);
              $definition =~ s/\\(.)/$1/g;
-             $option = &unescape ($option);
+             $foption = &unescape ($foption);
-             $option =~ s/\\(.)/$1/g;
+             $foption =~ s/\\(.)/$1/g;
-             $fmt{form_option}->replace ($option, $param);
+             $fmt{form_option}->replace ($foption, $param);
-             $definition .= ' %submit;' if $definition !~ /%submit/ && !$param->{output}->{nosubmit};
+             $param->{output}->{form} = 1 unless defined $param->{output}->{form};
-             my $target_page = $param->{output}->{page} || $form{mypage};
+             $param->{output}->{form} = 0 if $main::_EMBEDED;
-             $param->{form_disabled} = 1 if $fixedpage{$target_page};
+             $definition .= ' %submit;' if $definition !~ /%submit/ && !$param->{output}->{nosubmit} && $param->{output}->{form};
+             $param->{output}->{page} ||= $option->{page};
+             $param->{form_disabled} = 1 if $database->meta (IsFrozen => $option->{page});
              my $target_form = $param->{output}->{id};
-             my $r = <<EOH;
+             my $r = '';
- <form method="post" action="$url_cgi" id="wikiform-$FormIndex" class="wikiform">
+             $r = <<EOH if $param->{output}->{form};
-   <input type="hidden" name="mycmd" value="@{[$param->{form_disabled}?'read':'wikiform']}">
+ <form method="post" action="$url_cgi" id="wikiform-$FormIndex{$option->{page}}" class="wikiform">
-   <input type="hidden" name="mypage" value="@{[&escape($target_page)]}">
+   <input type="hidden" name="mycmd" value="@{[$param->{form_disabled}?'default':'wikiform']}" />
-   <input type="hidden" name="myLastModified" value="$lastmodified">
+   <input type="hidden" name="mypage" value="@{[&escape($param->{output}->{page})]}" />
-   <input type="hidden" name="mytouch" value="on">
+   <input type="hidden" name="myLastModified" value="$lastmodified" />
-   <input type="hidden" name="@{[$target_form? qq(wikiform_targetform" value="@{[&escape($target_form)]}) : qq(wikiform_index" value="$FormIndex)]}">
+   <input type="hidden" name="mytouch" value="on" />
+   <input type="hidden" name="@{[$target_form? qq(wikiform_targetform" value="@{[&escape($target_form)]}) : qq(wikiform_index" value="$FormIndex{$option->{page}})]}" />
  EOH
-             $r .= qq(<a name="wikiform-$FormIndex"></a>) if $UA =~ m#Mozilla/[12]\.#;
+             $r .= qq(<a name="wikiform-$FormIndex{$option->{page}}"></a>) if $UA =~ m#Mozilla/[12]\.#;
              $r .= $fmt{form_input}->replace ($definition, $param);
-             $r .= <<EOH;
+             $r .= "</form>\n" if $param->{output}->{form};
- </form>
- EOH
              $r;
         } else {  ## No input-interface WikiForm
-            qq(<a id="wikiform-$FormIndex" name="wikiform-$FormIndex"><!-- #form --></a>);
+          qq(<a id="wikiform-$FormIndex{$option->{page}}" name="wikiform-$FormIndex{$option->{page}}"><!-- #form --></a>);
         }
-     } else {
+     #} else {
-         qq(<ins class="wiki-error">@{[&Resource('Error:WikiForm:EmbedIsNotSupported',escape=>1)]}</ins>);
+     #    qq(<ins class="wiki-error">@{[&Resource('Error:WikiForm:EmbedIsNotSupported',escape=>1)]}</ins>);
-     }
+     #}
  }}
- sub print_message {
-     my ($msg) = @_;
-     print qq(<p><strong>@{[&escape($msg)]}</strong></p>);
- }
  sub init_form {
      ## TODO: Support multipart/form-data
      my $query = '';
-Line 855 
 sub init_form {
+Line 597 
 sub init_form {
        read STDIN, $query, $main::ENV{CONTENT_LENGTH};
      }
      $query .= ($query ? ';' : '') . $main::ENV{QUERY_STRING};
-     if ($main::ENV{QUERY_STRING} && $main::ENV{QUERY_STRING} !~ /[&;=]/) {
+     if ($main::ENV{REQUEST_METHOD} ne 'POST' && $main::ENV{QUERY_STRING} && $main::ENV{QUERY_STRING} !~ /[&;=]/) {
        my $query = &decode($main::ENV{QUERY_STRING});
        $query = &code_convert(\$query, $kanjicode);
-       if ($page_command{$query}) {
-         $form{mycmd} = $page_command{$query};
          $form{mypage} = $query;
-       } else {
+         $form{mycmd} = 'default';
-         $form{mypage} = $query;
-         $form{mycmd} = $database{$form{mypage}} ? 'read' : 'edit';
-       }
      } else {
        for (split /[;&]/, $query) {
          if (my ($n, $v) = split /=/, $_, 2) {
-Line 872 
 sub init_form {
+Line 609 
 sub init_form {
            $form{$n} = $v;
          }
        }
-       if ($page_command{$form{mypage}} && $form{mycmd} eq 'read') {
+       unless (defined $form{mypage}) {
-         $form{mypage} = &code_convert(\$form{mypage}, $kanjicode);
+         $form{mypage} = $form{epage};
-         $form{mycmd} = $page_command{$form{mypage}};
+         $form{mypage} =~ s/([0-9A-F]{2})/ord hex $1/g;
        }
      }
-     $form{mypage} ||= 'HomePage';
+     $form{mypage} ||= $PageName{FrontPage};
-     $form{mycmd} ||= 'read';
+     $form{mypage} =~ tr/\x00-\x1F\x7F//d;
+     $form{mycmd} ||= 'default';
      # mypreview_edit        -> do_edit, with preview.
      # mypreview_adminedit   -> do_adminedit, with preview.
-Line 901 
 sub init_form {
+Line 639 
 sub init_form {
      $form{myname} = &code_convert(\$form{myname}, $kanjicode);
  }
- sub update_recent_changes {
-     my $update = "- @{[&get_now]} [[$form{mypage}]] @{[&get_subjectline($form{mypage})]}";
-     my @oldupdates = split(/\x0D?\x0A/, $database{RecentChanges});
-     shift @oldupdates; ## '#?' magic line
-     my @updates;
-     foreach (@oldupdates) {
-         /^\- \d\d\d\d\-\d\d\-\d\d \d\d:\d\d \[\[([^]]+)\]\]/;
-         my $name = $1;
-         if ($name ne $form{mypage}) {
-             push @updates, $_;
-         }
-     }
-     if (&is_exist_page($form{mypage})) {
-       unshift @updates, $update;
-     }
-     splice @updates, (&Resource ('RecentChanges:Max') || 50) + 1;
-     $database{RecentChanges} = "#?SuikaWiki/0.9\n" . join("\n", @updates);
-     if ($file_touch) {
-         open(FILE, "> $file_touch");
-         print FILE localtime() . "\n";
-         close(FILE);
-     }
- }
- {my %SubjectLine;
  sub get_subjectline {
      my ($page, %option) = @_;
-     unless (defined $SubjectLine{$page}) {
+     my $SubjectLine = SuikaWiki::Plugin->cache ('headline');
+     unless (defined $SubjectLine->{$page}) {
        if (not &is_editable($page)) {
-         $SubjectLine{$page} = "";
+         $SubjectLine->{$page} = "";
        } else {
-         $SubjectLine{$page} = $database{$page};
+         $SubjectLine->{$page} = do {
-         $SubjectLine{$page} =~ s!^\#\?[^\x0A\x0D]+[\x0A\x0D]*!!s;
+           my $s=$database{$page};
-         $SubjectLine{$page} =~ s/\x0D?\x0A.*//s;
+           $s =~ s!^\#\?[^\x0A\x0D]+[\x0A\x0D]*!!s;
+           $s =~ s/\x0D?\x0A.*//s;
+         $s};
        }
      }
-     if (length $SubjectLine{$page}) {
+     if (length $SubjectLine->{$page}) {
        $option{delimiter} = defined $option{delimiter} ? $option{delimiter} : &Resource('Title-Summary Delimiter');
-       $option{delimiter}.$SubjectLine{$page}.$option{tail};
+       $option{delimiter}.$SubjectLine->{$page}.$option{tail};
      } else {
        '';
      }
- }}
+ }
  sub open_db {
      if ($modifier_dbtype eq 'dbmopen') {
-         dbmopen(%database, $dataname, 0666) or &print_error("(dbmopen) $dataname");
+         dbmopen(%database, $PathTo{WikiDataBase}, 0666) or die "(dbmopen) $PathTo{WikiDataBase}";
-         dbmopen(%infobase, $infoname, 0666) or &print_error("(dbmopen) $infoname");
      } elsif ($modifier_dbtype eq 'AnyDBM_File') {
          eval q{use AnyDBM_File};
-         tie(%database, "AnyDBM_File", $dataname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $dataname");
+         tie(%database, "AnyDBM_File", $PathTo{WikiDataBase}, O_RDWR|O_CREAT, 0666) or die ("(tie AnyDBM_File) $PathTo{WikiDataBase}");
-         tie(%infobase, "AnyDBM_File", $infoname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $infoname");
+     } elsif ($modifier_dbtype eq 'Yuki::YukiWikiDB') {
-     } else {
          eval q{use Yuki::YukiWikiDB};
-         tie(%database, "Yuki::YukiWikiDB", $dataname) or &print_error("(tie Yuki::YukiWikiDB) $dataname");
+         tie(%database, "Yuki::YukiWikiDB", $PathTo{WikiDataBase}) or die ("(tie Yuki::YukiWikiDB) $PathTo{WikiDataBase}");
-         tie(%infobase, "Yuki::YukiWikiDB", $infoname) or &print_error("(tie Yuki::YukiWikiDB) $infoname");
+     } else {    ## Yuki::YukiWikiDB || Yuki::YukiWikiDBMeta
+         eval qq{use $modifier_dbtype};
+         $database = tie(%database, $modifier_dbtype => $PathTo{WikiDataBase}, -lock => 2, -backup => $wiki::diff::UseDiff) or die ("(tie $modifier_dbtype) $PathTo{WikiDataBase}");
      }
  }
  sub close_db {
      if ($modifier_dbtype eq 'dbmopen') {
          dbmclose(%database);
-         dbmclose(%infobase);
-     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         untie(%database);
-         untie(%infobase);
      } else {
          untie(%database);
-         untie(%infobase);
-     }
- }
- sub open_diff {
-     if ($modifier_dbtype eq 'dbmopen') {
-         dbmopen(%diffbase, $diffname, 0666) or &print_error("(dbmopen) $diffname");
-     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         tie(%diffbase, "AnyDBM_File", $diffname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $diffname");
-     } else {
-         tie(%diffbase, "Yuki::YukiWikiDB", $diffname) or &print_error("(tie Yuki::YukiWikiDB) $diffname");
-     }
- }
- sub close_diff {
-     if ($modifier_dbtype eq 'dbmopen') {
-         dbmclose(%diffbase);
-     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         untie(%diffbase);
-     } else {
-         untie(%diffbase);
      }
  }
- sub print_searchform {
+ sub editform (@) {
-     my ($word) = @_;
+   my %option = @_;
-     print <<"EOD";
+   my $frozen = &is_frozen ($option{page});
- <form action="$url_cgi" method="get">
+   $option{content} = $database{$option{page}} unless defined $option{content};
-     <input type="hidden" name="mycmd" value="read">
+   $option{content} = $database{NewPageTemplate} unless length $option{content};
-     <input type="text" name="mypage" value="$word" size="20">
+   $option{last_modified} = $database->mtime ($option{page}) unless defined $option{last_modified};
-     <input type="submit" value="@{[&Resource('WikiForm:Search',escape=>1)]}">
+   my $f = '';
- </form>
+   my $magic = '';
- EOD
+   $magic = $1 if $option{content} =~ m/^([^\x0A\x0D]+)/s;
- }
+   my $selected = 'default';
- sub print_editform {
+   if ($form{after_edit_cmd}) {
-     my ($mymsg, $lastmodified, %mode) = @_;
+     $selected = $form{after_edit_cmd};
-     my $frozen = &is_frozen($form{mypage});
+   } elsif ($magic =~ /Const|Config|CSS/) {
+     $selected = 'edit';
-     if ($form{mypreview}) {
+   }
-         if ($form{mymsg}) {
+   my $afteredit = <<EOH;
-             unless ($mode{conflict}) {
-                 print qq(<h3>@{[&Resource('Preview:Title',escape=>1)]}</h3>\n);
-                 print qq(<p>@{[&Resource('Preview:Notice',escape=>1)]}</p>\n);
-                 print qq(<div class="preview">\n);
-                 &print_content($form{mymsg});
-                 print qq(</div>\n);
-             }
-         } else {
-             print @{[&Resource('Preview:Empty',escape=>1)]};
-         }
-         $mymsg = &escape($form{mymsg});
-     } else {
-         $mymsg = &escape($mymsg || $database{NewPageTemplate});
-     }
-     my $magic = '';
-     $magic = $1 if $mymsg =~ m/^([^\x0A\x0D]+)/s;
-     my $edit = $mode{admin} ? 'adminedit' : 'edit';
-     my $escapedmypage = &escape($form{mypage});
-     my $escapedmypassword = &escape($form{mypassword});
-     my $selected = 'read';
-     if ($form{after_edit_cmd}) {
-         $selected = $form{after_edit_cmd};
-     } elsif ($magic =~ /Const|Config|CSS/) {
-         $selected = 'edit';
-     }
-     my $afteredit = <<EOH;
  <select name="after_edit_cmd">
+ <option value="default" label="@{[&Resource('Edit:SaveAndDefault',escape=>1)]}"@{[$selected eq 'default' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndDefault',escape=>1)]}</option>
  <option value="read" label="@{[&Resource('Edit:SaveAndView',escape=>1)]}"@{[$selected eq 'read' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndView',escape=>1)]}</option>
  <option value="edit" label="@{[&Resource('Edit:SaveAndEdit',escape=>1)]}"@{[$selected eq 'edit' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndEdit',escape=>1)]}</option>
  </select>
  EOH
+   $f .= <<"EOD";
-     print <<"EOD";
+ <form action="$uri{wiki}" method="post">
- <form action="$url_cgi" method="post">
+     @{[ $option{conflict} ? '' : qq(<label><input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}" /><kbd>S</kbd></label>) ]}
- <h2>@{[&Resource('Edit:Title',escape=>1)]}</h2>
+     @{[ $option{admin} ? qq(<label>@{[&Resource('Edit:Password=',escape=>1)]}<input type="password" name="mypassword" value="" size="10" /></label>) : "" ]} [@{[&get_new_anchor_index($option{content})]}]<br />
-     @{[ $mode{conflict} ? '' : qq(<input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}"><kbd>S</kbd>) ]}
+     <input type="hidden" name="myLastModified" value="$option{last_modified}" />
-     @{[ $mode{admin} ? qq(<label>@{[&Resource('Edit:Password=',escape=>1)]}<input type="password" name="mypassword" value="$escapedmypassword" size="10"></label>) : "" ]} [@{[do {my $n = 0;
+     <input type="hidden" name="mypage" value="@{[&escape($form{mypage})]}" />
-                $mymsg =~ s/(?:-+\s)?\[([0-9]+)\]/$n = $1 if $1 > $n; $&/mge;
+     <textarea cols="@{[&Resource('Edit:Form:Cols')+0||80]}" rows="@{[&Resource('Edit:Form:Rows')+0||20]}" name="mymsg" tabindex="1">@{[&escape($option{content})]}</textarea><br />
-                ++$n}]}]<br>
-     <input type="hidden" name="myLastModified" value="$lastmodified">
-     <input type="hidden" name="mypage" value="$escapedmypage">
-     <textarea cols="@{[&Resource('Edit:Form:Cols')+0||80]}" rows="@{[&Resource('Edit:Form:Rows')+0||20]}" name="mymsg" tabindex="1">$mymsg</textarea><br>
  @{[
-     $mode{admin} ?
+     $option{admin} ?
      qq(
-     <label><input type="radio" name="myfrozen" value="1" @{[$frozen ? qq(checked="checked") : ""]}>@{[&Resource('Edit:Freeze',escape=>1)]}</label>
+     <label><input type="radio" name="myfrozen" value="1" @{[$frozen ? qq(checked="checked") : ""]} />@{[&Resource('Edit:Freeze',escape=>1)]}</label>
-     <label><input type="radio" name="myfrozen" value="0" @{[$frozen ? "" : qq(checked="checked")]}>@{[&Resource('Edit:DontFreeze',escape=>1)]}</label><br>)
+     <label><input type="radio" name="myfrozen" value="0" @{[$frozen ? "" : qq(checked="checked")]} />@{[&Resource('Edit:DontFreeze',escape=>1)]}</label><br />)
      : ""
  ]}
  @{[
-     $mode{conflict} ? "" :
+     $option{conflict} ? "" :
      qq(
-         <input type="checkbox" name="mytouch" value="on" checked="checked">@{[&Resource('Edit:UpdateTimeStamp',escape=>1)]}<br>
+         <label><input type="checkbox" name="mytouch" value="on" checked="checked" />@{[&Resource('Edit:UpdateTimeStamp',escape=>1)]}</label><br />
-         <input type="submit" name="mypreview_$edit" value="@{[&Resource('Edit:Preview',escape=>1)]}">
+         <label><input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}" accesskey="S" /><kbd>S</kbd></label>
-         <input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}" accesskey="S"><kbd>S</kbd>
         $afteredit
-        <br>
      )
  ]}
  </form>
  EOD
-     unless ($mode{conflict}) {
+     $f;
-         ## Show help text
-         my $help = $database{WikiEditHelp};
-         $help =~ s!^\#\?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+!!s;
-         print &text_to_html ($help, toc => 0);
-     }
- }
- sub print_passwordform {
-         print <<"EOD";
- <form action="$url_cgi" method="post">
-     <input type="hidden" name="mycmd" value="adminchangepassword">
-     <label>@{[&Resource('Password:Old=',escape=>1)]}<input type="password" name="myoldpassword" size="10"></label><br>
-     <label>@{[&Resource('Password:New1=',escape=>1)]}<input type="password" name="mynewpassword" size="10"></label><br>
-     <label>@{[&Resource('Password:New2=',escape=>1)]}<input type="password" name="mynewpassword2" size="10"></label><br>
-     <input type="submit" value="@{[&Resource('WikiForm:Change',escape=>1)]}"><br>
- </form>
- EOD
  }
  sub is_editable {
      my ($page) = @_;
-     if ($fixedpage{$page} || $page =~ /\s/ || $page =~ /^\#/) {
+     $page =~ /[\x00-\x20\x7F]/ ? 0 : 1;
-         return 0;
-     } else {
-         return 1;
-     }
- }
- # armor_name:
- #   WikiName -> WikiName
- #   not_wiki_name -> [[not_wiki_name]]
- sub armor_name { qq([[$_[0]]]) }
- # unarmor_name:
- #   [[bracket_name]] -> bracket_name
- #   WikiName -> WikiName
- sub unarmor_name {
-     my ($name) = @_;
-     if ($name =~ /^\[\[(\S+?)\]\]$/) {
-         return $1;
-     } else {
-         return $name;
-     }
  }
  sub decode {
-Line 1126 
 sub decode {
+Line 747 
 sub decode {
  }
  sub encode {
-     my ($s) = @_;
+   my $s = shift;
-     my $encoded = '';
+   $s =~ s/([^0-9A-Za-z_-])/sprintf '%%%02X', ord $1/ge;
-     foreach my $ch (split(//, $s)) {
+   $s;
-         if ($ch =~ /[A-Za-z0-9_]/) {
-             $encoded .= $ch;
-         } else {
-             $encoded .= '%' . sprintf("%02X", ord($ch));
-         }
-     }
-     return $encoded;
- }
- sub conflict {
-     my ($page, $rawmsg) = @_;
-     if ($form{myLastModified} eq &get_info($page, $info_LastModified)) {
-         return 0;
-     }
-     &print_header($page, -noindex => 1);
-     &print_content(&Resource('Error:Conflict'));
-     &print_editform($rawmsg, $form{myLastModified}, frozen=>0, conflict=>1);
-     &print_footer($page);
-     return 1;
  }
  sub get_now {
-Line 1172 
 sub init_InterWikiName {
+Line 774 
 sub init_InterWikiName {
    $interwiki{'[[]]'} = 1;       ## dummy
  }
- sub get_info {
-     my ($page, $key) = @_;
-     my %info = map { split(/=/, $_, 2) } split(/\n/, $infobase{$page});
-     return $info{$key};
- }
- sub set_info {
-     my ($page, $key, $value) = @_;
-     my %info = map { split(/=/, $_, 2) } split(/\n/, $infobase{$page});
-     $info{$key} = $value;
-     my $s = '';
-     for (keys %info) {
-         $s .= "$_=$info{$_}\n";
-     }
-     $infobase{$page} = $s;
- }
  sub frozen_reject {
-     my ($isfrozen) = &get_info($form{mypage}, $info_IsFrozen);
+     my ($isfrozen) = $database->meta (IsFrozen => $form{mypage});
      my ($willbefrozen) = $form{myfrozen};
      if (not $isfrozen and not $willbefrozen) {
          # You need no check.
-Line 1200 
 sub frozen_reject {
+Line 784 
 sub frozen_reject {
          # You are admin.
          return 0;
      } else {
-         &print_error(&Resource('Error:PasswordIsIncorrect'));
+         &_do_view_msg (-view => '-error', -page => $form{mypage},
-         return 1;
+                        error_message => &Resource ('Error:PasswordIsIncorrect'));
+         exit;
      }
  }
- sub valid_password {
+ sub is_frozen ($) { $database->meta (IsFrozen => $_[0]) ? 1 : 0 }
-     my ($givenpassword) = @_;
-     my ($validpassword_crypt) = &get_info($AdminSpecialPage, 'AdminPassword');
-     if (crypt($givenpassword, $validpassword_crypt) eq $validpassword_crypt) {
-         return 1;
-     } else {
-         return 0;
-     }
- }
- sub is_frozen {
-     my ($page) = @_;
-     if (&get_info($page, $info_IsFrozen)) {
-         return 1;
-     } else {
-         return 0;
-     }
- }
  sub do_comment {
      my ($content) = $database{$form{mypage}};
-     my $default_name;   ## this code does not strict.
+     my $default_name;   ## this code is not strict.
      $default_name = $1 if $content =~ /default-name="([^"]+)"/;
      my $datestr = '[WEAK['.&get_now.']]';
      my $namestr = $form{myname} || $default_name || &Resource('WikiForm:WikiComment:DefaultName');
-Line 1259 
 sub do_comment {
+Line 827 
 sub do_comment {
          $form{mymsg} = $content;
          $form{mytouch} = 'on';
          &do_write;
-     } else {
+     } else {    ## Don't write
-         $form{mycmd} = 'read';
+         $form{mycmd} = 'default';
-         &do_read;
+         &do_view;
      }
  }
-Line 1277 
 sub embedded_to_html {
+Line 845 
 sub embedded_to_html {
      my ($embedded) = @_;
      if ($embedded eq '[[#comment]]' or $embedded eq '[[#rcomment]]') {
        unless ($main::_EMBEDED) {
-         my $lastmodified = &get_info($form{mypage}, $info_LastModified);
+         my $lastmodified = $database->mtime ($form{mypage});
          return <<"EOD";
  <form action="$url_cgi" method="post" id="x-comment-@{[++$CommentIndex]}" class="comment"><p>
-     <input type="hidden" name="mycmd" value="comment">
+     <input type="hidden" name="mycmd" value="comment" />
-     <input type="hidden" name="mypage" value="$form{mypage}">
+     <input type="hidden" name="mypage" value="$form{mypage}" />
-     <input type="hidden" name="myLastModified" value="$lastmodified">
+     <input type="hidden" name="myLastModified" value="$lastmodified" />
-     <input type="hidden" name="mytouch" value="on">
+     <input type="hidden" name="mytouch" value="on" />
-     <input type="hidden" name="comment_index" value="$CommentIndex">
+     <input type="hidden" name="comment_index" value="$CommentIndex" />
      @{[&Resource('WikiForm:WikiComment:Name=',escape=>1)]}
-     <input type="text" name="myname" value="" size="10" class="comment-name">
+     <input type="text" name="myname" value="" size="10" class="comment-name" />
-     <input type="text" name="mymsg" value="" size="60" class="comment-msg">
+     <input type="text" name="mymsg" value="" size="60" class="comment-msg" />
-     <input type="submit" value="@{[&Resource('WikiForm:Add',escape=>1)]}" title="@{[&Resource('WikiForm:AddLong',escape=>1)]}" class="comment-submit">
+     <input type="submit" value="@{[&Resource('WikiForm:Add',escape=>1)]}" title="@{[&Resource('WikiForm:AddLong',escape=>1)]}" class="comment-submit" />
  </p></form>
  EOD
       } else {
          return <<"EOD";
  <del><form action="$url_cgi" method="get">
-     <input type="hidden" name="mycmd" value="read">
+     <input type="hidden" name="mycmd" value="default" />
-     <input type="hidden" name="mypage" value="$form{mypage}">
+     <input type="hidden" name="mypage" value="$form{mypage}" />
      @{[&Resource('WikiForm:WikiComment:Name=',escape=>1)]}
-     <input type="text" name="myname" value="" size="10" disabled="disabled">
+     <input type="text" name="myname" value="" size="10" disabled="disabled" />
-     <input type="text" name="mymsg" value="" size="60" disabled="disabled">
+     <input type="text" name="mymsg" value="" size="60" disabled="disabled" />
  </form></del>
  EOD
      }
-Line 1307 
 EOD
+Line 875 
 EOD
    } elsif ($embedded =~ /^\[\[\#embed:(.+)\]\]$/) {
      my ($name, $r) = ($1, '');
      if ($main::_EMBEDED != 1) {
-       my ($content, $cf) = ($database{$name}, 'SuikaWiki/0.9');
+       my ($cf, $content) = SuikaWiki::Plugin->magic_and_conten ($database{$name});
-       $cf = $1 if $content =~ s!^(?:[\#<]\?|/\*\s*)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.][^\x0D\x0A]*)?)[\x0D\x0A]+!!s;
+       $cf ||= '#?SuikaWiki/0.9';
-       if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
+       if ($cf =~ m!^#\?SuikaWiki/0.9(?:$|\s)!) {
          $main::_EMBEDED = 1;
-         $r = &text_to_html ($content, content_format => $cf);
+         $r = &text_to_html ($content, magic => $cf, page => $name);
          $main::_EMBEDED = 0;
        } elsif (length $content) {
          $r = "<pre>@{[&escape ($content)]}</pre>";
        } else {
-         $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:PageNotFound')]}\n]INS]\n", content_format => 'SuikaWiki/0.9');
+         $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:PageNotFound')]}\n]INS]\n", magic => '#?SuikaWiki/0.9');
        }
      } else {    ## nested #EMBED
-       $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:Nested',escape=>1)]}\n]INS]\n", content_format => 'SuikaWiki/0.9');
+       $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:Nested',escape=>1)]}\n]INS]\n", magic => '#?SuikaWiki/0.9');
      }
      return qq(<blockquote title="@{[&escape($name)]}" class="wiki-embed">$r<div class="cite-note">��<cite><a href="$url_cgi?@{[&encode($name)]}" class="wiki">@{[&escape($name)]}</a></cite>��</div></blockquote>);
    } elsif ($embedded =~ /^\[\[\#randomlink:(.+)\]\]$/) {
-Line 1353 
 sub do_wikiform {
+Line 921 
 sub do_wikiform {
              || $i == $form{wikiform_index}) {
              $template =~ s/\\(.)/$1/g;
              $option =~ s/\\(.)/$1/g;
-             my $param = bless {}, 'SuikaWiki::Plugin';
+             my $param = bless {depth=>10}, 'SuikaWiki::Plugin';
              $param->{page} = $form{mypage};
              $param->{form_index} = $i;
              $param->{form_name} = $wfname;
-Line 1363 
 sub do_wikiform {
+Line 931 
 sub do_wikiform {
              $param->{default_name} ||= &Resource('WikiForm:WikiComment:DefaultName');
              $fmt{form_option}->replace ($option, $param);
              my $t = 1;
-             for (@{$param->{require}||[]}) {
+             for (keys %{$param->{require}||{}}) {
                  (undef $t, last) unless length $param->{argv}->{'wikiform__'.$_};
              }
              $t = $fmt{form_template}->replace ($template, $param) if $t;
-Line 1378 
 sub do_wikiform {
+Line 946 
 sub do_wikiform {
                    if $param->{anchor_index_};  ## $anchor is used!
              }
              $form{__wikiform_anchor_index} = $i;
-             undef $form{wikiform_targetform};  ## make sure never to match
+             undef $form{wikiform_targetform};  ## Make sure never to match
-             undef $form{wikiform_index};       ## with WikiForm in rest of page
+             undef $form{wikiform_index};       ## with WikiForm in rest of page!
          }
          $i++; $embed;
      }ge;
-Line 1392 
 sub do_wikiform {
+Line 960 
 sub do_wikiform {
          $form{mymsg} = $content;
          $form{mytouch} = 'on';
          &do_write;
-     } else {
+     } else {    ## Don't write!
-         $form{mycmd} = 'read';
+         $form{mycmd} = 'default';
-         &do_read;
+         &do_view;
      }
  }
  sub code_convert {
    require Jcode;
      my ($contentref, $code) = (shift, shift || $kanjicode);
-     $code = 'jis' if $code =~ /iso/;
+     if    ($code =~ /euc/) { $code = 'euc' }
-     $code = 'euc' if $code =~ /euc/;
+     elsif ($code =~ /iso/) { $code = 'jis' }
-     $code = 'sjis' if $code =~ /shift/;
+     elsif ($code =~ /shi/) { $code = 'sjis' }
-     $code = 'utf8' if $code =~ /utf/;
+     elsif ($code =~ /utf/) { $code = 'utf8' }
-     #&Jcode::convert($contentref, $code);       # for Jcode.pm
+     $$contentref = Jcode->new ($contentref)->tr ("\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ ))->$code;
- #    &jcode::convert($contentref, $code);       # for jcode.pl
-     #&Jcode::tr ($contentref, "\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ )) if $code eq 'euc';
-     Jcode->new ($contentref)->h2z->tr ("\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ ))->$code;
      return $$contentref;
  }
- sub do_diff {
-     if (not &is_editable($form{mypage})) {
-         &do_read;
-         return;
-     }
-     &open_diff;
-     my $title = $form{mypage};
-     &print_header($title, -noindex => 1);
-     $_ = &escape($diffbase{$form{mypage}});
-     &close_diff;
-     print qq(<h3>@{[&Resource('Diff:Title',escape=>1)]}</h3>);
-     print qq(<p>@{[&Resource('Diff:Notice',escape=>1)]}</p>);
-     print qq(<pre class="diff">);
-     foreach (split(/\n/, $_)) {
-         if (/^\+(.*)/) {
-             print qq(<ins class="added">$1</ins>\n);
-         } elsif (/^\-(.*)/) {
-             print qq(<del class="deleted">$1</del>\n);
-         } elsif (/^\=(.*)/) {
-             print qq(<span class="same">$1</span>\n);
-         } else {
-             print qq|??? $_\n|;
-         }
-     }
-     print qq(</pre>);
-     &print_footer($title);
- }
- sub do_rss {
-     eval q{use Yuki::RSS};
-     my $rss = new Yuki::RSS(
-         version => '1.0',
-         encoding => &get_charset_name ($kanjicode),
-     );
-     my $scheme = 'http';
-     $scheme = lc $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
-     my $myuri = "$scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi";
-     $rss->stylesheet (
-       href      => $myuri . "?mycmd=TEXT_CSS;mypage=WikiStyle:RSS",
-       type      => 'text/css',
-     );
-     $rss->channel(
-         title   => &Resource ('RSS:WikiTitle'),
-         link    => $myuri,
-         description     => &Resource ('RSS:WikiDescription'),
-         'dc:language'   => $lang,
-     );
-     my $recentchanges = $database{RecentChanges};
-     my $count = 0;
-     foreach (split(/\n/, $recentchanges)) {
-         last if ($count >= 15);
-         if (/\[\[([^]]+)\]\]/) {
-           my $title = $1;
-           $rss->add_item (
-             title       => &escape($title),
-             link        => $myuri . '?' . &encode($title),
-             description => &escape(&get_subjectline($title,delimiter=>'')),
-             'dc:date'   => &get_info ($title, $info_LastModified),
-           );
-           $count++;
-         }
-     }
-     # print RSS information (as XML).
-     print <<"EOD"
- Content-type: application/xml; charset=@{[&get_charset_name ($kanjicode)]}
- @{[$rss->as_string]}
- EOD
- }
  sub _rfc3339_date ($) {
    my @time = gmtime (shift);
    sprintf '%04d-%02d-%02dT%02d:%02d:%02d+00:00', $time[5]+1900,$time[4]+1,@time[3,2,1,0];
  }
- sub is_exist_page {
-     my ($name) = @_;
-     if ($use_exists) {
-         return exists($database{$name});
-     } else {
-         return $database{$name};
-     }
- }
- sub __get_database ($) { $database{ $_[0] } }
- sub __set_database ($$) { $database{ $_[0] } = $_[1] }
- sub do_wikiplugininfo {
-     &print_header (q(WikiPluginInfo));
-     print text_to_html (&SuikaWiki::Plugin::make_info_page);
-     &print_footer (q(WikiPluginInfo));
- }
- sub do_map {
-     my $page = $form{mypage};
-     &print_header ($page);
-     wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
-     wiki::useragent::add ($ENV{HTTP_USER_AGENT});
-     my ($r, $c) = get_search_result ($form{mypage});
-     my $rl = wiki::referer::list_html ($form{mypage});
-     print "<h2>@{[&Resource('Map:Title',escape=>1)]}</h2>\n<p>@{[&Resource('Map:Description',escape=>1)]}</p>\n";
-     my %option = (level => 0+&Resource('Map:Depth'), weight_list => {}, not_exist => {},
-       map_from_here => &Resource('Map:FromHere'),
-       map_from_here_description => &Resource('Map:FromHereLong'));
-     &wiki::map::make_list ($page, %option);
-     print &wiki::map::list_to_html ($page, $option{weight_list}, %option);
-     if ($c) {
-       print qq{<h2 id="wikipage-see-also">@{[&Resource('SeeAlso',escape=>1)]}</h2>};
-       print $r;
-     }
-     if ($rl) {
-       print qq(<div id="wikipage-referer"><h2>@{[&Resource('Referers',escape=>1)]}</h2>\n$rl</div>\n);
-     }
-     &print_footer ($page);
- }
  my %_Resource;
  sub Resource ($;%) {
    my ($s, %o) = @_;
-Line 1557 
 sub add ($$) {
+Line 1011 
 sub add ($$) {
    $list{ $uri }++;
    set ($page, \%list);
  }
- sub get ($) {
+ sub get ($) { split /"/, $main::database->meta (Referer => $_[0]) }
-   my $page = shift;
-   split /"/, main::get_info ($page, 'Referer');
- }
  sub set ($%) {
    my $page = shift;
    my $list = shift;
-   main::set_info ($page, Referer => join '"', %$list);
+   $main::database->meta (Referer => $page => join '"', %$list);
  }
  sub get_dont_record () {
    map {s/\$/\\\$/g; s/\@/\\\@/g; $_}
    grep !/^#/,
-   split /[\x0D\x0A]+/, &main::__get_database ('RefererDontRecord');
+   split /[\x0D\x0A]+/, $main::database{RefererDontRecord};
  }
  sub get_site_name () {
-   my @lines = grep /[^#]/, split /[\x0D\x0A]+/, &main::__get_database('RefererSiteName');
+   my @lines = grep /[^#]/, split /[\x0D\x0A]+/, $main::database{RefererSiteName};
    my @item;
    for (@lines) {
      next if /^#/;
-Line 1618 
 sub __decode ($) {
+Line 1069 
 sub __decode ($) {
  }
  package wiki::useragent;
+ our $UseLog;
  sub add ($) {
    my $s = shift;
    return unless length $s;
+   return unless $UseLog;
    $s =~ s/([\x00-\x08\x0A-\x1F\x25\x7F-\xFF])/sprintf '%%%02X', unpack 'C', $1/ge;
    my %ua;
-   for (split /\n/, &main::__get_database('WikiUserAgentList')) {
+   for (split /\n/, $main::database{$main::PageName{UserAgentList}}) {
      if (/^-\[(\d+)\] (.+)$/) {
        my ($t, $n) = ($1, $2);
        $n =~ tr/\x0A\x0D//d;
-Line 1636 
 sub add ($) {
+Line 1089 
 sub add ($) {
    for (sort {$ua{$a} <=> $ua{$b}} keys %ua) {
      $s .= sprintf qq(-[%d] %s\n), $ua{$_}, $_;
    }
-   &main::__set_database ('WikiUserAgentList' => $s);
+   $main::database->STORE ($main::PageName{UserAgentList} => $s, -touch => 0);
  }
  package wiki::suikawikiconst;
-Line 1646 
 sub to_hash ($;$) {
+Line 1099 
 sub to_hash ($;$) {
    my $h = shift || {};
    my $val;
    for my $line (split /\n/, $page) {
+     next if $line =~ /^#/;
      $line =~ tr/\x0A\x0D//d;
      if ($val && $line =~ s/^\s+//) {
        $h->{$val} .= length $h->{$val} ? "\n" . $line : $line;
-Line 1656 
 sub to_hash ($;$) {
+Line 1110 
 sub to_hash ($;$) {
    $h;
  }
+ package wiki::dummy;
+ sub mtime (@) {undef}
+ sub meta (@) {undef}
+ sub Yuki::YukiWikiDB2::meta (@) {undef}
  package SuikaWiki::Plugin;
-   our $plugin_directory;  # defined in top of this file.
+   our ($plugin_directory, %List, %Index, %Cache);
-   our %List;
+   push @main::INC, $plugin_directory.'/../..';
  sub escape ($$) { main::escape ($_[1]) }
  sub unescape ($$) { main::unescape ($_[1]) }
  sub encode ($$) { main::encode ($_[1]) }
  sub decode ($$) { main::decode ($_[1]) }
  sub __get_datetime ($) { main::get_now () }
+ sub resource ($$;%) { shift; &main::Resource (@_) }
+ sub uri ($$) { $main::uri{$_[1]} }
+ sub new_index ($$) { ++$Index{$_[1]} }
+ sub user_agent_names ($) { $main::UA }
+ sub magic_and_content ($$) {
+   my ($magic, $page) = ('', $_[1]);
+   $magic = $1 if $page =~ s!^((?:\#\?|/\*|<\?)[^\x02\x0A\x0D]+)[\x02\x0A\x0D]+!!s;
+   ($magic, $page);
+ }
+ sub formatter ($$) {
+   &main::load_formatter ($_[1]);
+   $main::fmt{$_[1]};
+ }
+ sub format_converter ($$$) {
+   &main::load_formatter ('format');
+   $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 cache ($$) {
+   my $name = $_[1];
+   unless (ref $Cache{$name}) {
+     my %cache;
+     tie (%cache, 'Yuki::YukiWikiCache', -file => $main::PathTo{CachePrefix}.$name);
+     $Cache{$name} = \%cache;
+   }
+   $Cache{$name};
+ }
  sub regist ($@) {
      my $pack = shift;
-Line 1683 
 sub import_plugins () {
+Line 1169 
 sub import_plugins () {
      }
  }
- sub make_info_page () {
-     my $r = <<EOH;
- EOH
-     unless ($List{_all}) {
-         $r .= qq('''No plugin is installed!'''\n);
-     } else {
-         my $index = 0;
-         for my $package (sort @{$List{_all}}) {
-             $index++;
-             my $prop = $package->property ();
-             $r .= <<EOH;
- *$package
- [$index] '''$prop->{name}''' (Version $prop->{version})
- <$prop->{uri}>
- Provide:
- @{[do{my $t = ''; for my $f (@{$prop->{provide}||[]}) {
-     $t .= qq(-''$f''\n);
-     for (sort grep m#^\Q$f\E/#, keys %{$prop->{partinfo}}) {
-          $t .= qq(--''$_'' -- $prop->{partinfo}->{$_}\n);
-     }
- }$t}]}
- EOH
-         }
-     }
-     $r;
- }
  &import_plugins ();
  package wiki::conneg;
-Line 1721 
 package wiki::conneg;
+Line 1177 
 package wiki::conneg;
  sub get_accept_lang (;$) {
    my $alang = shift || $main::ENV{HTTP_ACCEPT_LANGUAGE};
    my %alang = (ja => 0.0002, en => 0.0001);
+   if ($UA =~ m#Mozilla/0\.#) {
+     $alang{ja} = 0.00001;
+   }
    my $i = 0.1;
    for (split /\s*,\s*/, $alang) {
      tr/\x09\x0A\x0D\x20//d;
-Line 1744 
 sub get ($;\%) {
+Line 1203 
 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::__get_database('WikiResource:'.$lang));
+         $option->{resource}->{$lang} ||= &wiki::suikawikiconst::to_hash ($main::database{'WikiResource:'.$lang});
          $v = $option->{resource}->{$lang}->{$resname};
          last if defined $v;
        }
-Line 1755 
 sub get ($;\%) {
+Line 1214 
 sub get ($;\%) {
    defined $v ? $v : $resname;
  }
- package wiki::map;
- sub make_list ($;%) {
-   my ($page, %option) = @_;
-   $option{level} ||= 3;
-   my %weight;
-   my $content = &main::__get_database ($page);
-   $content =~ s{^\#\?([^\x0A\x0D]+)}{
-     if ($1 =~ /import="([^"]+)"/) {
-       for (split /\s*,\s*/, $1) {
-         $weight{$_} += 2;
-       }
-     }
-     $&;
-   }ges;
-   ## Bug: this code does not support content type.
-   $content =~ s{\[\[((?!\#)[^]]+)\](?:>>\d+)?\]}{
-     $weight{$1}++; $&;
-   }ge;
-   delete $weight{$page};        ## Delete myself
-   for my $page (keys %weight) {
-     my $w = ($content =~ s/\Q$page\E/$&/g);
-     $weight{$page} += $w + $weight{$page}; ## Weight of [[name]] is x2.
-     ($weight{$page} *= 0.1, $option{not_exist}->{$page} = 1) unless &main::is_exist_page ($page);
-   }
-   $option{weight_list}->{$page} = \%weight;
-   if (--$option{level}) {
-     for my $page (keys %weight) {
-       &make_list ($page, %option) unless $option{weight_list}->{$page};
-     }
-   }
-   $option{weight_list};
- }
- sub list_to_html ($$;%) {
-   my ($Page, $wlist, %option) = @_;
-   my $r = '';
-   $option{outputed}->{$Page} = 1;
-   for my $page (sort {$wlist->{$Page}->{$b} <=> $wlist->{$Page}->{$a}} keys %{$wlist->{$Page}}) {
-     $r .= qq(<li><span class="weight">[@{[0+$wlist->{$Page}->{$page}]}]</span> <a href="$main::url_cgi?@{[&main::encode($page)]}" class="wiki@{[$option{not_exist}->{$page}?' not-exist':'']}">@{[&main::escape ($page).($option{not_exist}->{$page}?qq(<span class="mark">@{[&main::Resource('JumpAndEditWikiPageMark',escape=>1)]}</span>):'')]}</a> <a href="$main::url_cgi?mycmd=map;mypage=@{[&main::encode($page)]}" class="wiki-cmd map-from-here" title="@{[&main::escape($option{map_from_here_description})]}">@{[&main::escape($option{map_from_here})]}</a> <span class="summary">@{[&main::escape(&main::get_subjectline($page))]}</span>);
-     unless ($option{outputed}->{$page}) {
-       $r .= &list_to_html ($page, $wlist, %option);
-     }
-     $r .= "</li>\n";
-   }
-   $r ? qq(<ul class="map">$r</ul>) : '';
- }
  package main;
  &main;
  exit 0;
-Line 1811 
 exit 0;
+Line 1222 
 exit 0;
  __END__
  =head1 NAME
- wiki.cgi - This is YukiWiki, yet another Wiki clone.
+ wiki.cgi --- SuikaWiki: Yet yet another WikiEngine
- walwiki.cgi based on yukiwiki.cgi - Yet another WikiWikiWeb clone.
- =head1 DESCRIPTION
+ =head1 SEE ALSO
- YukiWiki is yet another Wiki clone.
+ <IW:SuikaWiki:SuikaWiki>
- YukiWiki can treat Japanese WikiNames (enclosed with [[ and ]]).
+ =head1 AUTHORS
- YukiWiki provides 'InterWiki' feature, RDF Site Summary (RSS),
- and some embedded commands (such as [[#comment]] to add comments).
- Read F<readme_en.txt> (English) or F<readme_ja.txt> (Japanese) in more detail.
+ Hiroshi Yuki <hyuki@hyuki.com> <http://www.hyuki.com/yukiwiki/>
- =head1 AUTHOR
+ Makio Tsukamoto <http://digit.que.ne.jp/>
- Hiroshi Yuki <hyuki@hyuki.com> http://www.hyuki.com/yukiwiki/
+ Wakaba <w@suika.fam.cx>
  =head1 LICENSE
- Copyright (C) 2000-2002 by Hiroshi Yuki.
+ Copyright (C) 2000-2003 AUTHORS
  This program is free software; you can redistribute it and/or
  modify it under the same terms as Perl itself.

 Legend:



Removed from v.1.41
 


changed lines


 
Added in v.1.51
 Legend:



Removed from v.1.41
 


changed lines


 
Added in v.1.51
-Removed from v.1.41
+Added in v.1.51

admin@suikawiki.org	ViewVC Help
Powered by ViewVC 1.1.24