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.21 by williamc, Mon Feb 21 14:30:16 2000 UTC vs.
Revision 1.29 by sashby, Mon Dec 3 19:02:04 2001 UTC

# Line 7 | Line 7
7   #
8   # Interface
9   # ---------
10 < # new(ActiveConfig[,options])           : 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   # parent()         : return the object ref of the calling parent
17 # newparse(parselabel) : Create a new parse type
18 # addtag(parselabel,tagname,start,obj,text,obj,end,obj)
19 #                               : Add tags to the parse given by label
20 # checktag(tagname, hashref, param) : check for existence of param in
21 #                                       hashref from a tag call
22 # includeparse(local_parsename, objparsename, activedoc) : copy the parse from
23 #                                                       one object to another
24 # currentparsename([name]) : get/set current parse name
16   # getfile(url)  : get a processedfile object given a url
17   # activatedoc(url) : Return the object ref for a doc described by the given url
27 #                    -- any parse called "init" will also be run
28 # config([ActiveConfig]) : Set up/return Configuration for the document
29 # basequery([ActiveConfig]) : Set up/return UserQuery for the doc
30 # copydocconfig(ActiveDoc) : Copy the basic configuration from the ActiveDoc
31 # copydocquery(ActiveDoc) : Copy the basicquery from the ActiveDoc
32 # userinterface()       : Return the defaullt userinterface
33 # option(var)           : return the value of the option var ( or undef )
34 # requestoption("message") : Ask the user to supply a value for an option
35 #                            if it dosnt already exist
36 # askuser(Query)        : send a query object to the userinterface
37 # verbose(string)       : Print string in verbosity mode
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
26 > #                       used
27  
28   package ActiveDoc::ActiveDoc;
29   require 5.004;
30 < use ActiveDoc::Parse;
48 < use ActiveDoc::ActiveConfig;
30 > use ActiveDoc::SimpleURLDoc;
31   use ActiveDoc::PreProcessedFile;
32 < use ObjectUtilities::StorableObject;
51 < use URL::URLhandler;
32 > use Utilities::Verbose;
33  
34 < @ISA = qw(ObjectUtilities::StorableObject);
34 > @ISA = qw(ActiveDoc::SimpleURLDoc Utilities::Verbose);
35  
36   sub new {
37          my $class=shift;
38 <        $self={};
38 >        my $self={};
39          bless $self, $class;
40 <        $self->config(shift);
41 <
42 <        # have some override options been passed
43 <        if ( @_ ) {
63 <           $self->basequery(shift);
64 <        }
65 <        else {
66 <           # --- is there a starter document?
67 <           my $basedoc=$self->config()->basedoc();
68 <           if ( defined $basedoc ) {
69 <             $self->copydocquery($basedoc);
70 <             $self->verbose("Initialising from $basedoc");
71 <           }
72 <           else {
73 <             $self->error("ActiveDoc Error : No base doc found");
74 <           }
75 <        }
76 <        $self->verbose("New ActiveDoc (".ref($self).") Created");
77 <        $self->_init2();
78 < }
79 <
80 < sub _init2 {
81 <
82 <        my $self=shift;
83 <        # A URL handler per document
84 <        $self->{urlhandler}=URL::URLhandler->new($self->config()->cache());
85 <
86 <        # A default UserInterface
87 <        $self->{userinterface}=ActiveDoc::SimpleUserInterface->new();
88 <        $self->init(@_);
40 >        $self->{Ostore}=shift;
41 >        $self->cache($self->{Ostore}->cache());
42 >        $self->{dbstore}=$self->{Ostore};
43 >        $self->_initdoc("doc",@_);
44          return $self;
90
91 }
92
93 sub verbose {
94        my $self=shift;
95        my $string=shift;
96
97        if ( $self->option('verbose_all') ||
98                        $self->option('verbose_'.ref($self)) ) {
99          print ">".ref($self)."($self) : \n->".$string."\n";
100        }
101 }
102
103 # ----- parse related routines --------------
104 sub parse {
105        my $self=shift;
106        $parselabel=shift;
107
108        my $file=$self->ProcessFile();
109        if ( $file ) {
110          if ( exists $self->{parsers}{$parselabel} ) {
111            $self->verbose("Parsing $parselabel in file $file");
112            $self->{currentparsename}=$parselabel;
113            $self->{currentparser}=$self->{parsers}{$parselabel};
114            $self->{parsers}{$parselabel}->parse($file,@_);
115            delete $self->{currentparser};
116            $self->{currentparsename}="";
117            $self->verbose("Parse $parselabel Complete");
118          }
119        }
120        else {
121          print "Cannot parse - file not known\n";
122        }
123 }
124
125 sub currentparsename {
126        my $self=shift;
127        @_?$self->{currentparsename}=shift
128          :$self->{currentparsename};
129 }
130
131 sub newparse {
132        my $self=shift;
133        my $parselabel=shift;
134
135        $self->{parsers}{$parselabel}=ActiveDoc::Parse->new();
136        $self->{parsers}{$parselabel}->addignoretags();
137        $self->{parsers}{$parselabel}->addgrouptags();
138 }
139
140 sub cleartags {
141        my $self=shift;
142        my $parselabel=shift;
143
144        $self->{parsers}{$parselabel}->cleartags();
145 }
146
147
148 sub includeparse {
149        my $self=shift;
150        my $parselabel=shift;
151        my $remoteparselabel=shift;
152        my $activedoc=shift;
153
154        # Some error trapping
155        if ( ! exists $self->{parsers}{$parselabel} ) {
156          $self->error("Unknown local parse name specified");
157        }
158        if ( ! exists $activedoc->{parsers}{$remoteparselabel} ) {
159          $self->error("Unknown parse name specified in remote obj $activedoc");
160        }
161
162        #
163        my $rp=$activedoc->{parsers}{$remoteparselabel};
164        $self->{parsers}{$parselabel}->includeparse($rp);
165 }
166
167 sub addtag {
168        my $self=shift;
169        my $parselabel=shift;
170        if ( $#_ != 6 ) {
171                $self->error("Incorrect addtags specification\n".
172                                "called with :\n@_ \n");
173        }
174        $self->{parsers}{$parselabel}->addtag(@_);
175 }
176
177 sub addurltags {
178        my $self=shift;
179        my $parselabel=shift;
180        
181        $self->{parsers}{$parselabel}->
182                addtag("Base", \&Base_start, $self, "", $self,
183                        \&Base_end, $self);
45   }
46  
47   sub url {
48          my $self=shift;
49          # get file & preprocess
50          if ( @_  ) {
51 <                $self->{File}=$self->getfile(shift);
52 <                $self->verbose("url downloaded to $self->{File}");
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 <        $self->{File}->url();
57 < }
195 <
196 < sub copydocconfig {
197 <        my $self=shift;
198 <        my $ActiveDoc=shift;
199 <        
200 <        $self->config($ActiveDoc->config());
201 <
202 < }
203 <
204 < sub copydocquery {
205 <        my $self=shift;
206 <        my $ActiveDoc=shift;
207 <
208 <        if ( defined $ActiveDoc->basequery() ) {
209 <          $self->basequery($ActiveDoc->basequery());
210 <        }
211 <        else {
212 <          $self->error("Cannot copy basequery - undefined");
56 >        if ( defined $self->{File} ) {
57 >          return $self->{File}->url();
58          }
59 +        else { return "undefined"; }
60   }
61  
62 < sub config {
217 <        my $self=shift;
218 <        @_?$self->{ActiveConfig}=shift
219 <           : $self->{ActiveConfig};
220 < }
221 <
222 < sub basequery {
223 <        my $self=shift;
224 <        @_?$self->{Query}=shift
225 <           :$self->{Query};
226 < }
227 <
228 < sub option {
229 <        my $self=shift;
230 <        my $param=shift;
231 <        if ( defined $self->basequery()) {
232 <                return $self->basequery()->getparam($param);
233 <        }
234 <        else {
235 <                return $undef;
236 <        }
237 < }
238 <
239 < sub requestoption {
240 <        my $self=shift;
241 <        my $param=shift;
242 <        my $string=shift;
243 <
244 <        my $par=undef;
245 <        if ( defined $self->basequery()) {
246 <        $par=$self->basequery()->getparam($param);
247 <        while ( ! defined $par ) {
248 <          $self->basequery()->querytype( $param, "basic");
249 <          $self->basequery()->querymessage( $param, $string);
250 <          $self->userinterface()->askuser($self->basequery());
251 <          $par=$self->basequery()->getparam($param);
252 <        }
253 <        }
254 <        return $par;
255 < }
256 <
257 < sub askuser {
258 <        my $self=shift;
259 <        return $self->userinterface()->askuser(@_);
260 < }
261 <
262 < sub getfile() {
62 > sub getfile {
63          my $self=shift;
64          my $origurl=shift;
65  
66          my $fileref;
67          my ($url, $file);
68 <        if ( (defined ($it=$self->option('url_update'))) &&
269 <                ( $it eq "1" || $origurl=~/^$it/ )) {
68 >        if ( 0 ) {
69               $self->verbose("Forced download of $origurl");
70 <             ($url, $file)=$self->{urlhandler}->download($origurl);
70 >             ($url, $file)=$self->urldownload($origurl);
71          }
72          else {
73             $self->verbose("Attempting to get $origurl");
74 <           ($url, $file)=$self->{urlhandler}->get($origurl);
74 >           ($url, $file)=$self->urlget($origurl);
75          }
76          # do we already have an appropriate object?
77 <        ($fileref)=$self->config()->find($url);
279 <        #undef $fileref;
77 >        ($fileref)=$self->{dbstore}->find($url);
78          if (  defined $fileref ) {
79           $self->verbose("Found $url in database");
80           $fileref->update();
# Line 285 | Line 83 | sub getfile() {
83           if ( $file eq "" ) {
84             $self->parseerror("Unable to get $origurl");
85           }
86 <         #-- set up a new preprocess file
86 >         # -- set up a new preprocess file
87           $self->verbose("Making a new preprocessed file $url");
88 <         $fileref=ActiveDoc::PreProcessedFile->new($self->config());
88 >         $fileref=ActiveDoc::PreProcessedFile->new($self->{Ostore});
89           $fileref->url($url);
90           $fileref->update();
91          }
# Line 299 | Line 97 | sub activatedoc {
97          my $url=shift;
98  
99          # first get a preprocessed copy of the file
100 < #       my $fileob=$self->getfile($url);
100 >        my $fileobj=$self->getfile($url);
101  
102 <        # now parse it for the <DocType> tag
103 <        my $tempdoc=ActiveDoc::ActiveDoc->new($self->config());
104 <        $tempdoc->{urlhandler}=$self->{urlhandler};
105 <        my $fullurl=$tempdoc->url($url);
106 <        $url=$fullurl;
107 <        $tempdoc->{doctypefound}=0;
108 <        $tempdoc->newparse("doctype");
109 <        $tempdoc->addtag("doctype","Doc", \&Doc_Start, $tempdoc,
312 <                                          "", $tempdoc, "", $tempdoc);
313 <        $tempdoc->parse("doctype");
314 <
315 <        if ( ! defined $tempdoc->{docobject} ) {
316 <          print "No <Doc type=> Specified in ".$url."\n";
317 <          exit 1;
102 >        # now parse it for the <Doc> tag
103 >        my $tempdoc=ActiveDoc::SimpleURLDoc->new($self->{cache});
104 >        $tempdoc->filetoparse($fileobj->ProcessFile());
105 >        my ($doctype,$docversion)=$tempdoc->doctype();
106 >        undef $tempdoc;
107 >        
108 >        if ( ! defined $doctype ) {
109 >          $self->parseerror("No <Doc type=> Specified in ".$url);
110          }
111 +        $self->verbose("doctype required is $doctype $docversion");
112 +
113          # Set up a new object of the specified type
114 <        eval "require $tempdoc->{docobject}";
114 >        eval "require $doctype";
115          die $@ if $@;
116 <        my $newobj=$tempdoc->{docobject}->new($self->config());
323 <        undef $tempdoc;
116 >        my $newobj=$doctype->new($self->{Ostore}, $url);
117          $newobj->url($url);
325        $newobj->parent($self);
326        $newobj->_initparse();
118          return $newobj;
119   }
120  
# Line 334 | Line 125 | sub parent {
125            :$self->{parent};
126   }
127  
337 sub _initparse {
338        my $self=shift;
339
340        $self->parse("init");
341 }
128   # -------- Error Handling and Error services --------------
129  
344 sub error {
345        my $self=shift;
346        my $string=shift;
347
348        die $string."\n";
349 }
350
130   sub parseerror {
131          my $self=shift;
132          my $string=shift;
# Line 355 | Line 134 | sub parseerror {
134          if ( $self->currentparsename() eq "" ) {
135                  $self->error($string);
136          }
137 +        elsif ( ! defined $self->{File} ) {
138 +         print "Parse Error in ".$self->filenameref()." line "
139 +                                .$self->{currentparser}->line()."\n";
140 +         print $string."\n";
141 +        }
142          else {
143           ($line, $file)=$self->line();
144           print "Parse Error in ".$file->url().", line ".
145                                          $line."\n";
146           print $string."\n";
363         exit;
147          }
148 < }
366 <
367 < sub checktag {
368 <        my $self=shift;
369 <        my $tagname=shift;
370 <        my $hashref=shift;
371 <        my $param=shift;
372 <
373 <        if ( ! exists $$hashref{$param} ) {
374 <          $self->parseerror("Incomplete Tag <$tagname> : $param required");
375 <        }
148 >        exit;
149   }
150  
151   sub line {
152          my $self=shift;
153 +        my $parseline;
154 +
155 +        if ( @_ ) {
156 +          $parseline=shift;
157 +        }
158 +        else {
159 +          $parseline=$self->{currentparser}->line();
160 +        }
161  
162          my ($line, $fileobj)=
163 <                $self->{File}->realline($self->{currentparser}->line());
163 >                $self->{File}->realline($parseline);
164          return ($line, $fileobj);
165   }
166  
# Line 402 | Line 183 | sub ProcessFile {
183          return $self->{File}->ProcessedFile();
184   }
185  
405 # --------------- Initialisation Methods ---------------------------
406
407 sub init {
408        # Dummy Routine - override for derived classes
409 }
410
186   # ------------------- Tag Routines -----------------------------------
412 #
413 # Base - for setting url bases
414 #
415 sub Base_start {
416        my $self=shift;
417        my $name=shift;
418        my $hashref=shift;
419
420        $self->checktag($name, $hashref, 'type' );
421        $self->checktag($name, $hashref, 'base' );
422      
423        # Keep track of base tags
424        push @{$self->{basestack}}, $$hashref{"type"};
425        # Set the base
426        $self->{urlhandler}->setbase($$hashref{"type"},$hashref);
427 }
428
429 sub Base_end {
430        my $self=shift;
431        my $name=shift;
432        my $type;
433
434        if ( $#{$self->{basestack}} == -1 ) {
435                $self->parseerror("Parse Error : unmatched </$name>");
436        }
437        else {
438          $type = pop @{$self->{basestack}};
439          $self->{urlhandler}->unsetbase($type);
440        }
441 }
442
187   sub Doc_Start {
188          my $self=shift;
189          my $name=shift;
# Line 451 | Line 195 | sub Doc_Start {
195             $self->{docobject}=$$hashref{'type'};
196          }
197   }
454
455 sub userinterface {
456        my $self=shift;
457        @_?$self->{userinterface}=shift
458          :$self->{userinterface}
459 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines