Changeset 28128 for gs3-extensions/solr/trunk/src/perllib
- Timestamp:
- 2013-08-26T13:48:56+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/perllib/solrserver.pm
r27858 r28128 212 212 { 213 213 my $self = shift @_; 214 my ($src_file,$dst_file,$re_substitutions) = @_; 215 216 my $ sep = shift @_ || "/";217 my $ flags = shift @_ || "g";214 215 my $src_file = shift @_; 216 my $dst_file = shift @_; 217 my $re_substitutions = shift @_; 218 218 219 219 # $re_substitutions is a hashmap of the form: [re_key] => subst_str 220 220 221 221 my $content = ""; 222 222 … … 241 241 # and flags (default 'g') to be parameterized 242 242 243 my $eval_str = "\$content =~ s$sep$re_key$sep$subst_str$sep$flags"; 244 245 eval { 246 $eval_str; 247 }; 248 if ($@) { 249 print STDERR "Warning: failed to evaluate\n $eval_str\n$@\n"; 250 } 251 243 $content =~ s/$re_key/$subst_str/g; 252 244 } 253 245 … … 270 262 my $web_solrxml = &util::filename_cat($web_solr_ext_dir, "solr.xml"); 271 263 272 my $replacement_map = { "$gsdl3home" => "\\\@gsdl3home\\\@" }; 273 274 $self->filtered_copy($web_solrxml,$web_solrxml_in,$replacement_map, "^", "g"); 264 my $gsdl3home_re = &util::filename_to_regex($gsdl3home); 265 266 my $replacement_map = { qr/$gsdl3home_re/ => "\@gsdl3home\@" }; 267 268 $self->filtered_copy($web_solrxml,$web_solrxml_in,$replacement_map); 275 269 } 276 270 … … 285 279 my $web_solrxml = &util::filename_cat($web_solr_ext_dir, "solr.xml"); 286 280 287 my $replacement_map = { "\\\@gsdl3home\\\@" => "$gsdl3home" }; 288 289 $self->filtered_copy($web_solrxml_in,$web_solrxml,$replacement_map, "^", "g"); 281 my $gsdl3home_re = &util::filename_to_regex($gsdl3home); 282 283 my $replacement_map = { qr/\@gsdl3home\@/ => $gsdl3home_re }; 284 285 $self->filtered_copy($web_solrxml_in,$web_solrxml,$replacement_map); 290 286 } 291 287
Note:
See TracChangeset
for help on using the changeset viewer.