Changeset 29142 for gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm

Timestamp:

2014-07-16T21:09:14+12:00 (10 years ago)

Author:

ak19

Message:

Part of port from lucene3.3.0 to lucene4.7.2. Solr related. 1. Java and perl code changes for solr4.7.2; 2. Dr Bainbridge further fixed a bug in how the variable called running is set in solrserver.pm

File:

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

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

@@ -318 +318 @@
     
     # make sure output conf directory exists
-    if (!FileUtils::directoryExists($out_dirname)) {
+    if (!&FileUtils::directoryExists($out_dirname)) {
     &FileUtils::makeDirectory($out_dirname);
     }
@@ -328 +328 @@
 
     my @in_file_list = ( "solrconfig.xml", "stopwords.txt", "stopwords_en.txt",
-             "synonyms.txt", "protwords.txt" );
+             "synonyms.txt", "protwords.txt", "currency.xml", "elevate.xml" );
  
     foreach my $file ( @in_file_list ) {
     my $in_filename = &FileUtils::filenameConcatenate($in_dirname,$file.".in");
     my $out_filename = &FileUtils::filenameConcatenate($out_dirname,$file);
-    filter_in_out_file($in_filename,$out_filename,[]);
+
+    if(&FileUtils::fileExists($in_filename)) {
+        filter_in_out_file($in_filename,$out_filename,[]);
+    }
+    }
+
+    my @in_dir_list = ( "lang" );
+    foreach my $dir ( @in_dir_list ) {
+    
+    my $full_subdir_name = &FileUtils::filenameConcatenate($in_dirname,$dir);
+
+    if(&FileUtils::directoryExists($full_subdir_name)) {
+        &FileUtils::copyFilesRecursiveNoSVN($full_subdir_name, $out_dirname);
+    }
     }
 }
@@ -469 +482 @@
         &FileUtils::makeDirectory($full_index_dir);
 
+        my $full_tlog_dir = &FileUtils::filenameConcatenate($full_index_dir, "tlog");
+        &FileUtils::makeDirectory($full_tlog_dir);
+
         # Solr then wants an "index" folder within this general index area!
 #       my $full_index_index_dir = &FileUtils::filenameConcatenate($full_index_dir,"index");