Changeset 15960 for greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm
- Timestamp:
- 2008-06-11T20:43:46+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm
r14368 r15960 216 216 } 217 217 218 sub get_java_home { 219 my $self = shift @_; 220 221 if (defined $self->{'javahome'}) { 222 return $self->{'javahome'}; 223 } 224 225 my $javahome = $self->get_config_info("javahome"); 226 227 $javahome =~ s/(\/|\\)$//; # remove trailing slash 228 229 $self->{'javahome'} = $javahome; 230 231 return $javahome; 232 } 233 218 234 sub get_gsdl_os { 219 235 my $self = shift @_; … … 242 258 my $gsdlhome = $self->get_gsdl_home(); 243 259 my $gsdlos = $self->get_gsdl_os(); 260 my $javahome = $self->get_java_home(); 244 261 245 262 $ENV{'GSDL3SRCHOME'} = $gsdl3srchome; 246 263 $ENV{'GSDLHOME'} = $gsdlhome; 247 264 $ENV{'GSDLOS'} = $gsdlos; 265 $ENV{'JAVA_HOME'} = $javahome; 266 248 267 require "$gsdlhome/perllib/util.pm"; 249 268 … … 345 364 } 346 365 366 347 367 1; 348 368
Note:
See TracChangeset
for help on using the changeset viewer.