ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/Configuration/ConfigArea.pm
(Generate patch)

Comparing COMP/SCRAM/src/Configuration/ConfigArea.pm (file contents):
Revision 1.13.2.6.2.7.2.2 by williamc, Thu Sep 21 14:17:51 2000 UTC vs.
Revision 1.13.2.6.2.7.2.3 by williamc, Thu Sep 21 15:22:43 2000 UTC

# Line 71 | Line 71 | sub new {
71   sub cache {
72          my $self=shift;
73  
74 –        my $exist=0;
74          if ( @_ ) {
75 <          my $cache=shift;
77 <          if ( $cache!~/^</ ) {
78 <            $self->{cache}=$cache;
79 <          }
80 <          $exist=1;
75 >           $self->{cache}=shift;
76          }
77          if ( ! defined $self->{cache} ) {
78            my $loc=$self->location()."/".$self->{admindir}."/".$self->{cachedir};
79 <          if (  !$exist || ( -e $loc ) ) {
79 >          if ( -e $loc  ) {
80              $self->{cache}=URL::URLcache->new($loc);
81            }
82            else {
# Line 91 | Line 86 | sub cache {
86          return $self->{cache};
87   }
88  
89 + sub _newcache {
90 +        my $self=shift;
91 +        my $loc=$self->location()."/".$self->{admindir}."/".$self->{cachedir};
92 +        $self->{cache}=URL::URLcache->new($loc);
93 +        return $self->{cache};
94 + }
95 +
96 + sub _newobjectstore {
97 +        my $self=shift;
98 +        my $loc=$self->location()."/".$self->{admindir}."/".$self->{dbdir};
99 +        $self->{dbstore}=ObjectUtilities::ObjectStore->new($loc);
100 +        return $self->{dbstore};
101 + }
102 +
103   sub objectstore {
104          my $self=shift;
105  
97 –        my $exist="";
106          if ( @_ ) {
107 <          my $db=shift;
100 <          if ( $db!~/^</ ) {
101 <            $self->{dbstore}=cache;
102 <          }
103 <          $exist="<";
107 >            $self->{dbstore}=shift;
108          }
109          if ( ! defined $self->{dbstore} ) {
110            my $loc=$self->location()."/".$self->{admindir}."/".$self->{dbdir};
111 <          $self->{dbstore}=ObjectUtilities::ObjectStore->new($exist.$loc);
111 >          if ( -e $loc ) {
112 >            $self->{dbstore}=ObjectUtilities::ObjectStore->new($loc);
113 >          }
114 >          else {
115 >            $self->{dbstore}=undef;
116 >          }
117          }
118          return $self->{dbstore}
119   }
# Line 154 | Line 163 | sub setup {
163          AddDir::adddir($workloc);
164  
165          # -- add a cache
166 <        $self->cache();
166 >        $self->_newcache();
167 >
168 >        # -- add an Objectstore
169 >        $self->_newobjectstore();
170  
171          # -- Save Environment File
172          $self->_SaveEnvFile();
# Line 310 | Line 322 | sub satellite {
322  
323          # -- copy across the cache and ObjectStore
324          # -- make sure we dont try building new caches in release areas
325 <        my $rcache=$self->cache("<");
325 >        my $rcache=$self->cache();
326          if ( defined $rcache ) {
327            copy($rcache->location(),$sat->cache()->location());
328          }
329  
330          # -- make sure we dont try building new objectstores in release areas
331 <        my $rostore=$self->objectstore("<");
331 >        my $rostore=$self->objectstore();
332          if ( defined $rostore ) {
333            copy($rostore->location(),$sat->objectstore()->location());
334          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines