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/21 05:19:39 UTC
cvs commit: embperl/eg/web/db epwebapp.pl
richter 2002/06/20 20:19:39
Modified: eg/web Tag: Embperl2c config.pl epwebapp.pl header.epl
menuleft.epl news.epl pod.xsl
eg/web/db Tag: Embperl2c epwebapp.pl
Log:
web site
Revision Changes Path
No revision
No revision
1.1.2.11 +1 -1 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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- config.pl 20 Jun 2002 07:05:20 -0000 1.1.2.10
+++ config.pl 21 Jun 2002 03:19:39 -0000 1.1.2.11
@@ -18,7 +18,7 @@
$self -> {basedepth} = 2 ;
$self -> {imageuri} = '../images/' ;
- $self -> {supported_languages} = ['de', 'en'] ;
+ $self -> {supported_languages} = ['en', 'de'] ;
# Embperl 2 source directory
$self -> {root} = $ENV{EMBPERL_SRC} . '/' ;
1.1.2.10 +15 -9 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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- epwebapp.pl 20 Jun 2002 07:05:20 -0000 1.1.2.9
+++ epwebapp.pl 21 Jun 2002 03:19:39 -0000 1.1.2.10
@@ -151,7 +151,6 @@
$r -> {config} = $config ;
- my $langs = $config -> {supported_languages} ;
my $uri = $r -> param -> uri ;
# we embed some parameters in the uri itself, to allow making a
@@ -172,9 +171,7 @@
$r -> {imageuri} = ('../' x $depth) . $config -> {imageuri} ;
$r -> {baseuri} = ('../' x $depth) ;
- warn "1 d = $r->{depth} bd = $config->{basedepth} #uri=$#uri uri = @uri new uri = $uri" ;
-
-
+ my $langs = $config -> {supported_languages} ;
# serach the url, if there is a language embeded,
# if yes remove it
$r -> {selected_language} = '' ;
@@ -192,6 +189,8 @@
}
$r -> param -> uri ($uri) ;
+ $r -> param -> language($langs -> [0]) if (!$r -> param -> language) ;
+
warn "2 d = $r->{depth} bd = $config->{basedepth} #uri=$#uri uri = @uri new uri = $uri" ;
@@ -254,7 +253,12 @@
$config -> xsltstylesheet('pod.xsl') ;
$r -> param -> uri =~ /^.*\/(.*)\.(.*?)$/ ;
- $param -> xsltparam({page => $r -> thread -> form_hash -> {page} || 0, basename => "'$1'", extension => "'$2'"}) ;
+ $param -> xsltparam({
+ page => $fdat{page} || 0,
+ basename => "'$1'",
+ extension => "'$2'",
+ imageuri => "'$r->{imageuri}'",
+ }) ;
return Embperl::Recipe::EmbperlXSLT -> get_recipe ($r, $recipe) ;
}
@@ -272,10 +276,12 @@
$config -> xsltstylesheet('pod.xsl') ;
$r -> param -> uri =~ /^.*\/(.*)\.(.*?)$/ ;
- my $fdat = $r -> thread -> form_hash ;
- $fdat->{page} ||= 0 ;
- $fdat->{basename} = "'$1'" ;
- $fdat->{extension} = "'$2'" ;
+ $param -> xsltparam({
+ page => $fdat{page} || 0,
+ basename => "'$1'",
+ extension => "'$2'",
+ imageuri => "'$r->{imageuri}'",
+ }) ;
return Embperl::Recipe::EmbperlPODXSLT -> get_recipe ($r, $recipe) ;
}
1.1.2.6 +3 -3 embperl/eg/web/Attic/header.epl
Index: header.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/header.epl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- header.epl 20 Jun 2002 07:05:20 -0000 1.1.2.5
+++ header.epl 21 Jun 2002 03:19:39 -0000 1.1.2.6
@@ -3,14 +3,14 @@
-]
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td valign="top" rowspan=2><img src="/eg/images/kopf-links.gif" width="206" height="97" usemap="#Map" border="0">
+ <td valign="top" rowspan=2><img src="[+ $r -> {imageuri} +]/kopf-links.gif" width="206" height="97" usemap="#Map" border="0">
<map name="Map">
<area shape="rect" coords="90,56,151,69" href="[+ $r -> app -> languri($r, $r -> param -> uri, 'de') +]" target="_top">
<area shape="rect" coords="90,70,151,82" href="[+ $r -> app -> languri($r, $r -> param -> uri, 'en') +]" target="_top">
</map>
</td>
- <td valign="top" width="50%"><img src="/eg/images/kopf-mitte.jpg" width="100%" height="46" vspace=0></td>
- <td valign="top"><img src="/eg/images/kopf-rechts-[+ $r -> param -> language eq 'de'?'deutsch':'engl' +].jpg" width="568" height="46" vspace=0></td>
+ <td valign="top" width="50%"><img src="[+ $r -> {imageuri} +]/kopf-mitte.jpg" width="100%" height="46" vspace=0></td>
+ <td valign="top"><img src="[+ $r -> {imageuri} +]/kopf-rechts-[+ $r -> param -> language eq 'de'?'deutsch':'engl' +].jpg" width="568" height="46" vspace=0></td>
</tr>
<tr>
<td colspan=2 valign="top" align=left>
1.1.2.5 +1 -0 embperl/eg/web/Attic/menuleft.epl
Index: menuleft.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/menuleft.epl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- menuleft.epl 20 Jun 2002 07:05:20 -0000 1.1.2.4
+++ menuleft.epl 21 Jun 2002 03:19:39 -0000 1.1.2.5
@@ -23,6 +23,7 @@
[*
my ($menu, $ndx, $top) = @_ ;
+local $^W = 0 ;
*]
[$ foreach my $item (@{$menu}) $]
1.1.2.5 +1 -1 embperl/eg/web/Attic/news.epl
Index: news.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/news.epl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- news.epl 20 Jun 2002 07:05:20 -0000 1.1.2.4
+++ news.epl 21 Jun 2002 03:19:39 -0000 1.1.2.5
@@ -21,7 +21,7 @@
'category_id' => 1,
'$max' => 15}) ;
} ;
- $dberr = "Error accessing $r->{dbdsn}: " . DBIx::Recordset -> LastError . $@ if (DBIx::Recordset -> LastError || $@) ;
+ $dberr = "Error accessing $config->{dbdsn}: " . DBIx::Recordset -> LastError . $@ if (DBIx::Recordset -> LastError || $@) ;
}
1.1.2.9 +5 -5 embperl/eg/web/Attic/pod.xsl
Index: pod.xsl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/pod.xsl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- pod.xsl 19 Jun 2002 04:19:15 -0000 1.1.2.8
+++ pod.xsl 21 Jun 2002 03:19:39 -0000 1.1.2.9
@@ -18,7 +18,7 @@
<xsl:output method="html" indent="yes" encoding="ISO-8859-1"/>
- <xsl:variable name="imagepath">/eg/images</xsl:variable>
+ <xsl:variable name="imageuri">/eg/images</xsl:variable>
<xsl:variable name="newswidth">152</xsl:variable>
<xsl:param name="page" select="0"/>
@@ -254,7 +254,7 @@
<xsl:template match="item" mode="item">
<tr class="cItemText">
<td valign="top">
- <img src="{$imagepath}/but.gif"/><xsl:text disable-output-escaping="yes">&nbsp;</xsl:text>
+ <img src="{$imageuri}/but.gif"/><xsl:text disable-output-escaping="yes">&nbsp;</xsl:text>
</td>
<td>
<xsl:apply-templates select="itemtext"/>
@@ -271,7 +271,7 @@
</tr>
<tr>
<td colspan="2">
- <img src="{$imagepath}/transp.gif" height="4"/>
+ <img src="{$imageuri}/transp.gif" height="4"/>
</td>
</tr>
</xsl:if>
@@ -367,7 +367,7 @@
<xsl:choose>
<xsl:when test="$page!=''">
- <a href="?{$page}"><xsl:value-of select="$txt"/></a>
+ <a href="{$basename}.-page-{$page}-.{$extension}"><xsl:value-of select="$txt"/></a>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="page">
@@ -379,7 +379,7 @@
<xsl:choose>
<xsl:when test="$page!=''">
- <a href="?page={$page}#sect_{$sect}"><xsl:value-of select="$txt"/></a>
+ <a href="{$basename}.-page-{$page}-.{$extension}#sect_{$sect}"><xsl:value-of select="$txt"/></a>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$txt"/>
No revision
No revision
1.1.2.7 +2 -0 embperl/eg/web/db/Attic/epwebapp.pl
Index: epwebapp.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/epwebapp.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- epwebapp.pl 20 Jun 2002 07:05:20 -0000 1.1.2.6
+++ epwebapp.pl 21 Jun 2002 03:19:39 -0000 1.1.2.7
@@ -1,6 +1,7 @@
use DBIx::Recordset ;
+use Data::Dumper ;
BEGIN { Execute ({isa => '../epwebapp.pl', syntax => 'Perl'}) ; }
@@ -61,6 +62,7 @@
'!DBIAttr' => { RaiseError => 1, PrintError => 1, LongReadLen => 32765, LongTruncOk => 0, },
}) ;
+ warn Dumper ($config -> {dbdsn}, $db) ;
$db -> TableAttr ('*', '!SeqClass', "DBIx::Recordset::FileSeq,$r->{root}/db") if ($^O eq 'MSWin32') ;
$db -> TableAttr ('*', '!Filter',
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org