| 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 |
+ |
# ProcessFile() : Return the filename of PreProcessed document |
| 14 |
|
# |
| 15 |
|
# parse(parselabel): Parse the document file for the given parse level |
| 16 |
+ |
# 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 |
| 22 |
|
# includeparse(local_parsename, objparsename, activedoc) : copy the parse from |
| 23 |
|
# one object to another |
| 24 |
|
# currentparsename([name]) : get/set current parse name |
| 23 |
– |
# newdoc(file) : Return an new object of the appropriate type |
| 25 |
|
# getfile(url) : get a processedfile object given a url |
| 26 |
|
# activatedoc(url) : Return the object ref for a doc described by the given url |
| 27 |
|
# -- any parse called "init" will also be run |
| 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 |
| 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 |
| 38 |
|
# |
| 39 |
|
# -- error methods -- |
| 40 |
|
# error(string) : Report an general error to the user |
| 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("Error : No base doc found"); |
| 73 |
> |
$self->error("ActiveDoc Error : No base doc found"); |
| 74 |
|
} |
| 75 |
|
} |
| 76 |
+ |
$self->verbose("New ActiveDoc (".ref($self).") Created"); |
| 77 |
|
$self->_init2(); |
| 78 |
|
} |
| 79 |
|
|
| 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->file(); |
| 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 { |
| 186 |
|
sub url { |
| 187 |
|
my $self=shift; |
| 188 |
|
# get file & preprocess |
| 189 |
< |
if ( @_ ) {$self->{File}=$self->getfile(shift)} |
| 189 |
> |
if ( @_ ) { |
| 190 |
> |
$self->{File}=$self->getfile(shift); |
| 191 |
> |
$self->verbose("url downloaded to $self->{File}"); |
| 192 |
> |
} |
| 193 |
|
$self->{File}->url(); |
| 194 |
|
} |
| 195 |
|
|
| 205 |
|
my $self=shift; |
| 206 |
|
my $ActiveDoc=shift; |
| 207 |
|
|
| 208 |
< |
$self->basequery($ActiveDoc->basequery()); |
| 208 |
> |
if ( defined $ActiveDoc->basequery() ) { |
| 209 |
> |
$self->basequery($ActiveDoc->basequery()); |
| 210 |
> |
} |
| 211 |
> |
else { |
| 212 |
> |
$self->error("Cannot copy basequery - undefined"); |
| 213 |
> |
} |
| 214 |
|
} |
| 215 |
|
|
| 216 |
|
sub config { |
| 221 |
|
|
| 222 |
|
sub basequery { |
| 223 |
|
my $self=shift; |
| 224 |
< |
@_ ? $self->{Query}=shift |
| 225 |
< |
: $self->{Query}; |
| 224 |
> |
@_?$self->{Query}=shift |
| 225 |
> |
:$self->{Query}; |
| 226 |
|
} |
| 227 |
|
|
| 228 |
|
sub option { |
| 254 |
|
return $par; |
| 255 |
|
} |
| 256 |
|
|
| 257 |
+ |
sub askuser { |
| 258 |
+ |
my $self=shift; |
| 259 |
+ |
return $self->userinterface()->askuser(@_); |
| 260 |
+ |
} |
| 261 |
+ |
|
| 262 |
|
sub getfile() { |
| 263 |
|
my $self=shift; |
| 264 |
|
my $origurl=shift; |
| 265 |
|
|
| 266 |
|
my $fileref; |
| 267 |
< |
my ($url, $file)=$self->{urlhandler}->get($origurl); |
| 267 |
> |
my ($url, $file); |
| 268 |
> |
if ( (defined ($it=$self->option('url_update'))) && |
| 269 |
> |
( $it eq "1" || $origurl=~/^$it/ )) { |
| 270 |
> |
$self->verbose("Forced download of $origurl"); |
| 271 |
> |
($url, $file)=$self->{urlhandler}->download($origurl); |
| 272 |
> |
} |
| 273 |
> |
else { |
| 274 |
> |
$self->verbose("Attempting to get $origurl"); |
| 275 |
> |
($url, $file)=$self->{urlhandler}->get($origurl); |
| 276 |
> |
} |
| 277 |
|
# do we already have an appropriate object? |
| 278 |
|
($fileref)=$self->config()->find($url); |
| 279 |
|
#undef $fileref; |
| 280 |
|
if ( defined $fileref ) { |
| 281 |
< |
print "found $url in database ----\n"; |
| 281 |
> |
$self->verbose("Found $url in database"); |
| 282 |
|
$fileref->update(); |
| 283 |
|
} |
| 284 |
|
else { |
| 286 |
|
$self->parseerror("Unable to get $origurl"); |
| 287 |
|
} |
| 288 |
|
#-- set up a new preprocess file |
| 289 |
< |
print "Making a new file $url----\n"; |
| 289 |
> |
$self->verbose("Making a new preprocessed file $url"); |
| 290 |
|
$fileref=ActiveDoc::PreProcessedFile->new($self->config()); |
| 291 |
|
$fileref->url($url); |
| 292 |
|
$fileref->update(); |
| 304 |
|
# now parse it for the <DocType> tag |
| 305 |
|
my $tempdoc=ActiveDoc::ActiveDoc->new($self->config()); |
| 306 |
|
$tempdoc->{urlhandler}=$self->{urlhandler}; |
| 307 |
< |
$tempdoc->url($url); |
| 307 |
> |
my $fullurl=$tempdoc->url($url); |
| 308 |
> |
$url=$fullurl; |
| 309 |
|
$tempdoc->{doctypefound}=0; |
| 310 |
|
$tempdoc->newparse("doctype"); |
| 311 |
|
$tempdoc->addtag("doctype","Doc", \&Doc_Start, $tempdoc, |
| 322 |
|
my $newobj=$tempdoc->{docobject}->new($self->config()); |
| 323 |
|
undef $tempdoc; |
| 324 |
|
$newobj->url($url); |
| 325 |
+ |
$newobj->parent($self); |
| 326 |
|
$newobj->_initparse(); |
| 327 |
|
return $newobj; |
| 328 |
|
} |
| 329 |
|
|
| 330 |
+ |
sub parent { |
| 331 |
+ |
my $self=shift; |
| 332 |
+ |
|
| 333 |
+ |
@_?$self->{parent}=shift |
| 334 |
+ |
:$self->{parent}; |
| 335 |
+ |
} |
| 336 |
+ |
|
| 337 |
|
sub _initparse { |
| 338 |
|
my $self=shift; |
| 339 |
|
|
| 352 |
|
my $self=shift; |
| 353 |
|
my $string=shift; |
| 354 |
|
|
| 355 |
< |
($line, $file)=$self->line(); |
| 356 |
< |
print "Parse Error in ".$file->url().", line ". |
| 355 |
> |
if ( $self->currentparsename() eq "" ) { |
| 356 |
> |
$self->error($string); |
| 357 |
> |
} |
| 358 |
> |
else { |
| 359 |
> |
($line, $file)=$self->line(); |
| 360 |
> |
print "Parse Error in ".$file->url().", line ". |
| 361 |
|
$line."\n"; |
| 362 |
< |
print $string."\n"; |
| 363 |
< |
die; |
| 362 |
> |
print $string."\n"; |
| 363 |
> |
exit; |
| 364 |
> |
} |
| 365 |
|
} |
| 366 |
|
|
| 367 |
|
sub checktag { |
| 396 |
|
$self->{File}->file(); |
| 397 |
|
} |
| 398 |
|
|
| 399 |
+ |
sub ProcessFile { |
| 400 |
+ |
my $self=shift; |
| 401 |
+ |
|
| 402 |
+ |
return $self->{File}->ProcessedFile(); |
| 403 |
+ |
} |
| 404 |
+ |
|
| 405 |
|
# --------------- Initialisation Methods --------------------------- |
| 406 |
|
|
| 407 |
|
sub init { |
| 432 |
|
my $type; |
| 433 |
|
|
| 434 |
|
if ( $#{$self->{basestack}} == -1 ) { |
| 435 |
< |
print "Parse Error : unmatched </".$name."> on line ". |
| 377 |
< |
$self->line()."\n"; |
| 378 |
< |
die; |
| 435 |
> |
$self->parseerror("Parse Error : unmatched </$name>"); |
| 436 |
|
} |
| 437 |
|
else { |
| 438 |
|
$type = pop @{$self->{basestack}}; |
