Changeset 28182
- Timestamp:
- 2013-08-29T15:08:23+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/perllib/solrserver.pm
r28128 r28182 256 256 { 257 257 my $self = shift @_; 258 258 my ($solr_xml_dir) = @_; 259 259 260 my $gsdl3home = $ENV{'GSDL3HOME'}; 260 my $web_solr_ext_dir = &util::filename_cat($gsdl3home, "ext", "solr"); 261 my $web_solrxml_in = &util::filename_cat($web_solr_ext_dir, "solr.xml.in"); 262 my $web_solrxml = &util::filename_cat($web_solr_ext_dir, "solr.xml"); 261 262 if (!defined $solr_xml_dir || !-d $solr_xml_dir) { 263 # if not passed in, use stored solr_live_home 264 $solr_xml_dir = $self->{'solr_live_home'}; 265 } 266 my $solrxml_in = &util::filename_cat($solr_xml_dir, "solr.xml.in"); 267 my $solrxml = &util::filename_cat($solr_xml_dir, "solr.xml"); 263 268 264 269 my $gsdl3home_re = &util::filename_to_regex($gsdl3home); … … 266 271 my $replacement_map = { qr/$gsdl3home_re/ => "\@gsdl3home\@" }; 267 272 268 $self->filtered_copy($ web_solrxml,$web_solrxml_in,$replacement_map);273 $self->filtered_copy($solrxml,$solrxml_in,$replacement_map); 269 274 } 270 275 … … 273 278 { 274 279 my $self = shift @_; 280 my ($solr_xml_dir) = @_; 275 281 276 282 my $gsdl3home = $ENV{'GSDL3HOME'}; 277 my $web_solr_ext_dir = &util::filename_cat($gsdl3home, "ext", "solr"); 278 my $web_solrxml_in = &util::filename_cat($web_solr_ext_dir, "solr.xml.in"); 279 my $web_solrxml = &util::filename_cat($web_solr_ext_dir, "solr.xml"); 283 if (!defined $solr_xml_dir || !-d $solr_xml_dir) { 284 # if not passed in, use stored solr home 285 $solr_xml_dir = $self->{'solr_live_home'}; 286 } 287 my $solrxml_in = &util::filename_cat($solr_xml_dir, "solr.xml.in"); 288 my $solrxml = &util::filename_cat($solr_xml_dir, "solr.xml"); 280 289 281 290 my $gsdl3home_re = &util::filename_to_regex($gsdl3home); … … 283 292 my $replacement_map = { qr/\@gsdl3home\@/ => $gsdl3home_re }; 284 293 285 $self->filtered_copy($ web_solrxml_in,$web_solrxml,$replacement_map);294 $self->filtered_copy($solrxml_in,$solrxml,$replacement_map); 286 295 } 287 296 … … 298 307 $self->_admin_service($cgi_get_args); 299 308 300 $self->solr_xml_to_solr_xml_in();301 309 } 302 310 … … 310 318 $self->_admin_service($cgi_get_args); 311 319 312 $self->solr_xml_to_solr_xml_in();313 320 } 314 321 … … 322 329 $self->_admin_service($cgi_get_args); 323 330 324 $self->solr_xml_to_solr_xml_in();325 331 } 326 332 … … 336 342 $self->_admin_service($cgi_get_args); 337 343 338 $self->solr_xml_to_solr_xml_in();339 344 } 340 345 … … 362 367 $self->_admin_service($cgi_get_args); 363 368 364 $self->solr_xml_to_solr_xml_in();365 369 } 366 370 … … 378 382 $self->_admin_service($cgi_get_args); 379 383 380 $self->solr_xml_to_solr_xml_in();381 }382 383 sub copy_solrxml_to_web384 {385 my $self = shift @_;386 387 my $ext_solrxml = &util::filename_cat($ENV{'GEXT_SOLR'}, "solr.xml.in");388 my $web_solrxml = &util::filename_cat($ENV{'GSDL3HOME'}, "ext", "solr", "solr.xml.in");389 390 #print STDERR "@@@@ Copying $ext_solrxml to $web_solrxml...\n";391 392 &FileUtils::copyFiles($ext_solrxml, $web_solrxml);393 394 $self->solr_xml_in_to_solr_xml();395 384 } 396 385 … … 403 392 404 393 my $solr_home = $ENV{'GEXT_SOLR'}; 394 my $solr_live_home = &util::filename_cat($ENV{'GSDL3HOME'}, "ext", "solr"); 405 395 my $jetty_stop_port = $ENV{'JETTY_STOP_PORT'}; 406 396 my $jetty_server_port = $ENV{'SOLR_JETTY_PORT'}; 407 397 408 398 chdir($solr_home); 409 399 #$self->{'solr_home'} = $solr_home; 400 $self->{'solr_live_home'} = $solr_live_home; 410 401 ## my $solr_etc = &util::filename_cat($solr_home,"etc"); 411 402 412 403 my $server_props = "-DSTOP.PORT=$jetty_stop_port"; 413 404 $server_props .= " -DSTOP.KEY=".$self->{'jetty_stop_key'}; 414 $server_props .= " -Dsolr.solr.home=$solr_home";415 405 #$server_props .= " -Dsolr.solr.home=$solr_home"; 406 $server_props .= " -Dsolr.solr.home=$solr_live_home"; 416 407 my $full_server_jar = $self->{'full_server_jar'}; 417 408
Note:
See TracChangeset
for help on using the changeset viewer.