[Openinteract-commits] CVS: OpenInteract/pkg/system_doc/OpenInteract/Handler SystemDoc.pm,1.7,1.8

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/system_doc/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv25485/pkg/system_doc/OpenInteract/Handler

Modified Files:
	SystemDoc.pm 
Log Message:
modify to reflect server configuration file changes


Index: SystemDoc.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/system_doc/OpenInteract/Handler/SystemDoc.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SystemDoc.pm	2001/08/24 21:00:23	1.7
--- SystemDoc.pm	2001/10/17 04:47:08	1.8
***************
*** 18,23 ****
  $OpenInteract::Handler::SystemDoc::default_method    = 'listing';
  @OpenInteract::Handler::SystemDoc::forbidden_methods = qw( _colonify _uncolonify );
! %OpenInteract::Handler::SystemDoc::security          = ( 
!  listing => SEC_LEVEL_READ,  show   => SEC_LEVEL_READ, 
  );
  
--- 18,23 ----
  $OpenInteract::Handler::SystemDoc::default_method    = 'listing';
  @OpenInteract::Handler::SystemDoc::forbidden_methods = qw( _colonify _uncolonify );
! %OpenInteract::Handler::SystemDoc::security          = (
!  listing => SEC_LEVEL_READ,  show   => SEC_LEVEL_READ,
  );
  
***************
*** 28,36 ****
      my ( $class, $p ) = @_;
      my $R = OpenInteract::Request->instance;
!     my $params = { error_msg   => $p->{error_msg}, 
                     main_script => MAIN_SCRIPT  };
      $R->{page}->{title} = 'OpenInteract System Documentation / Menu';
!     return $R->template->handler( {}, $params, 
!                                   { db      => 'system_doc_menu', 
                                      package => 'system_doc' } );
  }
--- 28,36 ----
      my ( $class, $p ) = @_;
      my $R = OpenInteract::Request->instance;
!     my $params = { error_msg   => $p->{error_msg},
                     main_script => MAIN_SCRIPT  };
      $R->{page}->{title} = 'OpenInteract System Documentation / Menu';
!     return $R->template->handler( {}, $params,
!                                   { db      => 'system_doc_menu',
                                      package => 'system_doc' } );
  }
***************
*** 41,45 ****
      my ( $class, $p ) = @_;
      my $R = OpenInteract::Request->instance;
!     my $params = { error_msg   => $p->{error_msg}, 
                     main_script => MAIN_SCRIPT };
  
--- 41,45 ----
      my ( $class, $p ) = @_;
      my $R = OpenInteract::Request->instance;
!     my $params = { error_msg   => $p->{error_msg},
                     main_script => MAIN_SCRIPT };
  
***************
*** 48,53 ****
      # so we can read the files from 'doc/' directly
  
!     my $repos = OpenInteract::PackageRepository->fetch( 
!                                      undef, 
                                       { directory => $R->CONFIG->{dir}->{base} } );
      my $pkg_list   = $repos->fetch_all_packages();
--- 48,53 ----
      # so we can read the files from 'doc/' directly
  
!     my $repos = OpenInteract::PackageRepository->fetch(
!                                      undef,
                                       { directory => $R->CONFIG->{dir}->{base} } );
      my $pkg_list   = $repos->fetch_all_packages();
***************
*** 75,79 ****
                      my ( $filename, $title ) = /^([\w.]+)\s+(.*)$/;
                      $R->DEBUG && $R->scrib( 1, "Found $filename / $title from $_" );
!                     push @{ $pkg->{tmp_doc_list} }, 
                                       { filename => $filename, title => $title };
                  }
--- 75,79 ----
                      my ( $filename, $title ) = /^([\w.]+)\s+(.*)$/;
                      $R->DEBUG && $R->scrib( 1, "Found $filename / $title from $_" );
!                     push @{ $pkg->{tmp_doc_list} },
                                       { filename => $filename, title => $title };
                  }
***************
*** 90,105 ****
          # Ensure that we get no tmp files and that the file exists
  
!         my @doc_files = grep { -f "$doc_dir/$_" } 
!                         grep ! /^(tmp|\.|\_)/, 
!                         grep ! /~$/, 
                          readdir( DOC );
          closedir( DOC );
!         $pkg->{tmp_doc_list} = [ map { { filename => $_, 
!                                          title    => "$_ (no title)" } } 
                                   @doc_files ];
      }
      $params->{package_list} = $pkg_list;
      $R->{page}->{title} = 'OpenInteract Package Documentation';
!     return $R->template->handler( {}, $params, 
                                    { db      => 'package_doc',
                                      package => 'system_doc' } );
--- 90,105 ----
          # Ensure that we get no tmp files and that the file exists
  
!         my @doc_files = grep { -f "$doc_dir/$_" }
!                         grep ! /^(tmp|\.|\_)/,
!                         grep ! /~$/,
                          readdir( DOC );
          closedir( DOC );
!         $pkg->{tmp_doc_list} = [ map { { filename => $_,
!                                          title    => "$_ (no title)" } }
                                   @doc_files ];
      }
      $params->{package_list} = $pkg_list;
      $R->{page}->{title} = 'OpenInteract Package Documentation';
!     return $R->template->handler( {}, $params,
                                    { db      => 'package_doc',
                                      package => 'system_doc' } );
***************
*** 121,125 ****
      my %this_inc = %INC;
      my @top = ();
!     my $website_name = $R->CONFIG->{website_name};
      $R->DEBUG && $R->scrib( 1, "Website name being filtered: ($website_name)" );
  
--- 121,125 ----
      my %this_inc = %INC;
      my @top = ();
!     my $website_name = $R->CONFIG->{server_info}{website_name} || $R->CONFIG->{website_name};
      $R->DEBUG && $R->scrib( 1, "Website name being filtered: ($website_name)" );
  
***************
*** 155,159 ****
                  $curr_parent   = $first;
                  $curr_parent   =~ s/\.pm$//;
!                 $top[ $count ] = [ $curr_parent, [] ]; #  _colonify( $curr_parent ) 
              }
              $R->DEBUG && $R->scrib( 1, "Found package $full_pkg" );
--- 155,159 ----
                  $curr_parent   = $first;
                  $curr_parent   =~ s/\.pm$//;
!                 $top[ $count ] = [ $curr_parent, [] ]; #  _colonify( $curr_parent )
              }
              $R->DEBUG && $R->scrib( 1, "Found package $full_pkg" );
***************
*** 163,169 ****
      $params->{module_list}  = \@top;
      $R->DEBUG && $R->scrib( 1, "Number of module parents found: ", scalar @top );
!   
      $R->{page}->{title} = 'OpenInteract System Documentation / Module Documentation';
!     return $R->template->handler( {}, $params, 
                                    { db      => 'system_module_listing',
                                      package => 'system_doc' } );
--- 163,169 ----
      $params->{module_list}  = \@top;
      $R->DEBUG && $R->scrib( 1, "Number of module parents found: ", scalar @top );
!  
      $R->{page}->{title} = 'OpenInteract System Documentation / Module Documentation';
!     return $R->template->handler( {}, $params,
                                    { db      => 'system_module_listing',
                                      package => 'system_doc' } );