Changeset 28182 for gs3-extensions/solr/trunk/src/perllib/solrserver.pm

Timestamp:

2013-08-29T15:08:23+12:00 (11 years ago)

Author:

kjdon

Message:

passing the web/ext/solr dir as solr home to the server. So now it uses the solr.xml file there. We do all modifications in that file, no need to touch the ones in the original solr ext dir. Don't bother copying changes out to .in file each time, we will do that at the end of activate.pl. Once the collection is live, then we can save the changes to the .in file.

File:

• gs3-extensions/solr/trunk/src/perllib/solrserver.pm (modified) (11 diffs)

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -256 +256 @@
 {
     my $self = shift @_;
-
+    my ($solr_xml_dir) = @_;
+    
     my $gsdl3home = $ENV{'GSDL3HOME'};
-    my $web_solr_ext_dir = &util::filename_cat($gsdl3home, "ext", "solr");
-    my $web_solrxml_in = &util::filename_cat($web_solr_ext_dir, "solr.xml.in");
-    my $web_solrxml = &util::filename_cat($web_solr_ext_dir, "solr.xml");
+    
+    if (!defined $solr_xml_dir || !-d $solr_xml_dir) {
+    # if not passed in, use stored solr_live_home
+    $solr_xml_dir = $self->{'solr_live_home'};
+    }
+    my $solrxml_in = &util::filename_cat($solr_xml_dir, "solr.xml.in");
+    my $solrxml = &util::filename_cat($solr_xml_dir, "solr.xml");
 
     my $gsdl3home_re = &util::filename_to_regex($gsdl3home);
@@ -266 +271 @@
     my $replacement_map = { qr/$gsdl3home_re/ => "\@gsdl3home\@" };
 
-    $self->filtered_copy($web_solrxml,$web_solrxml_in,$replacement_map);
+    $self->filtered_copy($solrxml,$solrxml_in,$replacement_map);
 }
 
@@ -273 +278 @@
 {
     my $self = shift @_;
+    my ($solr_xml_dir) = @_;
 
     my $gsdl3home = $ENV{'GSDL3HOME'};
-    my $web_solr_ext_dir = &util::filename_cat($gsdl3home, "ext", "solr");
-    my $web_solrxml_in = &util::filename_cat($web_solr_ext_dir, "solr.xml.in");
-    my $web_solrxml = &util::filename_cat($web_solr_ext_dir, "solr.xml");
+    if (!defined $solr_xml_dir || !-d $solr_xml_dir) {
+    # if not passed in, use stored solr home
+    $solr_xml_dir = $self->{'solr_live_home'};
+    }
+    my $solrxml_in = &util::filename_cat($solr_xml_dir, "solr.xml.in");
+    my $solrxml = &util::filename_cat($solr_xml_dir, "solr.xml");
     
     my $gsdl3home_re = &util::filename_to_regex($gsdl3home);
@@ -283 +292 @@
     my $replacement_map = { qr/\@gsdl3home\@/ => $gsdl3home_re };
 
-    $self->filtered_copy($web_solrxml_in,$web_solrxml,$replacement_map);
+    $self->filtered_copy($solrxml_in,$solrxml,$replacement_map);
 }
 
@@ -298 +307 @@
     $self->_admin_service($cgi_get_args);
 
-    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -310 +318 @@
     $self->_admin_service($cgi_get_args);
 
-    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -322 +329 @@
     $self->_admin_service($cgi_get_args);
 
-    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -336 +342 @@
     $self->_admin_service($cgi_get_args);
 
-    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -362 +367 @@
     $self->_admin_service($cgi_get_args);
 
-    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -378 +382 @@
     $self->_admin_service($cgi_get_args);
 
-    $self->solr_xml_to_solr_xml_in();
-}
-
-sub copy_solrxml_to_web
-{
-    my $self = shift @_;
-
-    my $ext_solrxml = &util::filename_cat($ENV{'GEXT_SOLR'}, "solr.xml.in");
-    my $web_solrxml = &util::filename_cat($ENV{'GSDL3HOME'}, "ext", "solr", "solr.xml.in");
-
-    #print STDERR "@@@@ Copying $ext_solrxml to $web_solrxml...\n";
-
-    &FileUtils::copyFiles($ext_solrxml, $web_solrxml);
-
-    $self->solr_xml_in_to_solr_xml();
 }
 
@@ -403 +392 @@
 
     my $solr_home         = $ENV{'GEXT_SOLR'};
+    my $solr_live_home    = &util::filename_cat($ENV{'GSDL3HOME'}, "ext", "solr");
     my $jetty_stop_port   = $ENV{'JETTY_STOP_PORT'};
     my $jetty_server_port = $ENV{'SOLR_JETTY_PORT'};
 
     chdir($solr_home);
-    
+    #$self->{'solr_home'} = $solr_home;
+    $self->{'solr_live_home'} = $solr_live_home;
 ##    my $solr_etc = &util::filename_cat($solr_home,"etc");
 
     my $server_props = "-DSTOP.PORT=$jetty_stop_port";
     $server_props .= " -DSTOP.KEY=".$self->{'jetty_stop_key'};
-    $server_props .= " -Dsolr.solr.home=$solr_home";
-
+    #$server_props .= " -Dsolr.solr.home=$solr_home";
+$server_props .= " -Dsolr.solr.home=$solr_live_home";
     my $full_server_jar = $self->{'full_server_jar'};