Changeset 28128 for gs3-extensions/solr/trunk

Timestamp:

2013-08-26T13:48:56+12:00 (11 years ago)

Author:

davidb

Message:

Code as written (with 'eval') was resulting in a 'Useless use of private variable in void context. Refactored to avoid this.

File:

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

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

@@ -212 +212 @@
 {
     my $self = shift @_;
-    my ($src_file,$dst_file,$re_substitutions) = @_;
-
-    my $sep = shift @_ || "/";
-    my $flags = shift @_ || "g";
+
+    my $src_file = shift @_;
+    my $dst_file = shift @_;
+    my $re_substitutions = shift @_;
 
     # $re_substitutions is a hashmap of the form: [re_key] => subst_str
-
+    
     my $content = "";
 
@@ -241 +241 @@
     # 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";
-    }
-
+    $content =~ s/$re_key/$subst_str/g;
     }
     
@@ -270 +262 @@
     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");
+    my $gsdl3home_re = &util::filename_to_regex($gsdl3home);
+
+    my $replacement_map = { qr/$gsdl3home_re/ => "\@gsdl3home\@" };
+
+    $self->filtered_copy($web_solrxml,$web_solrxml_in,$replacement_map);
 }
 
@@ -285 +279 @@
     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");
+    my $gsdl3home_re = &util::filename_to_regex($gsdl3home);
+
+    my $replacement_map = { qr/\@gsdl3home\@/ => $gsdl3home_re };
+
+    $self->filtered_copy($web_solrxml_in,$web_solrxml,$replacement_map);
 }