richter 2003/02/15 06:09:56
Modified: eg/web epwebapp.pl
Log:
fix problem with language selection
Revision Changes Path
1.6 +13 -1 embperl/eg/web/epwebapp.pl
Index: epwebapp.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/epwebapp.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- epwebapp.pl 16 Jan 2003 07:14:34 -0000 1.5
+++ epwebapp.pl 15 Feb 2003 14:09:56 -0000 1.6
@@ -193,6 +193,8 @@
# serach the url, if there is a language embeded,
# if yes remove it
$r -> {selected_language} = '' ;
+ my $accept_lang = $r -> param -> language ;
+ my $lang_ok = 0 ;
foreach (@$langs)
{
if ($uri[0] eq $_)
@@ -204,10 +206,14 @@
$r -> {baseuri} = ('../' x ($depth - 1)) ; # we want to stay in the
same language tree
last ;
}
+ elsif ($accept_lang && $_ eq $accept_lang)
+ {
+ $lang_ok = 1 ;
+ }
}
$r -> param -> uri ($uri) ;
- $r -> param -> language($langs -> [0]) if (!$r -> param -> language) ;
+ $r -> param -> language($langs -> [0]) if (!$r -> param -> language ||
!$lang_ok) ;
#warn "2 d = $r->{depth} bd = $config->{basedepth} #uri=$#uri uri = @uri new
uri = $uri" ;
@@ -284,6 +290,12 @@
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) ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
