49 |
|
if ( $line >= ($inc->lines()+$startline+2) ) { |
50 |
|
# take out the 2 carriage returns added |
51 |
|
$line=$line-($inc->lines()+$startline-$inc->endline())-2; |
52 |
– |
#+($inc->endline()-$startline); |
52 |
|
# n lines in original map to m lines in expanded |
54 |
– |
print "Included file lines = ".$inc->lines()." +2 \n"; |
55 |
– |
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]-> |
60 |
< |
realline($line-$startline); |
55 |
> |
($line, $fileob)=$self->{includes}[$i]->realline($line-$startline); |
56 |
> |
last; |
57 |
|
} |
58 |
|
} |
59 |
|
|
87 |
|
my $self=shift; |
88 |
|
|
89 |
|
my ($url, $file)=$self->{urlhandler}->get($self->url()); |
90 |
+ |
$self->verbose("Getting file ".$self->url()." = $file"); |
91 |
|
return $file; |
92 |
|
} |
93 |
|
|
128 |
|
if ( $rv != 0 ) { |
129 |
|
$self->verbose(" Need to Update ".$self->url()); |
130 |
|
# ---- sort out the preprocessed file in the cache |
131 |
< |
my $newfile=$self->config()->cache()-> |
135 |
< |
filename($outfile); |
131 |
> |
my $newfile=$self->config()->cache()->filename($outfile); |
132 |
|
$self->config()->cache()->store($outfile,$newfile); |
133 |
|
|
134 |
|
$self->process($self->config()->cache()->file($self->url()),$newfile); |