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/02/12 17:55:01 UTC
cvs commit: embperl/test/html input.htm
richter 02/02/12 08:55:01
Modified: . Tag: Embperl2c Embperl.pm epapinit.c
eg/web Tag: Embperl2c base.epl config.pl epwebapp.pl
footer.htm messages.pl
eg/web/db Tag: Embperl2c add.epl content.epl data.epd
epwebapp.pl show.epl
eg/webutil Tag: Embperl2c EmbperlWebRecipe.pm db.schema
test/conf Tag: Embperl2c httpd.conf.src
test/html Tag: Embperl2c input.htm
Log:
embperl web
Revision Changes Path
No revision
No revision
1.118.4.87 +3 -3 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.86
retrieving revision 1.118.4.87
diff -u -r1.118.4.86 -r1.118.4.87
--- Embperl.pm 10 Feb 2002 21:26:14 -0000 1.118.4.86
+++ Embperl.pm 12 Feb 2002 16:55:00 -0000 1.118.4.87
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.86 2002/02/10 21:26:14 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.87 2002/02/12 16:55:00 richter Exp $
#
###################################################################################
@@ -55,11 +55,11 @@
-if (!defined(&Embperl::Init))
+#if (!defined(&Embperl::Init))
{
bootstrap Embperl $VERSION;
Boot ($VERSION) ;
- Init (defined(&Apache::server)?Apache -> server:undef, undef) if (!$importno);
+ Init (defined(&Apache::server)?Apache -> server:undef, undef) ;
}
1.1.2.18 +4 -1 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- epapinit.c 12 Feb 2002 09:11:44 -0000 1.1.2.17
+++ epapinit.c 12 Feb 2002 16:55:00 -0000 1.1.2.18
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.17 2002/02/12 09:11:44 richter Exp $
+# $Id: epapinit.c,v 1.1.2.18 2002/02/12 16:55:00 richter Exp $
#
###################################################################################*/
@@ -218,6 +218,7 @@
}
else
embperl_DefaultAppConfig (pConfig) ;
+ /* ### */ embperl_GetCGIAppConfig (pThread, pPool, pConfig, 0) ;
return ok ;
}
@@ -238,6 +239,7 @@
}
else
embperl_DefaultReqConfig (pConfig) ;
+ /* ### */ embperl_GetCGIReqConfig (pApp, pPool, pConfig, 0) ;
return ok ;
}
@@ -258,6 +260,7 @@
}
else
embperl_DefaultComponentConfig (pConfig) ;
+ /* ### */ embperl_GetCGIComponentConfig (pReq, pPool, pConfig, 0) ;
return ok ;
}
No revision
No revision
1.1.2.3 +10 -0 embperl/eg/web/Attic/base.epl
Index: base.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/base.epl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- base.epl 12 Feb 2002 09:11:44 -0000 1.1.2.2
+++ base.epl 12 Feb 2002 16:55:01 -0000 1.1.2.3
@@ -5,6 +5,16 @@
<html>
<head>
<title>Embperl</title>
+ <style type="text/css">
+ .cInput {background: #DDDDDD; }
+ .cText {background: #AFBDCA; }
+ .cSectionInput {background: #ddaaaa; }
+ .cSectionText {background: #ddaaaa; }
+ .cTabsOn {background: #ddaaaa; font-size: 14px; }
+ .cTabsOff {background: #DDDDDD; font-size: 14px; }
+ body {font-family: Geneva,Arial,Helvetica; font-size: 12px; }
+ table {font-family: Geneva,Arial,Helvetica; font-size: 12px; }
+ </style>
</head>
<body bgcolor="#ffffff">
[- Execute ('header.epl') -]
1.1.2.3 +10 -6 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- config.pl 12 Feb 2002 09:11:44 -0000 1.1.2.2
+++ config.pl 12 Feb 2002 16:55:01 -0000 1.1.2.3
@@ -9,6 +9,7 @@
'Examples' => 'Beispiele',
'Changes' => '�nderungen',
'Sites using Embperl' => 'Websites mit Embperl',
+ 'Add info about Embperl' => 'Hinzuf�gen �ber Embperl',
}
) ;
@@ -56,12 +57,15 @@
{ menu => 'Examples', uri => 'examples/' },
{ menu => 'Changes', uri => 'pod/Changes.htm', file => 'Changes.pod' },
{ menu => 'Sites using Embperl', uri => 'pod/Sites.htm', file => 'Sites.pod' },
- { menu => 'Hinzuf�gen', uri => 'db/addsel.epl' },
- { menu => 'Hinzuf�gen', uri => 'db/add.epl' },
- { menu => 'Hinzuf�gen', uri => 'db/show.epl' },
- { menu => 'Hinzuf�gen', uri => 'db/data.epd' },
- { menu => 'News', uri => 'db/news/news.htm', file => 'eg/web/db/data.epd', fdat => { 'category_id' => 5 } },
- { menu => 'Sites using Embperl', uri => 'db/sites/sites.htm', file => 'eg/web/db/data.epd', fdat => { 'category_id' => 6 } },
+ { menu => 'News', uri => 'db/news/news.htm', file => 'eg/web/db/data.epd', fdat => { 'category_id' => 1 } },
+ { menu => 'Sites using Embperl', uri => 'db/sites/sites.htm', file => 'eg/web/db/data.epd', fdat => { 'category_id' => 2 } },
+ { menu => 'Add info about Embperl', uri => 'db/addsel.epl', same =>
+ [
+ { menu => 'Hinzuf�gen', uri => 'db/add.epl' },
+ { menu => 'Hinzuf�gen', uri => 'db/show.epl'},
+ { menu => 'Hinzuf�gen', uri => 'db/data.epd' },
+ ],
+ },
) ;
1.1.2.3 +11 -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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epwebapp.pl 12 Feb 2002 09:11:44 -0000 1.1.2.2
+++ epwebapp.pl 12 Feb 2002 16:55:01 -0000 1.1.2.3
@@ -39,6 +39,7 @@
}
fill_menu ($config, $m -> {sub}, $subbase, $root, $m) if ($m -> {sub}) ;
+ fill_menu ($config, $m -> {same}, $baseuri, $root, $parent) if ($m -> {same}) ;
}
}
@@ -51,6 +52,7 @@
my $m ;
$uri =~ /^(.*)\./ ;
+ print STDERR "map_file\n" ;
if (($m = $config -> {map1}{$uri} || $config -> {map2}{$1}))
{
my @menuitems = ($m) ;
@@ -60,19 +62,22 @@
unshift @menuitems, $item ;
}
$r -> {menuitems} = \@menuitems ;
- my $path = $m -> {path} ;
- if (ref $path)
- {
- return $path -> {$r -> param -> language} || $path -> {'en'} ;
- }
+ print STDERR "fdat hash $m->{fdat}\n" ;
if ($m -> {fdat})
{
while (my ($k, $v) = each %{$m -> {fdat}})
{
$fdat{$k} = $v ;
+ print STDERR "fdat $k = $v \n" ;
}
}
+ my $path = $m -> {path} ;
+ if (ref $path)
+ {
+ return $path -> {$r -> param -> language} || $path -> {'en'} ;
+ }
+
return $path ;
}
return "$r->{root}$r->{baseuri}notfound.htm" ;
@@ -95,7 +100,7 @@
$r -> param -> filename ($pf) ;
use Data::Dumper ;
- print STDERR Dumper ($r -> {menu}, $r -> param -> uri, $pf) ;
+ print STDERR Dumper ($r -> {menu}, $r -> param -> uri, $pf, \%fdat) ;
Execute ({inputfile => 'messages.pl', syntax => 'Perl'}) ;
1.1.2.2 +1 -1 embperl/eg/web/Attic/footer.htm
Index: footer.htm
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/footer.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- footer.htm 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ footer.htm 12 Feb 2002 16:55:01 -0000 1.1.2.2
@@ -1 +1 @@
-<hr><font size="1">© 1997-2001 Gerald Richter / ecos gmbh</font>
\ No newline at end of file
+<hr><font size="1">© 1997-2002 Gerald Richter / ecos gmbh</font>
\ No newline at end of file
1.1.2.3 +2 -0 embperl/eg/web/Attic/messages.pl
Index: messages.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/messages.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- messages.pl 12 Feb 2002 09:11:44 -0000 1.1.2.2
+++ messages.pl 12 Feb 2002 16:55:01 -0000 1.1.2.3
@@ -15,6 +15,7 @@
'heading' => '�berschrift',
'url' => 'URL',
'description' => 'Beschreibung',
+ 'show2' => 'Folgender Eintrag wurde erfolgreich der Datenbank hinzugef�gt',
},
'en' =>
{
@@ -28,6 +29,7 @@
'heading' => 'Heading',
'url' => 'URL',
'description' => 'Description',
+ 'show2' => 'The following entry has been sucessfully added to the database',
},
) ;
No revision
No revision
1.1.2.2 +4 -4 embperl/eg/web/db/Attic/add.epl
Index: add.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/add.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- add.epl 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ add.epl 12 Feb 2002 16:55:01 -0000 1.1.2.2
@@ -1,6 +1,6 @@
[- $r = shift -]
-<table>
+<table width="100%">
<tr bgcolor="#fefcad">
<td><font size="4">[= add1 =] [+ $r -> {category_set}{category} +]</font></td>
</tr>
@@ -8,7 +8,7 @@
-<form action="[+ $r -> param -> uri +]">
+<form action="show.epl" method="POST">
[= add2 =]<br><br>
@@ -18,8 +18,8 @@
</tr>
</table>
-<table>
- <tr bgcolor="#fefcad">
+<table width="100%">
+ <tr bgcolor="#fefcad"><font size="3">
[- $rec = $r -> {language_set}[$row] -]
<td>[+ $rec -> {name} +]</td>
</tr>
1.1.2.3 +5 -3 embperl/eg/web/db/Attic/content.epl
Index: content.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/content.epl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- content.epl 12 Feb 2002 09:11:45 -0000 1.1.2.2
+++ content.epl 12 Feb 2002 16:55:01 -0000 1.1.2.3
@@ -1,5 +1,7 @@
-[#<img src="/eg/images/aim/h_leer.gif/Annotate?text=Database maintaince&gravity=NorthWest&pointsize=16&antialias=true&y=-6&x=3&font=/usr/msrc/fonts/ocraext.ttf" width="152" height="19"><br><br>#]
-
<hr>
-<font size="2" face="Verdana, Arial, Helvetica, sans-serif">[- Execute ({inputfile => '*'}) -]
+[- $r = shift -]
+[$if $r -> param -> uri !~ /html?$|epl$/ $]<pre>[$endif$]
+[- Execute ({inputfile => '*'}) -]
+[$if $r -> param -> uri !~ /html?$|epl$/ $]</pre>[$endif$]
+
1.1.2.2 +8 -7 embperl/eg/web/db/Attic/data.epd
Index: data.epd
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/data.epd,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- data.epd 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ data.epd 12 Feb 2002 16:55:01 -0000 1.1.2.2
@@ -9,19 +9,20 @@
[+ $r -> {category_set}{category} +]
-=head1 x
-
-x
-
-=over 4
[$ while ($rec = $$set -> Next) $]
-=item [+ $rec -> {heading} +]
+=head1 [+ $rec -> {heading} +]
[+ $rec -> {description} +]
[$endwhile$]
-=back
+
+
+=head1 fdat
+
+[- use Data::Dumper ; print OUT Dumper (\%fdat) -]
+
+
1.1.2.3 +107 -26 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epwebapp.pl 12 Feb 2002 09:11:45 -0000 1.1.2.2
+++ epwebapp.pl 12 Feb 2002 16:55:01 -0000 1.1.2.3
@@ -12,43 +12,76 @@
$self -> SUPER::init ($r) ;
- $DBIx::Recordset::Debug = 2 ;
- *DBIx::Recordset::LOG = \*STDERR ;
- my $db = DBIx::Database -> new ({'!DataSource' => $r -> {dbdsn},
- '!Username' => $r -> {dbuser},
- '!Password' => $r -> {dbpassword},
- '!DBIAttr' => { RaiseError => 1, PrintError => 1 },
-
- }) ;
+ $self -> initdb ($r) ;
+
+ my $db = $r -> {db} ;
- $db -> TableAttr ('*', '!SeqClass', "DBIx::Recordset::FileSeq,$r->{root}/db") if ($^O eq 'MSWin32') ;
- $r -> {db} = $db ;
$r -> {language_set} = DBIx::Recordset -> Search ({'!DataSource' => $db,
'!Table' => 'language'}) ;
if ($fdat{-add_category})
{
$self -> add_category ($r) ;
+ $self -> get_category($r) ;
}
elsif ($fdat{-add_item})
{
$self -> add_item ($r) ;
+ $self -> get_category($r) ;
+ $self -> get_item_lang($r) ;
+ }
+ elsif ($fdat{-show_item})
+ {
+ $self -> get_category($r) ;
+ $self -> get_item_lang($r) ;
+ }
+ else
+ {
+ $self -> get_category($r) ;
+ $self -> get_item($r) ;
}
+ return 0 ;
+ }
- $r -> {category_set} = DBIx::Recordset -> Search ({'!DataSource' => $db,
- '!Table' => 'category, categorytext',
- '!TabRelation' => 'category_id = category.id',
- 'language_id' => $r -> param -> language,
- $fdat{category_id}?(category_id => $fdat{category_id}):()}) ;
- $r -> {item_set} = DBIx::Recordset -> Search ({'!DataSource' => $db,
- '!Table' => 'link, linktext',
- '!TabRelation' => 'link_id = link.id',
- 'language_id' => $r -> param -> language,
- $fdat{category_id}?(category_id => $fdat{category_id}):(),
- $fdat{link_id}?(link_id => $fdat{link_id}):()}) ;
- return 0 ;
+# ----------------------------------------------------------------------------
+
+sub initdb
+ {
+ my $self = shift ;
+ my $r = shift ;
+
+
+ $DBIx::Recordset::Debug = 2 ;
+ *DBIx::Recordset::LOG = \*STDERR ;
+ my $db = DBIx::Database -> new ({'!DataSource' => $r -> {dbdsn},
+ '!Username' => $r -> {dbuser},
+ '!Password' => $r -> {dbpassword},
+ '!DBIAttr' => { RaiseError => 1, PrintError => 1 },
+
+ }) ;
+
+ $db -> TableAttr ('*', '!SeqClass', "DBIx::Recordset::FileSeq,$r->{root}/db") if ($^O eq 'MSWin32') ;
+ $db -> TableAttr ('*', '!Filter',
+ {
+ 'creationtime' => [\¤t_time, undef, DBIx::Recordset::rqINSERT ],
+ 'modtime' => [\¤t_time, undef, DBIx::Recordset::rqINSERT + DBIx::Recordset::rqUPDATE ],
+ }) ;
+
+ $r -> {db} = $db ;
+
+ }
+
+# ----------------------------------------------------------------------------
+
+sub current_time
+
+ {
+ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+ localtime(time);
+
+ return "$year-$mon-$mday $hour:$min:$sec" ;
}
@@ -87,7 +120,7 @@
my $r = shift ;
my $set = DBIx::Recordset -> Insert ({'!DataSource' => $r -> {db},
- '!Table' => 'link',
+ '!Table' => 'item',
'!Serial' => 'id',
url => $fdat{url},
category_id => $fdat{category_id},
@@ -95,18 +128,66 @@
my $id = $$set -> LastSerial ;
my $langset = $r -> {language_set} ;
my $txtset = DBIx::Recordset -> Setup ({'!DataSource' => $r -> {db},
- '!Table' => 'linktext'}) ;
+ '!Table' => 'itemtext'}) ;
$$langset -> Reset ;
while ($rec = $$langset -> Next)
{
- $$txtset -> Insert ({link_id => $id,
+ $$txtset -> Insert ({item_id => $id,
language_id => $rec->{id},
description => $fdat{"description_$rec->{id}"},
url => $fdat{"url_$rec->{id}"} || $fdat{url},
heading => $fdat{"heading_$rec->{id}"}}) if ($fdat{"heading_$rec->{id}"}) ;
}
- $fdat{link_id} = $id ;
+ $fdat{item_id} = $id ;
}
+
+
+
+# ----------------------------------------------------------------------------
+
+sub get_category
+ {
+ my $self = shift ;
+ my $r = shift ;
+
+ $r -> {category_set} = DBIx::Recordset -> Search ({'!DataSource' => $r -> {db},
+ '!Table' => 'category, categorytext',
+ '!TabRelation' => 'category_id = category.id',
+ 'language_id' => $r -> param -> language,
+ $fdat{category_id}?(category_id => $fdat{category_id}):()}) ;
+
+ }
+
+
+# ----------------------------------------------------------------------------
+
+sub get_item
+ {
+ my $self = shift ;
+ my $r = shift ;
+
+ $r -> {item_set} = DBIx::Recordset -> Search ({'!DataSource' => $r -> {db},
+ '!Table' => 'item, itemtext',
+ '!TabRelation' => 'item_id = item.id',
+ 'language_id' => $r -> param -> language,
+ $fdat{category_id}?(category_id => $fdat{category_id}):(),
+ $fdat{item_id}?(item_id => $fdat{item_id}):()}) ;
+ }
+
+
+# ----------------------------------------------------------------------------
+
+sub get_item_lang
+ {
+ my $self = shift ;
+ my $r = shift ;
+
+ $r -> {item_set} = DBIx::Recordset -> Search ({'!DataSource' => $r -> {db},
+ '!Table' => 'item, itemtext, language',
+ '!TabRelation' => 'item_id = item.id and language_id = language.id',
+ $fdat{category_id}?(category_id => $fdat{category_id}):(),
+ $fdat{item_id}?(item_id => $fdat{item_id}):()}) ;
+ }
\ No newline at end of file
1.1.2.2 +7 -14 embperl/eg/web/db/Attic/show.epl
Index: show.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/db/Attic/show.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- show.epl 12 Feb 2002 09:11:45 -0000 1.1.2.1
+++ show.epl 12 Feb 2002 16:55:01 -0000 1.1.2.2
@@ -1,9 +1,8 @@
[-
$r = shift ;
-$item_set = $r -> {item_set} ;
-]
-<table>
+<table width="100%">
<tr bgcolor="#fefcad">
<td><font size="4">[= add1 =] [+ $r -> {category_set}{category} +]</font></td>
</tr>
@@ -12,30 +11,24 @@
-[= add2 =]<br><br>
+[= show2 =]<br><br>
-<table>
- <tr>
- <td>URL:</td><td><input type="text" name="url" size=80></td>
- </tr>
-</table>
-
-<table>
+<table width="100%">
<tr bgcolor="#fefcad">
- [- $rec = $r -> {language_set}[$row] -]
+ [- $rec = $r -> {item_set}[$row] -]
<td>[+ $rec -> {name} +]</td>
</tr>
<tr>
<td>
<table>
<tr>
- <td>[= heading =]:</td><td>[+ $item_set -> {heading} +]</td>
+ <td>[= heading =]:</td><td>[+ $rec -> {heading} +]</td>
</tr>
<tr>
- <td>[= url =]:</td><td>[+ $item_set -> {url} +]</td>
+ <td>[= url =]:</td><td>[+ $rec -> {url} +]</td>
</tr>
<tr>
- <td>[= description =]:</td><td>[+ do { $txt = $item_set -> {description} ; $txt =~ s/\\n/\\\\<br\\>/g; $txt } +]</td>
+ <td>[= description =]:</td><td>[+ do { $txt = $rec -> {description} ; $txt =~ s/\\n/\\\\<br\\>/g; $txt } +]</td>
</tr>
</table>
</td>
No revision
No revision
1.1.2.2 +5 -1 embperl/eg/webutil/Attic/EmbperlWebRecipe.pm
Index: EmbperlWebRecipe.pm
===================================================================
RCS file: /home/cvs/embperl/eg/webutil/Attic/EmbperlWebRecipe.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- EmbperlWebRecipe.pm 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ EmbperlWebRecipe.pm 12 Feb 2002 16:55:01 -0000 1.1.2.2
@@ -59,9 +59,13 @@
return Embperl::Recipe::Embperl -> new ($r, $recipe) ;
}
+
$config -> xsltstylesheet('pod.xsl') ;
$r -> param -> uri =~ /^.*\/(.*)(\..*?)$/ ;
- $param -> xsltparam({page => $r -> thread -> form_hash -> {page} || 0, basename => "'$1'", extension => "'$2'"}) ;
+ my $fdat = $r -> thread -> form_hash ;
+ $fdat->{page} ||= 0 ;
+ $fdat->{basename} = "'$1'" ;
+ $fdat->{extension} = "'$2'" ;
return Embperl::Recipe::EmbperlPODXSLT -> new ($r, $recipe) ;
}
1.1.2.2 +33 -4 embperl/eg/webutil/Attic/db.schema
Index: db.schema
===================================================================
RCS file: /home/cvs/embperl/eg/webutil/Attic/db.schema,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- db.schema 12 Feb 2002 07:20:36 -0000 1.1.2.1
+++ db.schema 12 Feb 2002 16:55:01 -0000 1.1.2.2
@@ -8,7 +8,7 @@
### ###
### - Datenbankschema - ###
### ###
-### $Id: db.schema,v 1.1.2.1 2002/02/12 07:20:36 richter Exp $ ###
+### $Id: db.schema,v 1.1.2.2 2002/02/12 16:55:01 richter Exp $ ###
### ###
###############################################################################
###############################################################################
@@ -37,7 +37,7 @@
# ----------------------------------------------------------------------
{
- '!Table' => 'link',
+ '!Table' => 'item',
'!Fields' =>
[
'id' => 'counter',
@@ -55,11 +55,11 @@
# ----------------------------------------------------------------------
{
- '!Table' => 'linktext',
+ '!Table' => 'itemtext',
'!Fields' =>
[
'id' => 'counter',
- 'link_id' => 'integer',
+ 'item_id' => 'integer',
'language_id' => 'char(2)',
'heading' => 'tinytext',
'keywords' => 'text',
@@ -79,6 +79,11 @@
'name' => 'tinytext',
],
'!PrimKey' => 'id',
+ '!Init' =>
+ [
+ { id => 'de', name => 'Deutsch'} ,
+ { id => 'en', name => 'English'} ,
+ ],
},
# ----------------------------------------------------------------------
@@ -91,6 +96,15 @@
'state' => 'integer',
],
'!PrimKey' => 'id',
+ '!Init' =>
+ [
+ { id => 1, state => 1 } ,
+ { id => 2, state => 1 } ,
+ { id => 3, state => 1 } ,
+ { id => 4, state => 1 } ,
+ { id => 5, state => 1 } ,
+ { id => 6, state => 1 } ,
+ ],
},
# ----------------------------------------------------------------------
@@ -105,6 +119,21 @@
'category' => 'tinytext',
],
'!PrimKey' => 'id',
+ '!Init' =>
+ [
+ { id => 1, category_id => 1, language_id => 'de', 'category' => 'Neuigkeiten' } ,
+ { id => 2, category_id => 1, language_id => 'en', 'category' => 'News' } ,
+ { id => 3, category_id => 2, language_id => 'de', 'category' => 'Websites die Embperl nutzen' } ,
+ { id => 4, category_id => 2, language_id => 'en', 'category' => 'Sites using Embperl' } ,
+ { id => 5, category_id => 3, language_id => 'de', 'category' => 'B�cher die Embperl behandeln' } ,
+ { id => 6, category_id => 3, language_id => 'en', 'category' => 'Books that talk about Embperl' } ,
+ { id => 7, category_id => 4, language_id => 'de', 'category' => 'Artikel �ber Embperl (on- und offline)' } ,
+ { id => 8, category_id => 4, language_id => 'en', 'category' => 'Article about Embperl (on- and offline)' } ,
+ { id => 9, category_id => 5, language_id => 'de', 'category' => 'Syntaxhervorhebungen f�r Texteditoren' } ,
+ { id => 10, category_id => 5, language_id => 'en', 'category' => 'Syntaxhighlighting for texteditors' } ,
+ { id => 11, category_id => 6, language_id => 'de', 'category' => 'Module und Beispiele f�r Embperl' } ,
+ { id => 12, category_id => 6, language_id => 'en', 'category' => 'Modules and examples for Embperl' } ,
+ ],
},
# ----------------------------------------------------------------------
No revision
No revision
1.24.4.37 +2 -2 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.36
retrieving revision 1.24.4.37
diff -u -r1.24.4.36 -r1.24.4.37
--- httpd.conf.src 12 Feb 2002 09:11:45 -0000 1.24.4.36
+++ httpd.conf.src 12 Feb 2002 16:55:01 -0000 1.24.4.37
@@ -129,7 +129,7 @@
#PerlModule Embperl
-Embperl_UseEnv on
+#Embperl_UseEnv on
<Location /embperl/log>
@@ -531,7 +531,7 @@
<Location /eg/web>
-EMBPERL_RECIPE EmbperlWeb
+SetEnv EMBPERL_RECIPE EmbperlWeb
SetEnv EMBPERL_ALLOW .
No revision
No revision
1.10.4.10 +5 -0 embperl/test/html/input.htm
Index: input.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/input.htm,v
retrieving revision 1.10.4.9
retrieving revision 1.10.4.10
diff -u -r1.10.4.9 -r1.10.4.10
--- input.htm 2 May 2001 11:54:56 -0000 1.10.4.9
+++ input.htm 12 Feb 2002 16:55:01 -0000 1.10.4.10
@@ -274,6 +274,11 @@
[$endforeach$]
+ [$ foreach $i (1,5,2,6) $]
+ <textarea name="feld[+ $i +]">[+ $i > 2?"feld$i":'' +]</textarea>
+ <textarea name="feld[+ $i +]"></textarea>
+
+ [$endforeach$]
[$ foreach $i (5,2,6,1) $]
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org