richter 01/03/26 02:29:19
Modified: . Tag: Embperl2c epcmd2.c epcomp.c
Embperl Tag: Embperl2c Syntax.pm
Embperl/Syntax Tag: Embperl2c EmbperlHTML.pm
test/cmp Tag: Embperl2c input.htm table.htm
test/cmp2 Tag: Embperl2c input.htm
test/html Tag: Embperl2c input.htm table.htm
Log:
Embperl 2 - bug fixes
Revision Changes Path
No revision
No revision
1.4.2.4 +18 -2 embperl/Attic/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcmd2.c,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- epcmd2.c 2000/09/14 05:08:27 1.4.2.3
+++ epcmd2.c 2001/03/26 10:29:17 1.4.2.4
@@ -66,14 +66,30 @@
if (bEqual)
{
Element_selfSetAttribut (pDomTree, pNode, sAttrName, nAttrLen, NULL, 0, 1)
;
- }
+ if (r -> bDebug & dbgInput)
+ lprintf (r, "[%d]INPU: Set Attribut: Name: '%*.*s' Value: '%*.*s'
Attribute: '%*.*s'\n", r -> nPid, nNameLen, nNameLen, pName, nValLen, nValLen, pVal,
nAttrLen, nAttrLen, sAttrName) ;
+ }
else
+ {
Element_selfRemoveAttribut (pDomTree, pNode, sAttrName, nAttrLen, 1) ;
+ if (r -> bDebug & dbgInput)
+ lprintf (r, "[%d]INPU: Remove Attribut: Name: '%*.*s' Value: '%*.*s'
Attribute: '%*.*s'\n", r -> nPid, nNameLen, nNameLen, pName, nValLen, nValLen, pVal,
nAttrLen, nAttrLen, sAttrName ) ;
+ }
}
else
+ {
if (Element_selfGetAttribut (pDomTree, pNode, sAttrName, nAttrLen))
+ {
hv_store (pCurrReq -> pInputHash, (char *)pName, nNameLen, newSVpv
((nValLen?((char *)pVal):""), nValLen), 0) ;
-
+ if (r -> bDebug & dbgInput)
+ lprintf (r, "[%d]INPU: Has already Attribut: Name: '%*.*s' Value:
'%*.*s' Attribute: '%*.*s'\n", r -> nPid, nNameLen, nNameLen, pName, nValLen, nValLen,
pVal, nAttrLen, nAttrLen, sAttrName ) ;
+ }
+ else
+ {
+ if (r -> bDebug & dbgInput)
+ lprintf (r, "[%d]INPU: No value in %%fdat for Attribut: Name: '%*.*s'
Value: '%*.*s' Attribute: '%*.*s'\n", r -> nPid, nNameLen, nNameLen, pName, nValLen,
nValLen, pVal, nAttrLen, nAttrLen, sAttrName ) ;
+ }
+ }
}
/* ---------------------------------------------------------------------------- */
1.4.2.40 +5 -2 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.39
retrieving revision 1.4.2.40
diff -u -r1.4.2.39 -r1.4.2.40
--- epcomp.c 2001/03/23 09:28:11 1.4.2.39
+++ epcomp.c 2001/03/26 10:29:17 1.4.2.40
@@ -314,10 +314,13 @@
eq++ ;
do
{
+ char * f ;
+
or = strchr (eq + 1, '|') ;
e = or?or:q ;
- if (strstrn (sText, eq, e - eq))
- break ;
+ if (f = strstrn (sText, eq, e - eq))
+ if (!isalnum (f[e - eq]))
+ break ;
if (or == NULL)
return 0 ;
eq = or + 1 ;
No revision
No revision
1.1.4.28 +2 -1 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.27
retrieving revision 1.1.4.28
diff -u -r1.1.4.27 -r1.1.4.28
--- Syntax.pm 2001/03/23 13:51:45 1.1.4.27
+++ Syntax.pm 2001/03/26 10:29:17 1.1.4.28
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.27 2001/03/23 13:51:45 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.28 2001/03/26 10:29:17 richter Exp $
#
###################################################################################
@@ -1314,6 +1314,7 @@
=item %<X>B<~><N>:<value1>|<value2>|<value3>%
Attribute/Child etc. must contain the substring <value1> or <value2> etc.
+and a non alphanum character must follow the substring.
=back
No revision
No revision
1.1.2.4 +4 -4 embperl/Embperl/Syntax/Attic/EmbperlHTML.pm
Index: EmbperlHTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlHTML.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EmbperlHTML.pm 2001/03/06 12:33:49 1.1.2.3
+++ EmbperlHTML.pm 2001/03/26 10:29:18 1.1.2.4
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlHTML.pm,v 1.1.2.3 2001/03/06 12:33:49 richter Exp $
+# $Id: EmbperlHTML.pm,v 1.1.2.4 2001/03/26 10:29:18 richter Exp $
#
###################################################################################
@@ -112,7 +112,7 @@
$self -> AddTagBlock ('select', ['name'], undef, undef,
{
stackname2 => 'htmlselect',
- push2 => '%&*name%',
+ push2 => '%&*\'name%',
perlcode => 'l%$x%: for (my $row = 0; $row < $maxrow; $row++) {'
,
perlcodeend => '} %?*-htmltable%' ,
@@ -127,8 +127,8 @@
{
perlcode =>
[
- '_ep_opt (%$n%, %^*\'htmlselect%, %&*\'value%);',
- '_ep_opt (%$n%, %^*\'htmlselect%, %>*\'0%);',
+ '_ep_opt (%$n%, %^*htmlselect%, %&*\'value%);',
+ '_ep_opt (%$n%, %^*htmlselect%, %>*\'0%);',
]
}) ;
$self -> AddTagWithStart ('/option', 'option') ;
No revision
No revision
1.12.4.2 +11 -0 embperl/test/cmp/input.htm
Index: input.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/input.htm,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- input.htm 2000/09/14 05:53:57 1.12.4.1
+++ input.htm 2001/03/26 10:29:18 1.12.4.2
@@ -288,6 +288,17 @@
<option value="Wert8">Wert8</option>
</select>
+ <select name="feld5">
+ <option value="Wert1">Wert1</option>
+ <option value="Wert2">Wert2</option>
+ <option value="Wert3">Wert3</option>
+ <option value="Wert4">Wert4</option>
+ <option value="Wert5" selected>Wert5</option>
+ <option value="Wert6">Wert6</option>
+ <option value="Wert7">Wert7</option>
+ <option value="Wert8">Wert8</option>
+ </select>
+
<input type="checkbox" value="Wert1" name="mult" >
<input type="checkbox" value="Wert1" name="mult">
<input type="checkbox" value="Wert2" name="mult" >
1.5.6.4 +12 -0 embperl/test/cmp/table.htm
Index: table.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/table.htm,v
retrieving revision 1.5.6.3
retrieving revision 1.5.6.4
diff -u -r1.5.6.3 -r1.5.6.4
--- table.htm 2000/12/20 07:32:38 1.5.6.3
+++ table.htm 2001/03/26 10:29:18 1.5.6.4
@@ -320,6 +320,18 @@
</tr>
</table>
+<table border="6.1" width="100%">
+ <tr>
+ <td>a2/1</td>
+ </tr>
+ <tr>
+ <td>a1/1 </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+</table>
+
<table border="7">
<tr>
<TD BGCOLOR="#F4A460">a1/1 </td>
No revision
No revision
1.1.2.3 +11 -0 embperl/test/cmp2/Attic/input.htm
Index: input.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/input.htm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- input.htm 2000/09/14 05:08:31 1.1.2.2
+++ input.htm 2001/03/26 10:29:18 1.1.2.3
@@ -255,6 +255,17 @@
<option value="Wert8">Wert8</option>
</select>
+ <select name="feld5">
+ <option value="Wert1">Wert1</option>
+ <option value="Wert2">Wert2</option>
+ <option value="Wert3">Wert3</option>
+ <option value="Wert4">Wert4</option>
+ <option value="Wert5" selected>Wert5</option>
+ <option value="Wert6">Wert6</option>
+ <option value="Wert7">Wert7</option>
+ <option value="Wert8">Wert8</option>
+ </select>
+
<input type="checkbox" value="Wert1" name="mult">
<input type="checkbox" value="Wert1" name="mult">
<input type="checkbox" value="Wert2" name="mult">
No revision
No revision
1.10.4.6 +11 -0 embperl/test/html/input.htm
Index: input.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/input.htm,v
retrieving revision 1.10.4.5
retrieving revision 1.10.4.6
diff -u -r1.10.4.5 -r1.10.4.6
--- input.htm 2001/03/07 14:23:59 1.10.4.5
+++ input.htm 2001/03/26 10:29:19 1.10.4.6
@@ -186,6 +186,17 @@
<option value="Wert8">Wert8</option>
</select>
+ <select name="[- $eld = 'eld' -]f[+ $eld +][+ 5 +]">
+ <option value="Wert1">Wert1</option>
+ <option value="Wert2">Wert2</option>
+ <option value="Wert3">Wert3</option>
+ <option value="Wert4">Wert4</option>
+ <option value="Wert5">Wert5</option>
+ <option value="Wert6">Wert6</option>
+ <option value="Wert7">Wert7</option>
+ <option value="Wert8">Wert8</option>
+ </select>
+
<input type="checkbox" value="Wert1" name="mult" checked>
<input type="checkbox" value="Wert1" name="mult">
<input type="checkbox" value="Wert2" name="mult" checked>
1.4.6.4 +12 -0 embperl/test/html/table.htm
Index: table.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/table.htm,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -r1.4.6.3 -r1.4.6.4
--- table.htm 2000/12/20 07:32:39 1.4.6.3
+++ table.htm 2001/03/26 10:29:19 1.4.6.4
@@ -136,6 +136,18 @@
</tr>
</table>
+<table border="6.1" width="100%">
+ <tr>
+ <td>[+ $a[$rows+1][0] +]</td>
+ </tr>
+ <tr>
+ <td>[+ $a[$rows][0] +] </td>
+ </tr>
+ <tr>
+ <td>[+ $rows +] </td>
+ </tr>
+</table>
+
<table border="7">
<tr>
<TD BGCOLOR="[+ ($row &
1)?(($col&1)?'#7CFC00':'#A4A4B4'):(($col&1)?'#FFFF00':'#F4A460') +]">[+ $a[$row][$col]
+] </td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
