ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/ActiveDoc/ActiveDoc.pm
(Generate patch)

Comparing COMP/SCRAM/src/ActiveDoc/ActiveDoc.pm (file contents):
Revision 1.16 by williamc, Thu Jan 20 18:40:39 2000 UTC vs.
Revision 1.18 by williamc, Wed Jan 26 12:28:06 2000 UTC

# Line 265 | Line 265 | sub activatedoc {
265          # now parse it for the <DocType> tag
266          my $tempdoc=ActiveDoc::ActiveDoc->new($self->config());
267          $tempdoc->{urlhandler}=$self->{urlhandler};
268 <        $tempdoc->url($url);
268 >        my $fullurl=$tempdoc->url($url);
269 >        $url=$fullurl;
270          $tempdoc->{doctypefound}=0;
271          $tempdoc->newparse("doctype");
272          $tempdoc->addtag("doctype","Doc", \&Doc_Start, $tempdoc,
# Line 304 | Line 305 | sub parseerror {
305          my $self=shift;
306          my $string=shift;
307  
308 <        ($line, $file)=$self->line();
309 <        print "Parse Error in ".$file->url().", line ".
308 >        if ( ! defined $self->{currentparse} ) {
309 >                $self->error($string);
310 >        }
311 >        else {
312 >         ($line, $file)=$self->line();
313 >         print "Parse Error in ".$file->url().", line ".
314                                          $line."\n";
315 <        print $string."\n";
316 <        die;
315 >         print $string."\n";
316 >         die;
317 >        }
318   }
319  
320   sub checktag {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines