You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2002/06/24 21:58:28 UTC
cvs commit: embperl/eg/web config.pl epwebapp.pl
richter 2002/06/24 12:58:28
Modified: . Tag: Embperl2c MANIFEST
eg/web Tag: Embperl2c config.pl epwebapp.pl
Log:
web site
Revision Changes Path
No revision
No revision
1.50.4.52 +1 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.51
retrieving revision 1.50.4.52
diff -u -r1.50.4.51 -r1.50.4.52
--- MANIFEST 24 Jun 2002 19:22:29 -0000 1.50.4.51
+++ MANIFEST 24 Jun 2002 19:58:28 -0000 1.50.4.52
@@ -1,3 +1,4 @@
+Config.pod
CVS.pod
Changes.pod
Cmd.xs
No revision
No revision
1.1.2.13 +4 -0 embperl/eg/web/Attic/config.pl
Index: config.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/config.pl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- config.pl 24 Jun 2002 09:22:47 -0000 1.1.2.12
+++ config.pl 24 Jun 2002 19:58:28 -0000 1.1.2.13
@@ -40,6 +40,10 @@
{
$self -> {lib_dbix} = $lib_dbix ;
}
+ elsif (-e (dirname($lib_dbix) . '/DBIx/Intrors.pod'))
+ {
+ $self -> {lib_dbix} = dirname($lib_dbix) ;
+ }
else
{
$self -> {lib_dbix} = '' ;
1.1.2.12 +6 -6 embperl/eg/web/Attic/epwebapp.pl
Index: epwebapp.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/epwebapp.pl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- epwebapp.pl 24 Jun 2002 09:22:47 -0000 1.1.2.11
+++ epwebapp.pl 24 Jun 2002 19:58:28 -0000 1.1.2.12
@@ -39,7 +39,7 @@
{
if (($m -> {path} =~ /^\%(.*?)\%/))
{
- warn "path=$m->{path}, 1=$1 c1=$config->{$1}" ;
+ #warn "path=$m->{path}, 1=$1 c1=$config->{$1}" ;
if ($config -> {$1})
{
my $val = $config -> {$1} ;
@@ -51,7 +51,7 @@
}
}
}
- elsif (!$m -> {file})
+ elsif (!$m -> {file} && !exists $m -> {path})
{
$m -> {path} = $root . $config -> {baseuri} . $m -> {relurl} ;
$m -> {path} .= 'index.htm' if ($m -> {path} =~ m#/$#) ;
@@ -60,12 +60,12 @@
{
$m -> {path} = { map { $_ => $root . $m->{file}{$_} } keys %{$m->{file}} } ;
}
- else
+ elsif (!exists $m -> {path})
{
$m -> {path} = $root . $m->{file} ;
$m -> {path} .= 'index.htm' if ($m -> {path} =~ m#/$#) ;
}
- #if ($m -> {relurl})
+ if ($m -> {path})
{
$config -> {map1}{$m -> {relurl}} = $m ;
$config -> {map2}{$1} = $m if ($m -> {relurl} =~ /^(.*)\./ );
@@ -124,7 +124,7 @@
# if we found something, setup $r -> {menuitem} to hold the menu
# tree we need to display for this page
- if ($m)
+ if ($m && $m -> {path})
{
my @menuitems = ($m) ;
my $item = $m ;
@@ -210,7 +210,7 @@
$r -> param -> language($langs -> [0]) if (!$r -> param -> language) ;
- warn "2 d = $r->{depth} bd = $config->{basedepth} #uri=$#uri uri = @uri new uri = $uri" ;
+ #warn "2 d = $r->{depth} bd = $config->{basedepth} #uri=$#uri uri = @uri new uri = $uri" ;
# get the menu data and create a tree structure out of it if not already done
$r -> {menu} = $config -> get_menu ($r) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org