/[suikacvs]/webroot/swe/lib/suikawiki/main.pl
Suika

Diff of /webroot/swe/lib/suikawiki/main.pl

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

revision 1.25 by wakaba, Sun Jul 12 08:59:27 2009 UTC revision 1.26 by wakaba, Sun Jul 12 09:07:59 2009 UTC
# Line 480  if ($path[0] eq 'n' and @path == 2) { Line 480  if ($path[0] eq 'n' and @path == 2) {
480          $id_prop->{modified} = time;          $id_prop->{modified} = time;
481          $id_prop->{hash} = get_hash ($textref);          $id_prop->{hash} = get_hash ($textref);
482                    
483          require SWE::DB::VersionControl;          my $vc = $db->vc;
         my $vc = SWE::DB::VersionControl->new;  
484          local $content_db->{version_control} = $vc;          local $content_db->{version_control} = $vc;
485          local $id_prop_db->{version_control} = $vc;          local $id_prop_db->{version_control} = $vc;
486                    
# Line 550  if ($path[0] eq 'n' and @path == 2) { Line 549  if ($path[0] eq 'n' and @path == 2) {
549          $id_prop->{title} = $title;          $id_prop->{title} = $title;
550          $id_prop->{'title-type'} = 'text/plain'; ## TODO: get_parameter          $id_prop->{'title-type'} = 'text/plain'; ## TODO: get_parameter
551    
552          require SWE::DB::VersionControl;          my $vc = $db->vc;
         my $vc = SWE::DB::VersionControl->new;  
553          local $content_db->{version_control} = $vc;          local $content_db->{version_control} = $vc;
554          local $id_prop_db->{version_control} = $vc;          local $id_prop_db->{version_control} = $vc;
555                    
# Line 677  if ($path[0] eq 'n' and @path == 2) { Line 675  if ($path[0] eq 'n' and @path == 2) {
675          $cgi->request_method eq 'PUT') {          $cgi->request_method eq 'PUT') {
676        my $id = $path[1] + 0;        my $id = $path[1] + 0;
677    
678        require SWE::DB::VersionControl;        my $vc = $db->vc;
       my $vc = SWE::DB::VersionControl->new;  
679        local $name_prop_db->{version_control} = $vc;        local $name_prop_db->{version_control} = $vc;
680        local $id_prop_db->{version_control} = $vc;        local $id_prop_db->{version_control} = $vc;
681                
# Line 894  if ($path[0] eq 'n' and @path == 2) { Line 891  if ($path[0] eq 'n' and @path == 2) {
891    }    }
892  } elsif ($path[0] eq 'new-page' and @path == 1) {  } elsif ($path[0] eq 'new-page' and @path == 1) {
893    if ($cgi->request_method eq 'POST') {    if ($cgi->request_method eq 'POST') {
     require SWE::DB::VersionControl;  
   
894      my $new_names = {};      my $new_names = {};
895      for (split /\x0D\x0A?|\x0A/, scalar $cgi->get_parameter ('names')) {      for (split /\x0D\x0A?|\x0A/, scalar $cgi->get_parameter ('names')) {
896        $new_names->{normalize_name ($_)} = 1;        $new_names->{normalize_name ($_)} = 1;
# Line 921  if ($path[0] eq 'n' and @path == 2) { Line 916  if ($path[0] eq 'n' and @path == 2) {
916    
917        my $id_lock = $id_locks->get_lock ($id);        my $id_lock = $id_locks->get_lock ($id);
918        $id_lock->lock;        $id_lock->lock;
919          
920        my $vc = SWE::DB::VersionControl->new;        my $vc = $db->vc;
921        local $content_db->{version_control} = $vc;        local $content_db->{version_control} = $vc;
922        local $id_prop_db->{version_control} = $vc;        local $id_prop_db->{version_control} = $vc;
923        $vc->add_file ($idgen->{file_name});        $vc->add_file ($idgen->{file_name});
# Line 964  if ($path[0] eq 'n' and @path == 2) { Line 959  if ($path[0] eq 'n' and @path == 2) {
959        $id_lock->unlock;        $id_lock->unlock;
960      }      }
961    
962      my $vc = SWE::DB::VersionControl->new;      my $vc = $db->vc;
963      local $name_prop_db->{version_control} = $vc;      local $name_prop_db->{version_control} = $vc;
964    
965      require SWE::DB::HashedHistory;      require SWE::DB::HashedHistory;
# Line 1418  sub convert_sw3_page ($$) { Line 1413  sub convert_sw3_page ($$) {
1413      my $id_lock = $id_locks->get_lock ($id);      my $id_lock = $id_locks->get_lock ($id);
1414      $id_lock->lock;      $id_lock->lock;
1415    
1416      require SWE::DB::VersionControl;      my $vc = $db->vc;
     my $vc = SWE::DB::VersionControl->new;  
1417      local $content_db->{version_control} = $vc;      local $content_db->{version_control} = $vc;
1418      local $id_prop_db->{version_control} = $vc;      local $id_prop_db->{version_control} = $vc;
1419      $vc->add_file ($idgen->{file_name});      $vc->add_file ($idgen->{file_name});
# Line 1472  sub convert_sw3_page ($$) { Line 1466  sub convert_sw3_page ($$) {
1466    
1467      $id_lock->unlock;      $id_lock->unlock;
1468    
1469      $vc = SWE::DB::VersionControl->new;      $vc = $db->vc;
1470      local $name_prop_db->{version_control} = $vc;      local $name_prop_db->{version_control} = $vc;
1471      local $sw3_pages->{version_control} = $vc;      local $sw3_pages->{version_control} = $vc;
1472            
Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24