Changeset 27858 for gs3-extensions/solr

Timestamp:

2013-07-15T19:51:31+12:00 (11 years ago)

Author:

davidb

Message:

Methods added to generate solr.xml.in from solr.xml and vice versa. Routines to help with installing Greenstone from a binary release, and having the solr.xml file just right (i.e. with the correct value of GSDL3HOME for the users install) so the solr-jdbm-demo collection.

File:

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

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

@@ -209 +209 @@
 }
 
+sub filtered_copy
+{
+    my $self = shift @_;
+    my ($src_file,$dst_file,$re_substitutions) = @_;
+
+    my $sep = shift @_ || "/";
+    my $flags = shift @_ || "g";
+
+    # $re_substitutions is a hashmap of the form: [re_key] => subst_str
+
+    my $content = "";
+
+    if (open(FIN,'<:utf8',$src_file)) {
+
+    my $line;
+    while (defined($line=<FIN>)) {
+        $content .= $line;
+    }
+    }
+
+    close(FIN);
+
+    # perform RE string substitutions
+    foreach my $re_key (keys %$re_substitutions) {
+
+    my $subst_str = $re_substitutions->{$re_key};
+
+    # Perform substitution of the form:
+    #  $content =~ s/$re_key/$subst_str/g;
+    # but allow allow separator char (default '/') 
+    # and flags (default 'g') to be parameterized
+
+    my $eval_str = "\$content =~ s$sep$re_key$sep$subst_str$sep$flags";
+
+    eval {
+        $eval_str;
+    };
+    if ($@) {
+        print STDERR "Warning: failed to evaluate\n   $eval_str\n$@\n";
+    }
+
+    }
+    
+    if (open(FOUT, '>:utf8', $dst_file)) {
+    print FOUT $content;
+    close(FOUT);
+    }
+    else {
+    print STDERR "Error: Failed to open file '$dst_file' for writing.\n$!\n";
+    }   
+}
+
+sub solr_xml_to_solr_xml_in
+{
+    my $self = shift @_;
+
+    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");
+
+    my $replacement_map = { "$gsdl3home" => "\\\@gsdl3home\\\@" };
+ 
+    $self->filtered_copy($web_solrxml,$web_solrxml_in,$replacement_map, "^", "g");
+}
+
+
+sub solr_xml_in_to_solr_xml
+{
+    my $self = shift @_;
+
+    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");
+    
+    my $replacement_map = { "\\\@gsdl3home\\\@" => "$gsdl3home" };
+ 
+    $self->filtered_copy($web_solrxml_in,$web_solrxml,$replacement_map, "^", "g");
+}
+
+
 # Some of the Solr CoreAdmin API calls available. 
 # See http://wiki.apache.org/solr/CoreAdmin
@@ -219 +301 @@
 
     $self->_admin_service($cgi_get_args);
+
+    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -229 +313 @@
 
     $self->_admin_service($cgi_get_args);
+
+    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -239 +325 @@
 
     $self->_admin_service($cgi_get_args);
+
+    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -251 +339 @@
 
     $self->_admin_service($cgi_get_args);
+
+    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -275 +365 @@
 
     $self->_admin_service($cgi_get_args);
+
+    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -289 +381 @@
 
     $self->_admin_service($cgi_get_args);
+
+    $self->solr_xml_to_solr_xml_in();
 }
 
@@ -295 +389 @@
     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");
+    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();
 }