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 |
< |
# 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 |
< |
# 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 |
15 |
> |
# parent() : return the object ref of the calling parent |
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 |
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 |
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 # used |
26 |
|
|
27 |
|
package ActiveDoc::ActiveDoc; |
28 |
|
require 5.004; |
29 |
< |
use ActiveDoc::Parse; |
46 |
< |
use ActiveDoc::ActiveConfig; |
29 |
> |
use ActiveDoc::SimpleURLDoc; |
30 |
|
use ActiveDoc::PreProcessedFile; |
31 |
< |
use ObjectUtilities::StorableObject; |
49 |
< |
use URL::URLhandler; |
31 |
> |
use Utilities::Verbose; |
32 |
|
|
33 |
< |
@ISA = qw(ObjectUtilities::StorableObject); |
33 |
> |
@ISA = qw(ActiveDoc::SimpleURLDoc Utilities::Verbose); |
34 |
|
|
35 |
|
sub new { |
36 |
|
my $class=shift; |
37 |
< |
$self={}; |
37 |
> |
my $self={}; |
38 |
|
bless $self, $class; |
39 |
< |
$self->config(shift); |
40 |
< |
|
41 |
< |
# have some override options been passed |
42 |
< |
if ( @_ ) { |
43 |
< |
$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(@_); |
39 |
> |
$self->{Ostore}=shift; |
40 |
> |
$self->cache($self->{Ostore}->cache()); |
41 |
> |
$self->{dbstore}=$self->{Ostore}; |
42 |
> |
$self->_initdoc("doc",@_); |
43 |
> |
# $self->{switch}=ActiveDoc::SimpleURLDoc->new($self->{cache}); |
44 |
|
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 -------------- |
101 |
– |
sub parse { |
102 |
– |
my $self=shift; |
103 |
– |
$parselabel=shift; |
104 |
– |
|
105 |
– |
my $file=$self->file(); |
106 |
– |
if ( $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; |
129 |
– |
|
130 |
– |
$self->{parsers}{$parselabel}=ActiveDoc::Parse->new(); |
131 |
– |
$self->{parsers}{$parselabel}->addignoretags(); |
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; |
165 |
– |
if ( $#_ != 6 ) { |
166 |
– |
$self->error("Incorrect addtags specification\n". |
167 |
– |
"called with :\n@_ \n"); |
168 |
– |
} |
169 |
– |
$self->{parsers}{$parselabel}->addtag(@_); |
170 |
– |
} |
171 |
– |
|
172 |
– |
sub addurltags { |
173 |
– |
my $self=shift; |
174 |
– |
my $parselabel=shift; |
175 |
– |
|
176 |
– |
$self->{parsers}{$parselabel}-> |
177 |
– |
addtag("Base", \&Base_start, $self, "", $self, |
178 |
– |
\&Base_end, $self); |
45 |
|
} |
46 |
|
|
47 |
|
sub url { |
48 |
|
my $self=shift; |
49 |
|
# get file & preprocess |
50 |
< |
if ( @_ ) {$self->{File}=$self->getfile(shift)} |
51 |
< |
$self->{File}->url(); |
52 |
< |
} |
53 |
< |
|
54 |
< |
sub copydocconfig { |
55 |
< |
my $self=shift; |
56 |
< |
my $ActiveDoc=shift; |
57 |
< |
|
192 |
< |
$self->config($ActiveDoc->config()); |
193 |
< |
|
194 |
< |
} |
195 |
< |
|
196 |
< |
sub copydocquery { |
197 |
< |
my $self=shift; |
198 |
< |
my $ActiveDoc=shift; |
199 |
< |
|
200 |
< |
if ( defined $ActiveDoc->basequery() ) { |
201 |
< |
$self->basequery($ActiveDoc->basequery()); |
50 |
> |
if ( @_ ) { |
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 |
> |
if ( defined $self->{File} ) { |
57 |
> |
return $self->{File}->url(); |
58 |
|
} |
59 |
< |
else { |
204 |
< |
$self->error("Cannot copy basequery - undefined"); |
205 |
< |
} |
206 |
< |
} |
207 |
< |
|
208 |
< |
sub config { |
209 |
< |
my $self=shift; |
210 |
< |
@_?$self->{ActiveConfig}=shift |
211 |
< |
: $self->{ActiveConfig}; |
212 |
< |
} |
213 |
< |
|
214 |
< |
sub basequery { |
215 |
< |
my $self=shift; |
216 |
< |
@_ ? $self->{Query}=shift |
217 |
< |
: $self->{Query}; |
218 |
< |
return $self->{Query}; |
59 |
> |
else { return "undefined"; } |
60 |
|
} |
61 |
|
|
62 |
< |
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() { |
62 |
> |
sub getfile { |
63 |
|
my $self=shift; |
64 |
|
my $origurl=shift; |
65 |
|
|
66 |
|
my $fileref; |
67 |
|
my ($url, $file); |
68 |
< |
if ( defined $self->option('url_update') ) { |
69 |
< |
$self->verbose("Forced download of $origurl"); |
70 |
< |
($url, $file)=$self->{urlhandler}->download($origurl); |
68 |
> |
if ( 0 ) { |
69 |
> |
$self->verbose("Forced download of $origurl"); |
70 |
> |
($url, $file)=$self->urldownload($origurl); |
71 |
|
} |
72 |
|
else { |
73 |
< |
($url, $file)=$self->{urlhandler}->get($origurl); |
73 |
> |
$self->verbose("Attempting to get $origurl"); |
74 |
> |
($url, $file)=$self->urlget($origurl); |
75 |
|
} |
76 |
|
# do we already have an appropriate object? |
77 |
< |
($fileref)=$self->config()->find($url); |
270 |
< |
#undef $fileref; |
77 |
> |
($fileref)=$self->{dbstore}->find($url); |
78 |
|
if ( defined $fileref ) { |
79 |
|
$self->verbose("Found $url in database"); |
80 |
|
$fileref->update(); |
83 |
|
if ( $file eq "" ) { |
84 |
|
$self->parseerror("Unable to get $origurl"); |
85 |
|
} |
86 |
< |
#-- set up a new preprocess file |
87 |
< |
print "Making a new file $url----\n"; |
88 |
< |
$fileref=ActiveDoc::PreProcessedFile->new($self->config()); |
86 |
> |
# -- set up a new preprocess file |
87 |
> |
$self->verbose("Making a new preprocessed file $url"); |
88 |
> |
$fileref=ActiveDoc::PreProcessedFile->new($self->{Ostore}); |
89 |
> |
#$fileref->cache($self->{cache}); |
90 |
|
$fileref->url($url); |
91 |
|
$fileref->update(); |
92 |
|
} |
98 |
|
my $url=shift; |
99 |
|
|
100 |
|
# first get a preprocessed copy of the file |
101 |
< |
# my $fileob=$self->getfile($url); |
101 |
> |
my $fileobj=$self->getfile($url); |
102 |
|
|
103 |
< |
# now parse it for the <DocType> tag |
104 |
< |
my $tempdoc=ActiveDoc::ActiveDoc->new($self->config()); |
105 |
< |
$tempdoc->{urlhandler}=$self->{urlhandler}; |
106 |
< |
my $fullurl=$tempdoc->url($url); |
107 |
< |
$url=$fullurl; |
108 |
< |
$tempdoc->{doctypefound}=0; |
109 |
< |
$tempdoc->newparse("doctype"); |
110 |
< |
$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; |
103 |
> |
# now parse it for the <Doc> tag |
104 |
> |
my $tempdoc=ActiveDoc::SimpleURLDoc->new($self->{cache}); |
105 |
> |
$tempdoc->filetoparse($fileobj->ProcessFile()); |
106 |
> |
my ($doctype,$docversion)=$tempdoc->doctype(); |
107 |
> |
undef $tempdoc; |
108 |
> |
|
109 |
> |
if ( ! defined $doctype ) { |
110 |
> |
$self->parseerror("No <Doc type=> Specified in ".$url); |
111 |
|
} |
112 |
+ |
$self->verbose("doctype required is $doctype $docversion"); |
113 |
+ |
|
114 |
|
# Set up a new object of the specified type |
115 |
< |
eval "require $tempdoc->{docobject}"; |
115 |
> |
eval "require $doctype"; |
116 |
|
die $@ if $@; |
117 |
< |
my $newobj=$tempdoc->{docobject}->new($self->config()); |
314 |
< |
undef $tempdoc; |
117 |
> |
my $newobj=$doctype->new($self->{Ostore}, $url); |
118 |
|
$newobj->url($url); |
119 |
< |
$newobj->_initparse(); |
119 |
> |
#$newobj->parent($self); |
120 |
|
return $newobj; |
121 |
|
} |
122 |
|
|
123 |
< |
sub _initparse { |
123 |
> |
sub parent { |
124 |
|
my $self=shift; |
125 |
|
|
126 |
< |
$self->parse("init"); |
126 |
> |
@_?$self->{parent}=shift |
127 |
> |
:$self->{parent}; |
128 |
|
} |
325 |
– |
# -------- Error Handling and Error services -------------- |
326 |
– |
|
327 |
– |
sub error { |
328 |
– |
my $self=shift; |
329 |
– |
my $string=shift; |
129 |
|
|
130 |
< |
die $string."\n"; |
332 |
< |
} |
130 |
> |
# -------- Error Handling and Error services -------------- |
131 |
|
|
132 |
|
sub parseerror { |
133 |
|
my $self=shift; |
136 |
|
if ( $self->currentparsename() eq "" ) { |
137 |
|
$self->error($string); |
138 |
|
} |
139 |
+ |
elsif ( ! defined $self->{File} ) { |
140 |
+ |
print "Parse Error in ".$self->filenameref()." line " |
141 |
+ |
.$self->{currentparser}->line()."\n"; |
142 |
+ |
print $string."\n"; |
143 |
+ |
} |
144 |
|
else { |
145 |
|
($line, $file)=$self->line(); |
146 |
|
print "Parse Error in ".$file->url().", line ". |
147 |
|
$line."\n"; |
148 |
|
print $string."\n"; |
346 |
– |
exit; |
149 |
|
} |
150 |
< |
} |
349 |
< |
|
350 |
< |
sub checktag { |
351 |
< |
my $self=shift; |
352 |
< |
my $tagname=shift; |
353 |
< |
my $hashref=shift; |
354 |
< |
my $param=shift; |
355 |
< |
|
356 |
< |
if ( ! exists $$hashref{$param} ) { |
357 |
< |
$self->parseerror("Incomplete Tag <$tagname> : $param required"); |
358 |
< |
} |
150 |
> |
exit; |
151 |
|
} |
152 |
|
|
153 |
|
sub line { |
154 |
|
my $self=shift; |
155 |
+ |
my $parseline; |
156 |
+ |
|
157 |
+ |
if ( @_ ) { |
158 |
+ |
$parseline=shift; |
159 |
+ |
} |
160 |
+ |
else { |
161 |
+ |
$parseline=$self->{currentparser}->line(); |
162 |
+ |
} |
163 |
|
|
164 |
|
my ($line, $fileobj)= |
165 |
< |
$self->{File}->realline($self->{currentparser}->line()); |
165 |
> |
$self->{File}->realline($parseline); |
166 |
|
return ($line, $fileobj); |
167 |
|
} |
168 |
|
|
179 |
|
$self->{File}->file(); |
180 |
|
} |
181 |
|
|
182 |
< |
# --------------- Initialisation Methods --------------------------- |
182 |
> |
sub ProcessFile { |
183 |
> |
my $self=shift; |
184 |
|
|
185 |
< |
sub init { |
385 |
< |
# Dummy Routine - override for derived classes |
185 |
> |
return $self->{File}->ProcessedFile(); |
186 |
|
} |
187 |
|
|
388 |
– |
# ------------------- Tag Routines ----------------------------------- |
188 |
|
# |
189 |
< |
# Base - for setting url bases |
189 |
> |
# Delegate all else to the switch |
190 |
|
# |
191 |
< |
sub Base_start { |
192 |
< |
my $self=shift; |
394 |
< |
my $name=shift; |
395 |
< |
my $hashref=shift; |
191 |
> |
#sub AUTOLOAD { |
192 |
> |
# my $self=shift; |
193 |
|
|
194 |
< |
$self->checktag($name, $hashref, 'type' ); |
195 |
< |
$self->checktag($name, $hashref, 'base' ); |
399 |
< |
|
400 |
< |
# Keep track of base tags |
401 |
< |
push @{$self->{basestack}}, $$hashref{"type"}; |
402 |
< |
# Set the base |
403 |
< |
$self->{urlhandler}->setbase($$hashref{"type"},$hashref); |
404 |
< |
} |
194 |
> |
# dont propogate destroy methods |
195 |
> |
# return if $AUTOLOAD=~/::DESTROY/; |
196 |
|
|
197 |
< |
sub Base_end { |
198 |
< |
my $self=shift; |
408 |
< |
my $name=shift; |
409 |
< |
my $type; |
197 |
> |
# remove this package name |
198 |
> |
# ($name=$AUTOLOAD)=~s/ActiveDoc::ActiveDoc:://; |
199 |
|
|
200 |
< |
if ( $#{$self->{basestack}} == -1 ) { |
201 |
< |
$self->parseerror("Parse Error : unmatched </$name>"); |
202 |
< |
} |
414 |
< |
else { |
415 |
< |
$type = pop @{$self->{basestack}}; |
416 |
< |
$self->{urlhandler}->unsetbase($type); |
417 |
< |
} |
418 |
< |
} |
200 |
> |
# pass the message to SimpleDoc |
201 |
> |
# $self->{switch}->$name(@_); |
202 |
> |
#} |
203 |
|
|
204 |
+ |
|
205 |
+ |
# ------------------- Tag Routines ----------------------------------- |
206 |
|
sub Doc_Start { |
207 |
|
my $self=shift; |
208 |
|
my $name=shift; |
214 |
|
$self->{docobject}=$$hashref{'type'}; |
215 |
|
} |
216 |
|
} |
431 |
– |
|
432 |
– |
sub userinterface { |
433 |
– |
my $self=shift; |
434 |
– |
@_?$self->{userinterface}=shift |
435 |
– |
:$self->{userinterface} |
436 |
– |
} |