Changeset 24497 for gs3-extensions

Timestamp:

2011-08-26T17:33:20+12:00 (13 years ago)

Author:

davidb

Message:

Refinement to use $site information in multi-core name

File:

• gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm (modified) (2 diffs)

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

@@ -263 +263 @@
     my @in_file_list = ( "solrconfig.xml", "stopwords.txt", "stopwords_en.txt",
              "synonyms.txt", "protwords.txt" );
-
+ 
     foreach my $file ( @in_file_list ) {
     my $in_filename = &util::filename_cat($in_dirname,$file.".in");
@@ -369 +369 @@
     my $idx = "idx";
 
+    my $site = $self->{'site'};
+
     foreach my $level (keys %{$self->{'levels'}}) {
     
     my ($pindex) = $level =~ /^(.)/;
     
-##  my $llevel = $mgppbuilder::level_map{$level};
-##  my $core = $collection."-".lc($llevel);
-        
     my $core = $collection."-".$pindex.$idx;
+
+    # prefix site if exists (e.g. Greenstone 3)
+    $core = "$site-$core" if defined $site;
 
     # if collect==core already in solr.xml (check with STATUS)