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

Comparing COMP/SCRAM/src/ActiveDoc/PreProcessedFile.pm (file contents):
Revision 1.5 by williamc, Fri Feb 18 10:32:16 2000 UTC vs.
Revision 1.7 by williamc, Mon Feb 21 17:36:13 2000 UTC

# Line 46 | Line 46 | sub realline {
46            $inc=$self->{includesdesc}[$i];
47            $startline=$inc->startline();
48            last if ( $line <= $startline );
49 <          if ( $line >= ($inc->lines()+$startline+2) ) {
49 >          if ( $line >= ($inc->lines()+$startline+2) ) {
50 >                                        # take out the 2 carriage returns added
51              $line=$line-($inc->lines()+$startline-$inc->endline())-2;
51 #+($inc->endline()-$startline);
52                           # n lines in original map to m lines in expanded
53        print "Included file lines = ".$inc->lines()." +2 \n";
54        print "Start tag= $startline , endtag=".$inc->endline()."\n";
53            }
54            else { # must be in the include file
55 <        print "Passing $line-$startline \n";
56 <            ($line, $fileob)=$self->{includes}[$i]->
59 <                                        realline($line-$startline);
55 >            ($line, $fileob)=$self->{includes}[$i]->realline($line-$startline);
56 >            last;
57            }
58          }
59          
# Line 73 | Line 70 | sub url {
70          my $self=shift;
71  
72          if ( @_ ) {
73 <          my $url=shift;
74 <          ($self->{url}, $file)=$self->{urlhandler}->get($url);
75 <        }
76 <        else {
77 <          $self->{url};
78 <        }
73 >        my $url=shift;
74 >          ($self->{url}, $file)=$self->{urlhandler}->get($url);
75 >        }
76 >        else {
77 >          $self->{url};
78 >        }
79   }
80  
81   sub ProcessedFile {
# Line 93 | Line 90 | sub file {
90          return $file;
91   }
92  
93 + sub ProcessFile {
94 +        my $self=shift;
95 +        return $self->file();
96 + }
97  
98   sub update {
99          my $self=shift;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines