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.6 by williamc, Fri Nov 19 15:27:46 1999 UTC vs.
Revision 1.7 by williamc, Tue Nov 23 17:20:40 1999 UTC

# Line 57 | Line 57 | sub parse {
57          $parselabel=shift;
58  
59          my $file=$self->file();
60        print "Parse called on file $file\n";
60          if ( $file ) {
61 +          $self->{currentparser}=$self->{parsers}{$parselabel};
62            $self->{parsers}{$parselabel}->parse($file,@_);
63 +          delete $self->{currentparser};
64          }
65          else {
66            print "Cannot parse - file not known\n";
# Line 132 | Line 133 | sub getfile() {
133          my $origurl=shift;
134  
135          my $fileref;
135        print "GETFILE called\n";
136          my ($url, $file)=$self->{urlhandler}->get($origurl);
137          # do we already have an appropriate object?
138 <        #my ($fileref)=$self->config()->find("__preprocessed",$url);
139 <        undef $fileref;
138 >        ($fileref)=$self->config()->find($url);
139 >        #undef $fileref;
140          if (  defined $fileref ) {
141           print "found $url in database ----\n";
142           $fileref->update();
# Line 150 | Line 150 | sub getfile() {
150           $fileref=ActiveDoc::PreProcessedFile->new($self->config());
151           $fileref->url($url);
152           $fileref->update();
153         $self->config()->store($fileref,"__preprocessed",$url);
153          }
155        print "---------- returning".$fileref."\n";
154          return $fileref;
155   }
156  
# Line 188 | Line 186 | sub checktag {
186   }
187  
188   sub line {
189 <        $self=shift;
189 >        my $self=shift;
190          my ($line, $fileobj)=
191 <                $self->{Processedfile}->line($self->{switch}->line());
191 >                $self->{PPfile}->line($self->{currentparser}->line());
192          return ($line, $fileobj);
193   }
194  
195 + sub tagstartline {
196 +        my $self=shift;
197 +        my ($line, $fileobj)=$self->{PPfile}->line(
198 +                $self->{currentparser}->tagstartline());
199 +        return ($line, $fileobj);
200 + }
201 +
202   sub file {
203          my $self=shift;
204  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines