richter 00/11/03 00:48:11
Modified: . Tag: Embperl2c epmain.c test.pl
Log:
Embperl 2 - fix import from EmbperlObject -> base
Revision Changes Path
No revision
No revision
1.75.4.10 +1 -1 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.9
retrieving revision 1.75.4.10
diff -u -r1.75.4.9 -r1.75.4.10
--- epmain.c 2000/10/31 08:02:48 1.75.4.9
+++ epmain.c 2000/11/03 08:48:08 1.75.4.10
@@ -2780,7 +2780,7 @@
{
oCommit (r, NULL) ;
#ifdef EP2
- if (!bError && !r -> bEP1Compat)
+ if (!bError && !r -> bEP1Compat && !r -> pImportStash)
{
tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
Node_toString (pDomTree, r, pDomTree -> xDocument) ;
1.70.4.16 +7 -6 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.15
retrieving revision 1.70.4.16
diff -u -r1.70.4.15 -r1.70.4.16
--- test.pl 2000/11/02 08:45:21 1.70.4.15
+++ test.pl 2000/11/03 08:48:08 1.70.4.16
@@ -563,7 +563,6 @@
print "-f file to use for config.pl\n" ;
print "-x do not start httpd\n" ;
print "-u use unique filenames\n" ;
- print "-n do not check httpd errorlog\n" ;
print "-q set debug to 0\n" ;
print "-i ignore errors\n" ;
print "-t list tests\n" ;
@@ -1176,7 +1175,7 @@
$err = CmpFiles ($outfile, $org) if ($err == 0) ;
print "ok\n" unless ($err) ;
- if ($err == 0)
+ if ($err == 0 || $opt_ignoreerror)
{
$txt2 = "$txt from memory...";
$txt2 .= ' ' x (30 - length ($txt2)) ;
@@ -1197,7 +1196,7 @@
print "ok\n" unless ($err) ;
}
- if ($err == 0)
+ if ($err == 0 || $opt_ignoreerror)
{
$txt2 = "$txt to memory...";
$txt2 .= ' ' x (30 - length ($txt2)) ;
@@ -1223,7 +1222,7 @@
print "ok\n" unless ($err) ;
}
- if ($err == 0)
+ if ($err == 0 || $opt_ignoreerror)
{
$txt2 = "$txt from/to memory...";
$txt2 .= ' ' x (30 - length ($txt2)) ;
@@ -1267,7 +1266,7 @@
$seen{"o:$src"} = 1 ;
- if ($err == 0)
+ if ($err == 0 || $opt_ignoreerror)
{
$txt2 = "$txt to memory...";
$txt2 .= ' ' x (30 - length ($txt2)) ;
@@ -1302,7 +1301,7 @@
foreach $src ('EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm')
{
- if ($err == 0 && $version == 1)
+ if ($err == 0 || $opt_ignoreerror) # && $version == 1)
{
$src =~ m#^.*/(.*?)$# ;
$org = "$cmppath/$1" ;
@@ -1340,6 +1339,8 @@
close STDERR ;
open (STDERR, ">&SAVEERR") ;
}
+
+ $err = 0 if ($opt_ignoreerror) ;
#############
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
