| 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 |
| 66 |
|
# --- is there a starter document? |
| 67 |
|
my $basedoc=$self->config()->basedoc(); |
| 68 |
|
if ( defined $basedoc ) { |
| 67 |
– |
$self->verbose("Initialising from $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 |
|
|
| 96 |
|
|
| 97 |
|
if ( $self->option('verbose_all') || |
| 98 |
|
$self->option('verbose_'.ref($self)) ) { |
| 99 |
< |
print ">".ref($self)." : ".$string."\n"; |
| 99 |
> |
print ">".ref($self)."($self) : \n->".$string."\n"; |
| 100 |
|
} |
| 101 |
|
} |
| 102 |
|
|
| 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 |
|
|
| 221 |
|
|
| 222 |
|
sub basequery { |
| 223 |
|
my $self=shift; |
| 224 |
< |
@_ ? $self->{Query}=shift |
| 225 |
< |
: $self->{Query}; |
| 218 |
< |
return $self->{Query}; |
| 224 |
> |
@_?$self->{Query}=shift |
| 225 |
> |
:$self->{Query}; |
| 226 |
|
} |
| 227 |
|
|
| 228 |
|
sub option { |
| 265 |
|
|
| 266 |
|
my $fileref; |
| 267 |
|
my ($url, $file); |
| 268 |
< |
if ( defined $self->option('url_update') ) { |
| 269 |
< |
$self->verbose("Forced download of $origurl"); |
| 270 |
< |
($url, $file)=$self->{urlhandler}->download($origurl); |
| 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? |
| 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(); |
| 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 |
|
|
| 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 { |
