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.20 by williamc, Fri Feb 11 14:55:22 2000 UTC

# Line 7 | Line 7
7   #
8   # Interface
9   # ---------
10 < # new()         : A new ActiveDoc object
10 > # new(ActiveConfig[,options])           : A new ActiveDoc object
11   # url()         : Return/set the docs url - essential
12   # file()        : Return the local filename of document
13   #
# Line 15 | Line 15
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
18 > # checktag(tagname, hashref, param) : check for existence of param in
19 > #                                       hashref from a tag call
20 > # includeparse(local_parsename, objparsename, activedoc) : copy the parse from
21 > #                                                       one object to another
22 > # currentparsename([name]) : get/set current parse name
23   # getfile(url)  : get a processedfile object given a url
24 + # activatedoc(url) : Return the object ref for a doc described by the given url
25 + #                    -- any parse called "init" will also be run
26   # config([ActiveConfig]) : Set up/return Configuration for the document
27   # basequery([ActiveConfig]) : Set up/return UserQuery for the doc
28   # copydocconfig(ActiveDoc) : Copy the basic configuration from the ActiveDoc
29   # copydocquery(ActiveDoc) : Copy the basicquery from the ActiveDoc
30 + # userinterface()       : Return the defaullt userinterface
31 + # option(var)           : return the value of the option var ( or undef )
32 + # requestoption("message") : Ask the user to supply a value for an option
33 + #                            if it dosnt already exist
34 + # askuser(Query)        : send a query object to the userinterface
35 + # verbose(string)       : Print string in verbosity mode
36   #
37   # -- error methods --
38   # error(string)       : Report an general error to the user
# Line 33 | Line 45 | require 5.004;
45   use ActiveDoc::Parse;
46   use ActiveDoc::ActiveConfig;
47   use ActiveDoc::PreProcessedFile;
48 < use ObjectUtilities::ObjectBase;
48 > use ObjectUtilities::StorableObject;
49   use URL::URLhandler;
50  
51 < @ISA = qw(ObjectUtilities::ObjectBase);
51 > @ISA = qw(ObjectUtilities::StorableObject);
52  
53   sub new {
54          my $class=shift;
55          $self={};
56          bless $self, $class;
57          $self->config(shift);
58 <        
58 >
59 >        # have some override options been passed
60 >        if ( @_ ) {
61 >           $self->basequery(shift);
62 >        }
63 >        else {
64 >           # --- is there a starter document?
65 >           my $basedoc=$self->config()->basedoc();
66 >           if ( defined $basedoc ) {
67 >             $self->verbose("Initialising from $basedoc");
68 >             $self->copydocquery($basedoc);
69 >           }
70 >           else {
71 >             $self->error("ActiveDoc Error : No base doc found");
72 >           }
73 >        }
74 >        $self->_init2();
75 > }
76 >
77 > sub _init2 {
78 >
79 >        my $self=shift;
80          # A URL handler per document
81          $self->{urlhandler}=URL::URLhandler->new($self->config()->cache());
82  
83 +        # A default UserInterface
84 +        $self->{userinterface}=ActiveDoc::SimpleUserInterface->new();
85          $self->init(@_);
86          return $self;
87 +
88 + }
89 +
90 + sub verbose {
91 +        my $self=shift;
92 +        my $string=shift;
93 +
94 +        if ( $self->option('verbose_all') ||
95 +                        $self->option('verbose_'.ref($self)) ) {
96 +          print ">".ref($self)." : ".$string."\n";
97 +        }
98   }
99  
100   # ----- parse related routines --------------
# Line 57 | Line 103 | sub parse {
103          $parselabel=shift;
104  
105          my $file=$self->file();
60        print "Parse called on file $file\n";
106          if ( $file ) {
107 <          $self->{parsers}{$parselabel}->parse($file,@_);
107 >          if ( exists $self->{parsers}{$parselabel} ) {
108 >            $self->{currentparsename}=$parselabel;
109 >            $self->{currentparser}=$self->{parsers}{$parselabel};
110 >            $self->{parsers}{$parselabel}->parse($file,@_);
111 >            delete $self->{currentparser};
112 >            $self->{currentparsename}="";
113 >          }
114          }
115          else {
116            print "Cannot parse - file not known\n";
117          }
118   }
119  
120 + sub currentparsename {
121 +        my $self=shift;
122 +        @_?$self->{currentparsename}=shift
123 +          :$self->{currentparsename};
124 + }
125 +
126   sub newparse {
127          my $self=shift;
128          my $parselabel=shift;
# Line 75 | Line 132 | sub newparse {
132          $self->{parsers}{$parselabel}->addgrouptags();
133   }
134  
135 + sub cleartags {
136 +        my $self=shift;
137 +        my $parselabel=shift;
138 +
139 +        $self->{parsers}{$parselabel}->cleartags();
140 + }
141 +
142 +
143 + sub includeparse {
144 +        my $self=shift;
145 +        my $parselabel=shift;
146 +        my $remoteparselabel=shift;
147 +        my $activedoc=shift;
148 +
149 +        # Some error trapping
150 +        if ( ! exists $self->{parsers}{$parselabel} ) {
151 +          $self->error("Unknown local parse name specified");
152 +        }
153 +        if ( ! exists $activedoc->{parsers}{$remoteparselabel} ) {
154 +          $self->error("Unknown parse name specified in remote obj $activedoc");
155 +        }
156 +
157 +        #
158 +        my $rp=$activedoc->{parsers}{$remoteparselabel};
159 +        $self->{parsers}{$parselabel}->includeparse($rp);
160 + }
161 +
162   sub addtag {
163          my $self=shift;
164          my $parselabel=shift;
# Line 96 | Line 180 | sub addurltags {
180  
181   sub url {
182          my $self=shift;
183 <        @_ ?$self->{File}=$self->getfile(shift)
184 <            : $self->{File};
183 >        # get file & preprocess
184 >        if ( @_  ) {$self->{File}=$self->getfile(shift)}
185 >        $self->{File}->url();
186   }
187  
188   sub copydocconfig {
# Line 112 | Line 197 | sub copydocquery {
197          my $self=shift;
198          my $ActiveDoc=shift;
199  
200 <         $self->basequery($ActiveDoc->basequery());
200 >        if ( defined $ActiveDoc->basequery() ) {
201 >          $self->basequery($ActiveDoc->basequery());
202 >        }
203 >        else {
204 >          $self->error("Cannot copy basequery - undefined");
205 >        }
206   }
207  
208   sub config {
# Line 123 | Line 213 | sub config {
213  
214   sub basequery {
215          my $self=shift;
216 <        @_ ? $self->{UserQuery}=shift
217 <           : $self->{UserQuery};
216 >        @_ ? $self->{Query}=shift
217 >           : $self->{Query};
218 >        return $self->{Query};
219 > }
220 >
221 > sub option {
222 >        my $self=shift;
223 >        my $param=shift;
224 >        if ( defined $self->basequery()) {
225 >                return $self->basequery()->getparam($param);
226 >        }
227 >        else {
228 >                return $undef;
229 >        }
230 > }
231 >
232 > sub requestoption {
233 >        my $self=shift;
234 >        my $param=shift;
235 >        my $string=shift;
236 >
237 >        my $par=undef;
238 >        if ( defined $self->basequery()) {
239 >        $par=$self->basequery()->getparam($param);
240 >        while ( ! defined $par ) {
241 >          $self->basequery()->querytype( $param, "basic");
242 >          $self->basequery()->querymessage( $param, $string);
243 >          $self->userinterface()->askuser($self->basequery());
244 >          $par=$self->basequery()->getparam($param);
245 >        }
246 >        }
247 >        return $par;
248 > }
249 >
250 > sub askuser {
251 >        my $self=shift;
252 >        return $self->userinterface()->askuser(@_);
253   }
254  
255   sub getfile() {
# Line 132 | Line 257 | sub getfile() {
257          my $origurl=shift;
258  
259          my $fileref;
260 <        print "GETFILE called\n";
261 <        my ($url, $file)=$self->{urlhandler}->get($origurl);
260 >        my ($url, $file);
261 >        if ( defined $self->option('url_update') ) {
262 >           $self->verbose("Forced download of $origurl");
263 >           ($url, $file)=$self->{urlhandler}->download($origurl);
264 >        }
265 >        else {
266 >           ($url, $file)=$self->{urlhandler}->get($origurl);
267 >        }
268          # do we already have an appropriate object?
269 <        #my ($fileref)=$self->config()->find("__preprocessed",$url);
270 <        undef $fileref;
269 >        ($fileref)=$self->config()->find($url);
270 >        #undef $fileref;
271          if (  defined $fileref ) {
272 <         print "found $url in database ----\n";
272 >         $self->verbose("Found $url in database");
273           $fileref->update();
274          }
275          else {
# Line 150 | Line 281 | sub getfile() {
281           $fileref=ActiveDoc::PreProcessedFile->new($self->config());
282           $fileref->url($url);
283           $fileref->update();
153         $self->config()->store($fileref,"__preprocessed",$url);
284          }
155        print "---------- returning".$fileref."\n";
285          return $fileref;
286   }
287  
288 + sub activatedoc {
289 +        my $self=shift;
290 +        my $url=shift;
291 +
292 +        # first get a preprocessed copy of the file
293 + #       my $fileob=$self->getfile($url);
294 +
295 +        # now parse it for the <DocType> tag
296 +        my $tempdoc=ActiveDoc::ActiveDoc->new($self->config());
297 +        $tempdoc->{urlhandler}=$self->{urlhandler};
298 +        my $fullurl=$tempdoc->url($url);
299 +        $url=$fullurl;
300 +        $tempdoc->{doctypefound}=0;
301 +        $tempdoc->newparse("doctype");
302 +        $tempdoc->addtag("doctype","Doc", \&Doc_Start, $tempdoc,
303 +                                          "", $tempdoc, "", $tempdoc);
304 +        $tempdoc->parse("doctype");
305 +
306 +        if ( ! defined $tempdoc->{docobject} ) {
307 +          print "No <Doc type=> Specified in ".$url."\n";
308 +          exit 1;
309 +        }
310 +        # Set up a new object of the specified type
311 +        eval "require $tempdoc->{docobject}";
312 +        die $@ if $@;
313 +        my $newobj=$tempdoc->{docobject}->new($self->config());
314 +        undef $tempdoc;
315 +        $newobj->url($url);
316 +        $newobj->_initparse();
317 +        return $newobj;
318 + }
319 +
320 + sub _initparse {
321 +        my $self=shift;
322 +
323 +        $self->parse("init");
324 + }
325   # -------- Error Handling and Error services --------------
326  
327   sub error {
# Line 169 | Line 335 | sub parseerror {
335          my $self=shift;
336          my $string=shift;
337  
338 <        ($line, $file)=$self->line();
339 <        print "Parse Error in ".$file->url().", line ".
338 >        if ( $self->currentparsename() eq "" ) {
339 >                $self->error($string);
340 >        }
341 >        else {
342 >         ($line, $file)=$self->line();
343 >         print "Parse Error in ".$file->url().", line ".
344                                          $line."\n";
345 <        print $string."\n";
346 <        die;
345 >         print $string."\n";
346 >         exit;
347 >        }
348   }
349  
350   sub checktag {
# Line 188 | Line 359 | sub checktag {
359   }
360  
361   sub line {
362 <        $self=shift;
362 >        my $self=shift;
363 >
364          my ($line, $fileobj)=
365 <                $self->{Processedfile}->line($self->{switch}->line());
365 >                $self->{File}->realline($self->{currentparser}->line());
366          return ($line, $fileobj);
367   }
368  
369 + sub tagstartline {
370 +        my $self=shift;
371 +        my ($line, $fileobj)=$self->{File}->line(
372 +                $self->{currentparser}->tagstartline());
373 +        return ($line, $fileobj);
374 + }
375 +
376   sub file {
377          my $self=shift;
378  
379 <        $self->{PPf}->file();
379 >        $self->{File}->file();
380   }
381  
382   # --------------- Initialisation Methods ---------------------------
383  
205 sub preprocess_init {
206        my $self=shift;
207        $self->{PPfile}=PreProcessedFile->new($self->config());
208 }
209
384   sub init {
385          # Dummy Routine - override for derived classes
386   }
# Line 227 | Line 401 | sub Base_start {
401          push @{$self->{basestack}}, $$hashref{"type"};
402          # Set the base
403          $self->{urlhandler}->setbase($$hashref{"type"},$hashref);
230
404   }
405  
406   sub Base_end {
# Line 236 | Line 409 | sub Base_end {
409          my $type;
410  
411          if ( $#{$self->{basestack}} == -1 ) {
412 <                print "Parse Error : unmatched </".$name."> on line ".
240 <                        $self->line()."\n";
241 <                die;
412 >                $self->parseerror("Parse Error : unmatched </$name>");
413          }
414          else {
415            $type = pop @{$self->{basestack}};
416            $self->{urlhandler}->unsetbase($type);
417          }
418   }
419 +
420 + sub Doc_Start {
421 +        my $self=shift;
422 +        my $name=shift;
423 +        my $hashref=shift;
424 +        
425 +        $self->checktag($name, $hashref, "type");
426 +        $self->{doctypefound}++;
427 +        if ( $self->{doctypefound} == 1 ) { # only take first doctype
428 +           $self->{docobject}=$$hashref{'type'};
429 +        }
430 + }
431 +
432 + sub userinterface {
433 +        my $self=shift;
434 +        @_?$self->{userinterface}=shift
435 +          :$self->{userinterface}
436 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines