Changeset 25888 for gs3-extensions

Timestamp:

2012-06-28T18:54:11+12:00 (12 years ago)

Author:

ak19

Message:

First working version of activate.pl modified for handling solr collections. It needs to update solr cores when moving building to index.

File:

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

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

@@ -204 +204 @@
 }
 
-
+# Some of the Solr CoreAdmin API calls available. 
+# See http://wiki.apache.org/solr/CoreAdmin
 sub admin_reload_core
 {
@@ -215 +216 @@
 }
 
+sub admin_rename_core
+{
+    my $self = shift @_;
+    my ($oldcore, $newcore) = @_;
+
+    my $cgi_get_args = "action=RENAME&core=$oldcore&other=$newcore";
+
+    $self->_admin_service($cgi_get_args);
+}
+
+sub admin_swap_core
+{
+    my $self = shift @_;
+    my ($oldcore, $newcore) = @_;
+
+    my $cgi_get_args = "action=SWAP&core=$oldcore&other=$newcore";
+
+    $self->_admin_service($cgi_get_args);
+}
+
+# The ALIAS action is not supported in our version of solr (despite it
+# being marked as experimental in the documentation for Core Admin)
+sub admin_alias_core
+{
+    my $self = shift @_;
+    my ($oldcore, $newcore) = @_;
+
+    my $cgi_get_args = "action=ALIAS&core=$oldcore&other=$newcore";
+
+    $self->_admin_service($cgi_get_args);
+}
 
 sub admin_create_core
 {
     my $self = shift @_;
-    my ($core,$removeold) = @_;
+    my ($core, $data_parent_dir) = @_; # data_parent_dir is optional, can be index_dir. Defaults to builddir if not provided
 
     my ($ds_idx) = ($core =~ m/^.*-(.*?)$/);
@@ -227 +259 @@
     my $collect_home = $ENV{'GSDLCOLLECTDIR'};
     my $etc_dirname = &util::filename_cat($collect_home,"etc");
-        
-    my $build_dir = $self->{'build_dir'};
-    my $idx_dirname = &util::filename_cat($build_dir,$ds_idx);
+
+    if(!defined $data_parent_dir) {
+    $data_parent_dir = $self->{'build_dir'};
+    } 
+    
+    my $idx_dirname = &util::filename_cat($data_parent_dir,$ds_idx); # "dataDir"  
         
     $cgi_get_args .= "&instanceDir=$etc_dirname";
@@ -237 +272 @@
 }
 
-
+# removes (unloads) core from th eext/solr/sorl.xml config file
+sub admin_unload_core
+{
+    my $self = shift @_;
+    my ($core) = @_;
+
+    my $cgi_get_args = "action=UNLOAD&core=$core"; # &deleteIndex=true from Solr3.3
+
+    $self->_admin_service($cgi_get_args);
+}
+
+sub copy_solrxml_to_web
+{
+    my $self = shift @_;
+
+    my $ext_solrxml = &util::filename_cat($ENV{'GEXT_SOLR'}, "solr.xml");
+    my $web_solrxml = &util::filename_cat($ENV{'GSDL3HOME'}, "ext", "solr", "solr.xml");
+
+    #print STDERR "@@@@ Copying $ext_solrxml to $web_solrxml...\n";
+
+    &util::cp($ext_solrxml, $web_solrxml);
+}
 
 sub start