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.25.2.1.2.7 by williamc, Thu Aug 24 10:00:38 2000 UTC

# Line 7 | Line 7
7   #
8   # Interface
9   # ---------
10 < # new()         : A new ActiveDoc object
10 > # new(ActiveStore)              : A new ActiveDoc object
11   # url()         : Return/set the docs url - essential
12   # file()        : Return the local filename of document
13 + # ProcessFile() : Return the filename of PreProcessed document
14   #
15 < # parse(parselabel): Parse the document file for the given parse level
15 < # newparse(parselabel) : Create a new parse type
16 < # addtag(parselabel,tagname,start,obj,text,obj,end,obj)
17 < #                               : Add tags to the parse given by label
18 < # newdoc(file)  : Return an new object of the appropriate type
15 > # parent()         : return the object ref of the calling parent
16   # getfile(url)  : get a processedfile object given a url
17 < # config([ActiveConfig]) : Set up/return Configuration for the document
21 < # basequery([ActiveConfig]) : Set up/return UserQuery for the doc
22 < # copydocconfig(ActiveDoc) : Copy the basic configuration from the ActiveDoc
23 < # copydocquery(ActiveDoc) : Copy the basicquery from the ActiveDoc
17 > # activatedoc(url) : Return the object ref for a doc described by the given url
18   #
19   # -- error methods --
20   # error(string)       : Report an general error to the user
21   # parseerror(string)  : Report an error during parsing a file
22 < # line()              : Return the current line number of the document
23 < #                       and the ProcessedFileObj it is in
22 > # line([linenumber])     : Return the line number of the document
23 > #                       and the ProcessedFileObj it is in corresponding to the
24 > #                       supplied number of the expanded document
25 > #                       If no number supplied - the currentparse number will be #                       used
26  
27   package ActiveDoc::ActiveDoc;
28   require 5.004;
29 < use ActiveDoc::Parse;
34 < use ActiveDoc::ActiveConfig;
29 > use ActiveDoc::SimpleURLDoc;
30   use ActiveDoc::PreProcessedFile;
31 < use ObjectUtilities::ObjectBase;
37 < use URL::URLhandler;
31 > use Utilities::Verbose;
32  
33 < @ISA = qw(ObjectUtilities::ObjectBase);
33 > @ISA = qw(ActiveDoc::SimpleURLDoc Utilities::Verbose);
34  
35   sub new {
36          my $class=shift;
37 <        $self={};
37 >        my $self={};
38          bless $self, $class;
39 <        $self->config(shift);
40 <        
41 <        # A URL handler per document
42 <        $self->{urlhandler}=URL::URLhandler->new($self->config()->cache());
43 <
50 <        $self->init(@_);
39 >        $self->{Ostore}=shift;
40 >        $self->cache($self->{Ostore}->cache());
41 >        $self->{dbstore}=$self->{Ostore};
42 >        $self->_initdoc("doc",@_);
43 > #       $self->{switch}=ActiveDoc::SimpleURLDoc->new($self->{cache});
44          return $self;
45   }
46  
54 # ----- parse related routines --------------
55 sub parse {
56        my $self=shift;
57        $parselabel=shift;
58
59        my $file=$self->file();
60        print "Parse called on file $file\n";
61        if ( $file ) {
62          $self->{parsers}{$parselabel}->parse($file,@_);
63        }
64        else {
65          print "Cannot parse - file not known\n";
66        }
67 }
68
69 sub newparse {
70        my $self=shift;
71        my $parselabel=shift;
72
73        $self->{parsers}{$parselabel}=ActiveDoc::Parse->new();
74        $self->{parsers}{$parselabel}->addignoretags();
75        $self->{parsers}{$parselabel}->addgrouptags();
76 }
77
78 sub addtag {
79        my $self=shift;
80        my $parselabel=shift;
81        if ( $#_ != 6 ) {
82                $self->error("Incorrect addtags specification\n".
83                                "called with :\n@_ \n");
84        }
85        $self->{parsers}{$parselabel}->addtag(@_);
86 }
87
88 sub addurltags {
89        my $self=shift;
90        my $parselabel=shift;
91        
92        $self->{parsers}{$parselabel}->
93                addtag("Base", \&Base_start, $self, "", $self,
94                        \&Base_end, $self);
95 }
96
47   sub url {
48          my $self=shift;
49 <        @_ ?$self->{File}=$self->getfile(shift)
50 <            : $self->{File};
51 < }
52 <
53 < sub copydocconfig {
54 <        my $self=shift;
55 <        my $ActiveDoc=shift;
56 <        
57 <        $self->config($ActiveDoc->config());
58 <
59 < }
110 <
111 < sub copydocquery {
112 <        my $self=shift;
113 <        my $ActiveDoc=shift;
114 <
115 <         $self->basequery($ActiveDoc->basequery());
116 < }
117 <
118 < sub config {
119 <        my $self=shift;
120 <        @_?$self->{ActiveConfig}=shift
121 <           : $self->{ActiveConfig};
122 < }
123 <
124 < sub basequery {
125 <        my $self=shift;
126 <        @_ ? $self->{UserQuery}=shift
127 <           : $self->{UserQuery};
49 >        # get file & preprocess
50 >        if ( @_  ) {
51 >                $self->{origurl}=shift;
52 >                $self->{File}=$self->getfile($self->{origurl});
53 >                $self->filetoparse($self->{File}->ProcessedFile());
54 >                $self->verbose("url downloaded to ".$self->{File}->ProcessedFile());
55 >        }
56 >        if ( defined $self->{File} ) {
57 >          return $self->{File}->url();
58 >        }
59 >        else { return "undefined"; }
60   }
61  
62 < sub getfile() {
62 > sub getfile {
63          my $self=shift;
64          my $origurl=shift;
65  
66          my $fileref;
67 <        print "GETFILE called\n";
68 <        my ($url, $file)=$self->{urlhandler}->get($origurl);
67 >        my ($url, $file);
68 >        if ( 0 ) {
69 >             $self->verbose("Forced download of $origurl");
70 >             ($url, $file)=$self->urldownload($origurl);
71 >        }
72 >        else {
73 >           $self->verbose("Attempting to get $origurl");
74 >           ($url, $file)=$self->urlget($origurl);
75 >        }
76          # do we already have an appropriate object?
77 <        #my ($fileref)=$self->config()->find("__preprocessed",$url);
139 <        undef $fileref;
77 >        ($fileref)=$self->{dbstore}->find($url);
78          if (  defined $fileref ) {
79 <         print "found $url in database ----\n";
79 >         $self->verbose("Found $url in database");
80           $fileref->update();
81          }
82          else {
83           if ( $file eq "" ) {
84             $self->parseerror("Unable to get $origurl");
85           }
86 <         #-- set up a new preprocess file
87 <         print "Making a new file $url----\n";
88 <         $fileref=ActiveDoc::PreProcessedFile->new($self->config());
86 >         # -- set up a new preprocess file
87 >         $self->verbose("Making a new preprocessed file $url");
88 >         $fileref=ActiveDoc::PreProcessedFile->new($self->{Ostore});
89 >         #$fileref->cache($self->{cache});
90           $fileref->url($url);
91           $fileref->update();
153         $self->config()->store($fileref,"__preprocessed",$url);
92          }
155        print "---------- returning".$fileref."\n";
93          return $fileref;
94   }
95  
96 < # -------- Error Handling and Error services --------------
96 > sub activatedoc {
97 >        my $self=shift;
98 >        my $url=shift;
99  
100 < sub error {
101 <        my $self=shift;
102 <        my $string=shift;
100 >        # first get a preprocessed copy of the file
101 >        my $fileobj=$self->getfile($url);
102 >
103 >        # now parse it for the <Doc> tag
104 >        my $tempdoc=ActiveDoc::SimpleURLDoc->new($self->{cache});
105 >        $tempdoc->filetoparse($fileobj->ProcessFile());
106 >        my ($doctype,$docversion)=$tempdoc->doctype();
107 >        undef $tempdoc;
108 >        
109 >        if ( ! defined $doctype ) {
110 >          $self->parseerror("No <Doc type=> Specified in ".$url);
111 >        }
112 >        $self->verbose("doctype required is $doctype $docversion");
113  
114 <        die $string."\n";
114 >        # Set up a new object of the specified type
115 >        eval "require $doctype";
116 >        die $@ if $@;
117 >        my $newobj=$doctype->new($self->{Ostore});
118 >        $newobj->url($url);
119 >        $newobj->parent($self);
120 >        return $newobj;
121   }
122  
123 + sub parent {
124 +        my $self=shift;
125 +
126 +        @_?$self->{parent}=shift
127 +          :$self->{parent};
128 + }
129 +
130 + # -------- Error Handling and Error services --------------
131 +
132   sub parseerror {
133          my $self=shift;
134          my $string=shift;
135  
136 <        ($line, $file)=$self->line();
137 <        print "Parse Error in ".$file->url().", line ".
136 >        if ( $self->currentparsename() eq "" ) {
137 >                $self->error($string);
138 >        }
139 >        elsif ( ! defined $self->{File} ) {
140 >         print "Parse Error in ".$self->filenameref()." line "
141 >                                .$self->{currentparser}->line()."\n";
142 >         print $string."\n";
143 >        }
144 >        else {
145 >         ($line, $file)=$self->line();
146 >         print "Parse Error in ".$file->url().", line ".
147                                          $line."\n";
148 <        print $string."\n";
149 <        die;
148 >         print $string."\n";
149 >        }
150 >        exit;
151   }
152  
153 < sub checktag {
154 <        my $self=shift;
155 <        my $tagname=shift;
182 <        my $hashref=shift;
183 <        my $param=shift;
153 > sub line {
154 >        my $self=shift;
155 >        my $parseline;
156  
157 <        if ( ! exists $$hashref{$param} ) {
158 <          $self->parseerror("Incomplete Tag <$tagname> : $param required");
159 <        }
160 < }
157 >        if ( @_ ) {
158 >          $parseline=shift;
159 >        }
160 >        else {
161 >          $parseline=$self->{currentparser}->line();
162 >        }
163  
190 sub line {
191        $self=shift;
164          my ($line, $fileobj)=
165 <                $self->{Processedfile}->line($self->{switch}->line());
165 >                $self->{File}->realline($parseline);
166          return ($line, $fileobj);
167   }
168  
169 + sub tagstartline {
170 +        my $self=shift;
171 +        my ($line, $fileobj)=$self->{File}->line(
172 +                $self->{currentparser}->tagstartline());
173 +        return ($line, $fileobj);
174 + }
175 +
176   sub file {
177          my $self=shift;
178  
179 <        $self->{PPf}->file();
179 >        $self->{File}->file();
180   }
181  
182 < # --------------- Initialisation Methods ---------------------------
204 <
205 < sub preprocess_init {
182 > sub ProcessFile {
183          my $self=shift;
207        $self->{PPfile}=PreProcessedFile->new($self->config());
208 }
184  
185 < sub init {
211 <        # Dummy Routine - override for derived classes
185 >        return $self->{File}->ProcessedFile();
186   }
187  
214 # ------------------- Tag Routines -----------------------------------
188   #
189 < # Base - for setting url bases
189 > # Delegate all else to the switch
190   #
191 < sub Base_start {
192 <        my $self=shift;
220 <        my $name=shift;
221 <        my $hashref=shift;
191 > #sub AUTOLOAD {
192 > #        my $self=shift;
193  
194 <        $self->checktag($name, $hashref, 'type' );
195 <        $self->checktag($name, $hashref, 'base' );
225 <      
226 <        # Keep track of base tags
227 <        push @{$self->{basestack}}, $$hashref{"type"};
228 <        # Set the base
229 <        $self->{urlhandler}->setbase($$hashref{"type"},$hashref);
194 >        # dont propogate destroy methods
195 > #        return if $AUTOLOAD=~/::DESTROY/;
196  
197 < }
197 >        # remove this package name
198 > #        ($name=$AUTOLOAD)=~s/ActiveDoc::ActiveDoc:://;
199  
200 < sub Base_end {
201 <        my $self=shift;
202 <        my $name=shift;
236 <        my $type;
200 >        # pass the message to SimpleDoc
201 > #        $self->{switch}->$name(@_);
202 > #}
203  
204 <        if ( $#{$self->{basestack}} == -1 ) {
205 <                print "Parse Error : unmatched </".$name."> on line ".
206 <                        $self->line()."\n";
207 <                die;
208 <        }
209 <        else {
210 <          $type = pop @{$self->{basestack}};
211 <          $self->{urlhandler}->unsetbase($type);
212 <        }
204 >
205 > # ------------------- Tag Routines -----------------------------------
206 > sub Doc_Start {
207 >        my $self=shift;
208 >        my $name=shift;
209 >        my $hashref=shift;
210 >        
211 >        $self->checktag($name, $hashref, "type");
212 >        $self->{doctypefound}++;
213 >        if ( $self->{doctypefound} == 1 ) { # only take first doctype
214 >           $self->{docobject}=$$hashref{'type'};
215 >        }
216   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines