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.19 by williamc, Thu Jan 27 17:50:38 2000 UTC vs.
Revision 1.20 by williamc, Fri Feb 11 14:55:22 2000 UTC

# Line 28 | Line 28
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
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 62 | Line 64 | sub new {
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 {
# Line 84 | Line 87 | sub _init2 {
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 --------------
101   sub parse {
102          my $self=shift;
# Line 234 | Line 247 | sub requestoption {
247          return $par;
248   }
249  
250 + sub askuser {
251 +        my $self=shift;
252 +        return $self->userinterface()->askuser(@_);
253 + }
254 +
255   sub getfile() {
256          my $self=shift;
257          my $origurl=shift;
258  
259          my $fileref;
260 <        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          ($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 310 | Line 335 | sub parseerror {
335          my $self=shift;
336          my $string=shift;
337  
338 <        if ( ! defined $self->{currentparse} ) {
338 >        if ( $self->currentparsename() eq "" ) {
339                  $self->error($string);
340          }
341          else {
# Line 318 | Line 343 | sub parseerror {
343           print "Parse Error in ".$file->url().", line ".
344                                          $line."\n";
345           print $string."\n";
346 <         die;
346 >         exit;
347          }
348   }
349  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines