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.10 by williamc, Thu Dec 16 16:30:45 1999 UTC vs.
Revision 1.25.2.1.2.8 by williamc, Mon Aug 28 07:23:36 2000 UTC

# Line 7 | Line 7
7   #
8   # Interface
9   # ---------
10 < # new()         : 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 < # newdoc(file)  : Return an new object of the appropriate type
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
23 # config([ActiveConfig]) : Set up/return Configuration for the document
24 # basequery([ActiveConfig]) : Set up/return UserQuery for the doc
25 # copydocconfig(ActiveDoc) : Copy the basic configuration from the ActiveDoc
26 # copydocquery(ActiveDoc) : Copy the basicquery from the ActiveDoc
27 # userinterface()       : Return the defaullt userinterface
28 # options(var)          : return the value of the option var
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;
39 < use ActiveDoc::ActiveConfig;
29 > use ActiveDoc::SimpleURLDoc;
30   use ActiveDoc::PreProcessedFile;
31 < use ObjectUtilities::StorableObject;
42 < 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 <        # A URL handler per document
42 <        $self->{urlhandler}=URL::URLhandler->new($self->config()->cache());
43 <
55 <        # A default UserInterface
56 <        $self->{userinterface}=ActiveDoc::UserInterface_basic->new();
57 <        $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;
45   }
46  
61 # ----- parse related routines --------------
62 sub parse {
63        my $self=shift;
64        $parselabel=shift;
65
66        my $file=$self->file();
67        if ( $file ) {
68          $self->{currentparser}=$self->{parsers}{$parselabel};
69          $self->{parsers}{$parselabel}->parse($file,@_);
70          delete $self->{currentparser};
71        }
72        else {
73          print "Cannot parse - file not known\n";
74        }
75 }
76
77 sub newparse {
78        my $self=shift;
79        my $parselabel=shift;
80
81        $self->{parsers}{$parselabel}=ActiveDoc::Parse->new();
82        $self->{parsers}{$parselabel}->addignoretags();
83        $self->{parsers}{$parselabel}->addgrouptags();
84 }
85
86 sub addtag {
87        my $self=shift;
88        my $parselabel=shift;
89        if ( $#_ != 6 ) {
90                $self->error("Incorrect addtags specification\n".
91                                "called with :\n@_ \n");
92        }
93        $self->{parsers}{$parselabel}->addtag(@_);
94 }
95
96 sub addurltags {
97        my $self=shift;
98        my $parselabel=shift;
99        
100        $self->{parsers}{$parselabel}->
101                addtag("Base", \&Base_start, $self, "", $self,
102                        \&Base_end, $self);
103 }
104
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 <        
58 <        $self->config($ActiveDoc->config());
59 <
118 < }
119 <
120 < sub copydocquery {
121 <        my $self=shift;
122 <        my $ActiveDoc=shift;
123 <
124 <         $self->basequery($ActiveDoc->basequery());
125 < }
126 <
127 < sub config {
128 <        my $self=shift;
129 <        @_?$self->{ActiveConfig}=shift
130 <           : $self->{ActiveConfig};
131 < }
132 <
133 < sub basequery {
134 <        my $self=shift;
135 <        @_ ? $self->{Query}=shift
136 <           : $self->{Query};
137 < }
138 <
139 < sub options {
140 <        my $self=shift;
141 <        my $param=shift;
142 <        $self->basequery()->getparam('option_'.$param);
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 { return "undefined"; }
60   }
61  
62 < sub getfile() {
62 > sub getfile {
63          my $self=shift;
64          my $origurl=shift;
65  
66          my $fileref;
67 <        my ($url, $file)=$self->{urlhandler}->get($origurl);
67 >        my ($url, $file);
68 >        if ( 0 ) {
69 >             $self->verbose("Forced download of $origurl");
70 >             ($url, $file)=$self->urldownload($origurl);
71 >        }
72 >        else {
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);
153 <        #undef $fileref;
77 >        ($fileref)=$self->{dbstore}->find($url);
78          if (  defined $fileref ) {
79 <         print "found $url in database ----\n";
79 >         $self->verbose("Found $url in database");
80           $fileref->update();
81          }
82          else {
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          }
# Line 173 | Line 98 | sub activatedoc {
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 <        $self->{doctypefound}=0;
105 <        $self->newparse("doctype");
106 <        $self->addtag("doctype","Doc", \&Doc_Start, $self,
107 <                                          "", $self, "", $self);
108 <        $self->parse("doctype");
109 <
110 <        if ( ! defined $self->{docobject} ) {
186 <          print "No <Doc type=> Specified in ".$fileob->url()."\n";
187 <          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 <        my $newobj=$self->{docobject}->new($self->config());
115 >        eval "require $doctype";
116 >        die $@ if $@;
117 >        my $newobj=$doctype->new($self->{Ostore}, $url);
118          $newobj->url($url);
119 +        #$newobj->parent($self);
120          return $newobj;
121   }
122  
123 < # -------- Error Handling and Error services --------------
124 <
197 < sub error {
198 <        my $self=shift;
199 <        my $string=shift;
123 > sub parent {
124 >        my $self=shift;
125  
126 <        die $string."\n";
126 >        @_?$self->{parent}=shift
127 >          :$self->{parent};
128   }
129  
130 + # -------- Error Handling and Error services --------------
131 +
132   sub parseerror {
133          my $self=shift;
134          my $string=shift;
135  
136 <        ($line, $file)=$self->line();
137 <        print "Parse Error in ".$file->url().", line ".
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";
149 <        die;
150 < }
214 <
215 < sub checktag {
216 <        my $self=shift;
217 <        my $tagname=shift;
218 <        my $hashref=shift;
219 <        my $param=shift;
220 <
221 <        if ( ! exists $$hashref{$param} ) {
222 <          $self->parseerror("Incomplete Tag <$tagname> : $param required");
223 <        }
148 >         print $string."\n";
149 >        }
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  
# Line 244 | Line 179 | sub file {
179          $self->{File}->file();
180   }
181  
182 < # --------------- Initialisation Methods ---------------------------
182 > sub ProcessFile {
183 >        my $self=shift;
184  
185 < sub init {
250 <        # Dummy Routine - override for derived classes
185 >        return $self->{File}->ProcessedFile();
186   }
187  
253 # ------------------- 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;
259 <        my $name=shift;
260 <        my $hashref=shift;
191 > #sub AUTOLOAD {
192 > #        my $self=shift;
193  
194 <        $self->checktag($name, $hashref, 'type' );
195 <        $self->checktag($name, $hashref, 'base' );
264 <      
265 <        # Keep track of base tags
266 <        push @{$self->{basestack}}, $$hashref{"type"};
267 <        # Set the base
268 <        $self->{urlhandler}->setbase($$hashref{"type"},$hashref);
194 >        # dont propogate destroy methods
195 > #        return if $AUTOLOAD=~/::DESTROY/;
196  
197 < }
197 >        # remove this package name
198 > #        ($name=$AUTOLOAD)=~s/ActiveDoc::ActiveDoc:://;
199  
200 < sub Base_end {
201 <        my $self=shift;
202 <        my $name=shift;
275 <        my $type;
200 >        # pass the message to SimpleDoc
201 > #        $self->{switch}->$name(@_);
202 > #}
203  
277        if ( $#{$self->{basestack}} == -1 ) {
278                print "Parse Error : unmatched </".$name."> on line ".
279                        $self->line()."\n";
280                die;
281        }
282        else {
283          $type = pop @{$self->{basestack}};
284          $self->{urlhandler}->unsetbase($type);
285        }
286 }
204  
205 + # ------------------- Tag Routines -----------------------------------
206   sub Doc_Start {
207          my $self=shift;
208          my $name=shift;
# Line 296 | Line 214 | sub Doc_Start {
214             $self->{docobject}=$$hashref{'type'};
215          }
216   }
299
300 sub userinterface {
301        my $self=shift;
302        @_?$self->{userinterface}=shift
303          :$self->{userinterface}
304 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines