ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/ActiveDoc/ActiveDoc.pm

Comparing COMP/SCRAM/src/ActiveDoc/ActiveDoc.pm (file contents):
Revision 1.20 by williamc, Fri Feb 11 14:55:22 2000 UTC vs.
Revision 1.25.2.1.2.6 by williamc, Mon Aug 21 18:40:13 2000 UTC

#	Line 7 | Line 7
7		#
8		# Interface
9		# ---------
10	<	# new(ActiveConfig[,options])           : A new ActiveDoc object
10	>	# new(cache,dbstore)            : 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 ( @_ ) {
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(@_);
39	>	$self->cache(shift);
40	>	$self->{dbstore}=shift;
41	>	$self->_initdoc("doc",@_);
42	>	#       $self->{switch}=ActiveDoc::SimpleURLDoc->new($self->{cache});
43		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);
44		}
45
46		sub url {
47		my $self=shift;
48		# get file & preprocess
49	<	if ( @_  ) {$self->{File}=$self->getfile(shift)}
50	<	$self->{File}->url();
51	<	}
52	<
53	<	sub copydocconfig {
54	<	my $self=shift;
55	<	my $ActiveDoc=shift;
56	<
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());
49	>	if ( @_  ) {
50	>	$self->{origurl}=shift;
51	>	$self->{File}=$self->getfile($self->{origurl});
52	>	$self->filetoparse($self->{File}->ProcessedFile());
53	>	$self->verbose("url downloaded to ".$self->{File}->ProcessedFile());
54	>	}
55	>	if ( defined $self->{File} ) {
56	>	return $self->{File}->url();
57		}
58	<	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};
58	>	else { return "undefined"; }
59		}
60
61	<	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() {
61	>	sub getfile {
62		my $self=shift;
63		my $origurl=shift;
64
65		my $fileref;
66		my ($url, $file);
67	<	if ( defined $self->option('url_update') ) {
68	<	$self->verbose("Forced download of $origurl");
69	<	($url, $file)=$self->{urlhandler}->download($origurl);
67	>	if ( 0 ) {
68	>	$self->verbose("Forced download of $origurl");
69	>	($url, $file)=$self->urldownload($origurl);
70		}
71		else {
72	<	($url, $file)=$self->{urlhandler}->get($origurl);
72	>	$self->verbose("Attempting to get $origurl");
73	>	($url, $file)=$self->urlget($origurl);
74		}
75		# do we already have an appropriate object?
76	<	($fileref)=$self->config()->find($url);
270	<	#undef $fileref;
76	>	($fileref)=$self->{dbstore}->find($url);
77		if (  defined $fileref ) {
78		$self->verbose("Found $url in database");
79		$fileref->update();
#	Line 276 | Line 82 | sub getfile() {
82		if ( $file eq "" ) {
83		$self->parseerror("Unable to get $origurl");
84		}
85	<	#-- set up a new preprocess file
86	<	print "Making a new file $url----\n";
87	<	$fileref=ActiveDoc::PreProcessedFile->new($self->config());
85	>	# -- set up a new preprocess file
86	>	$self->verbose("Making a new preprocessed file $url");
87	>	$fileref=ActiveDoc::PreProcessedFile->new($self->{dbstore});
88	>	$fileref->cache($self->{cache});
89		$fileref->url($url);
90		$fileref->update();
91		}
#	Line 290 | Line 97 | sub activatedoc {
97		my $url=shift;
98
99		# first get a preprocessed copy of the file
100	<	#       my $fileob=$self->getfile($url);
100	>	my $fileobj=$self->getfile($url);
101
102	<	# now parse it for the <DocType> tag
103	<	my $tempdoc=ActiveDoc::ActiveDoc->new($self->config());
104	<	$tempdoc->{urlhandler}=$self->{urlhandler};
105	<	my $fullurl=$tempdoc->url($url);
106	<	$url=$fullurl;
107	<	$tempdoc->{doctypefound}=0;
108	<	$tempdoc->newparse("doctype");
109	<	$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;
102	>	# now parse it for the <Doc> tag
103	>	my $tempdoc=ActiveDoc::SimpleURLDoc->new($self->{cache});
104	>	$tempdoc->filetoparse($fileobj->ProcessFile());
105	>	my ($doctype,$docversion)=$tempdoc->doctype();
106	>	undef $tempdoc;
107	>
108	>	if ( ! defined $doctype ) {
109	>	$self->parseerror("No <Doc type=> Specified in ".$url);
110		}
111	+	$self->verbose("doctype required is $doctype $docversion");
112	+
113		# Set up a new object of the specified type
114	<	eval "require $tempdoc->{docobject}";
114	>	eval "require $doctype";
115		die $@ if $@;
116	<	my $newobj=$tempdoc->{docobject}->new($self->config());
314	<	undef $tempdoc;
116	>	my $newobj=$doctype->new($self->{cache},$self->{dbstore});
117		$newobj->url($url);
118	<	$newobj->_initparse();
118	>	$newobj->parent($self);
119		return $newobj;
120		}
121
122	<	sub _initparse {
122	>	sub parent {
123		my $self=shift;
124
125	<	$self->parse("init");
125	>	@_?$self->{parent}=shift
126	>	:$self->{parent};
127		}
325	–	# -------- Error Handling and Error services --------------
326	–
327	–	sub error {
328	–	my $self=shift;
329	–	my $string=shift;
128
129	<	die $string."\n";
332	<	}
129	>	# -------- Error Handling and Error services --------------
130
131		sub parseerror {
132		my $self=shift;
#	Line 338 | Line 135 | sub parseerror {
135		if ( $self->currentparsename() eq "" ) {
136		$self->error($string);
137		}
138	+	elsif ( ! defined $self->{File} ) {
139	+	print "Parse Error in ".$self->filenameref()." line "
140	+	.$self->{currentparser}->line()."\n";
141	+	print $string."\n";
142	+	}
143		else {
144		($line, $file)=$self->line();
145		print "Parse Error in ".$file->url().", line ".
146		$line."\n";
147		print $string."\n";
346	–	exit;
148		}
149	<	}
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	<	}
149	>	exit;
150		}
151
152		sub line {
153		my $self=shift;
154	+	my $parseline;
155	+
156	+	if ( @_ ) {
157	+	$parseline=shift;
158	+	}
159	+	else {
160	+	$parseline=$self->{currentparser}->line();
161	+	}
162
163		my ($line, $fileobj)=
164	<	$self->{File}->realline($self->{currentparser}->line());
164	>	$self->{File}->realline($parseline);
165		return ($line, $fileobj);
166		}
167
#	Line 379 | Line 178 | sub file {
178		$self->{File}->file();
179		}
180
181	<	# --------------- Initialisation Methods ---------------------------
181	>	sub ProcessFile {
182	>	my $self=shift;
183
184	<	sub init {
385	<	# Dummy Routine - override for derived classes
184	>	return $self->{File}->ProcessedFile();
185		}
186
388	–	# ------------------- Tag Routines -----------------------------------
187		#
188	<	# Base - for setting url bases
188	>	# Delegate all else to the switch
189		#
190	<	sub Base_start {
191	<	my $self=shift;
394	<	my $name=shift;
395	<	my $hashref=shift;
190	>	#sub AUTOLOAD {
191	>	#        my $self=shift;
192
193	<	$self->checktag($name, $hashref, 'type' );
194	<	$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	<	}
193	>	# dont propogate destroy methods
194	>	#        return if $AUTOLOAD=~/::DESTROY/;
195
196	<	sub Base_end {
197	<	my $self=shift;
408	<	my $name=shift;
409	<	my $type;
196	>	# remove this package name
197	>	#        ($name=$AUTOLOAD)=~s/ActiveDoc::ActiveDoc:://;
198
199	<	if ( $#{$self->{basestack}} == -1 ) {
200	<	$self->parseerror("Parse Error : unmatched </$name>");
201	<	}
414	<	else {
415	<	$type = pop @{$self->{basestack}};
416	<	$self->{urlhandler}->unsetbase($type);
417	<	}
418	<	}
199	>	# pass the message to SimpleDoc
200	>	#        $self->{switch}->$name(@_);
201	>	#}
202
203	+
204	+	# ------------------- Tag Routines -----------------------------------
205		sub Doc_Start {
206		my $self=shift;
207		my $name=shift;
#	Line 428 | Line 213 | sub Doc_Start {
213		$self->{docobject}=$$hashref{'type'};
214		}
215		}
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