perl-embperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject cvs commit: embperl/eg/web epwebapp.pl footer.htm
Date Mon, 14 Feb 2005 18:45:54 GMT
richter     2005/02/14 10:45:54

  Modified:    .        INSTALL.pod README
               eg/web   epwebapp.pl footer.htm
  Log:
  docs
  
  Revision  Changes    Path
  1.30      +1 -6      embperl/INSTALL.pod
  
  Index: INSTALL.pod
  ===================================================================
  RCS file: /home/cvs/embperl/INSTALL.pod,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- INSTALL.pod	11 Feb 2005 14:52:09 -0000	1.29
  +++ INSTALL.pod	14 Feb 2005 18:45:54 -0000	1.30
  @@ -112,11 +112,6 @@
   maintained by Angus Lees and are available from the usual Debian
   mirrors.
   
  -Note that libembperl-perl (Embperl v2) is currently only available
  -from the "unstable" distribution.  There are no pre-built
  -apache2/mod_perl2 packages currently available.
  -
  -
   =head2 UNIX (without Apache Source)
   
   If you have an UNIX with preinstalled Apache and mod_perl (e.g. a Linux 
  @@ -375,7 +370,7 @@
   See L<"perldoc IntroEmbperlObject"|"IntroEmbperlObject.pod"> for an step by step

   introduction to the OO features of Embperl.
   
  -See L<"perldoc EmbperlIntro2.pod"|"EmbperlIntro2.pod"> for Introduction to Embperl
2 
  +See L<"perldoc IntroEmbperl2.pod"|"IntroEmbperl2.pod"> for Introduction to Embperl
2 
   advanced features.
   
   See L<"perldoc Config"|"Config.pod"> for configuration and calling Embperl.
  
  
  
  1.39      +2 -2      embperl/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/embperl/README,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- README	11 Feb 2005 14:52:09 -0000	1.38
  +++ README	14 Feb 2005 18:45:54 -0000	1.39
  @@ -44,7 +44,7 @@
   Features of Embperl:            perldoc Features.pod
   Introduction to basic Embperl:  perldoc Intro.pod
   Introduction to Embperl 2 
  -advanced features:              perldoc EmbperlIntro2.pod
  +advanced features:              perldoc IntroEmbperl2.pod
   Introduction to EmbperlObject:  perldoc IntroEmbperlObject.pod
   Installation of Embperl:        perldoc INSTALL.pod
   Full documentation:             perldoc Config.pod
  
  
  
  1.8       +68 -47    embperl/eg/web/epwebapp.pl
  
  Index: epwebapp.pl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/epwebapp.pl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- epwebapp.pl	20 Feb 2003 21:22:50 -0000	1.7
  +++ epwebapp.pl	14 Feb 2005 18:45:54 -0000	1.8
  @@ -151,8 +151,8 @@
           return $path ;
           }
   
  -    # nothing found, so return a general error page
  -    return "$r->{config}{root}$r->{config}{basepath}notfound.htm" ;
  +    # nothing found
  +    return ;
       }
   
   
  @@ -225,7 +225,26 @@
      
   
       # map the request uri to the real filename    
  -    $pf = map_file ($r, join ('/', @uri)) ;
  +    my $uri = join ('/', @uri) ;
  +    $pf = map_file ($r, $uri) ;
  +    
  +    # try different location to statisfy links in pod via xslt 
  +    if (!$pf && ($uri =~ s/doc/intro/))
  +        {
  +        $pf = map_file ($r, $uri) ;
  +        if (!$pf && ($uri =~ s/intro/list/))
  +            {
  +            $pf = map_file ($r, $uri) ;
  +            if (!$pf && ($uri =~ s/list\///))
  +                {
  +                $pf = map_file ($r, $uri) ;
  +                }
  +            }
  +        }                            
  +
  +    # nothing found, so return a general error page
  +    $pf = "$r->{config}{root}$r->{config}{basepath}notfound.htm" if (!$pf) ;
  +
       $r -> param -> filename ($pf) ;      # tell Embperl the filename
       $r -> apache_req -> filename ($pf) ; # tell Apache the filename
   
  @@ -270,66 +289,68 @@
   
      
   
  -    if ($src eq 'pl')
  +    if ($src)
           {
  -        $config -> syntax('Perl') ;
  -        return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  -        }
  -
  -    if ($src eq 'pod' || $src eq 'pm')
  -        {
  -        $config -> escmode(0) ;
  -        if ($dest eq 'pod')
  +        if ($src eq 'pl')
               {
  -            $config -> syntax('Text') ;
  +            $config -> syntax('Perl') ;
               return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
               }
   
  -        $config -> syntax('POD') ;
  -        if ($dest eq 'xml')
  +        if ($src eq 'pod' || $src eq 'pm')
               {
  -            return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  -            }
  +            $config -> escmode(0) ;
  +            if ($dest eq 'pod')
  +                {
  +                $config -> syntax('Text') ;
  +                return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +                }
  +
  +            $config -> syntax('POD') ;
  +            if ($dest eq 'xml')
  +                {
  +                return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +                }
   
  -        $class -> set_xslt_param ($r, $config, $param) ;
  -        return Embperl::Recipe::EmbperlXSLT -> get_recipe ($r, $recipe) ;
  -        }
  -    
  -    if ($src eq 'xml')
  -        {
  -        $class -> set_xslt_param ($r, $config, $param) ;
  -        return Embperl::Recipe::EmbperlXSLT -> get_recipe ($r, $recipe) ;
  -        }
  +            $class -> set_xslt_param ($r, $config, $param) ;
  +            return Embperl::Recipe::EmbperlXSLT -> get_recipe ($r, $recipe) ;
  +            }
       
  -    if ($src eq 'epd')
  -        {
  -        $config -> escmode(0) ;
  -        $config -> options($config -> options | &Embperl::Constant::optKeepSpaces)
;
  -
  -        if ($dest eq 'pod')
  +        if ($src eq 'xml')
               {
  -            $config -> syntax('EmbperlBlocks') ;
  -            return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +            $class -> set_xslt_param ($r, $config, $param) ;
  +            return Embperl::Recipe::EmbperlXSLT -> get_recipe ($r, $recipe) ;
               }
  +    
  +        if ($src eq 'epd')
  +            {
  +            $config -> escmode(0) ;
  +            $config -> options($config -> options | &Embperl::Constant::optKeepSpaces)
;
   
  +            if ($dest eq 'pod')
  +                {
  +                $config -> syntax('EmbperlBlocks') ;
  +                return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +                }
   
  -        $class -> set_xslt_param ($r, $config, $param) ;
  -        return Embperl::Recipe::EmbperlPODXSLT -> get_recipe ($r, $recipe) ;
  -        }
  +
  +            $class -> set_xslt_param ($r, $config, $param) ;
  +            return Embperl::Recipe::EmbperlPODXSLT -> get_recipe ($r, $recipe) ;
  +            }
       
  -    if ($src eq 'epl' || $src eq 'htm')
  -        {
  -        $config -> syntax('Embperl') ;
  -        return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  -        }
  +        if ($src eq 'epl' || $src eq 'htm')
  +            {
  +            $config -> syntax('Embperl') ;
  +            return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +            }
   
  -    if ($src eq 'mail')
  -        {
  -        $config -> syntax('EmbperlBlocks') ;
  -        return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +        if ($src eq 'mail')
  +            {
  +            $config -> syntax('EmbperlBlocks') ;
  +            return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
  +            }
           }
   
  -
       $config -> syntax('Text') ;
       return Embperl::Recipe::Embperl -> get_recipe ($r, $recipe) ;
       }
  
  
  
  1.6       +1 -1      embperl/eg/web/footer.htm
  
  Index: footer.htm
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/footer.htm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- footer.htm	23 Jan 2004 06:50:58 -0000	1.5
  +++ footer.htm	14 Feb 2005 18:45:54 -0000	1.6
  @@ -1,6 +1,6 @@
   <hr>
   <table width="100%" border=0 cellspacing=0 cellpadding=0><tr>
  -<td align=left class="cFoot">&copy; 1997-2004 Gerald Richter / <a href="http://www.ecos.de/">ecos
gmbh</a></td>
  +<td align=left class="cFoot">&copy; 1997-2005 Gerald Richter / <a href="http://www.ecos.de/">ecos
gmbh</a></td>
   [$if $udat{user_id} $]
   <td align=right class="cFoot">
   [= logged_in_as =] [+ $udat{user_email} +]
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org


Mime
View raw message