Show
Ignore:
Timestamp:
16.07.2014 21:09:14 (5 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm

    r27815 r29142  
    318318     
    319319    # make sure output conf directory exists 
    320     if (!FileUtils::directoryExists($out_dirname)) { 
     320    if (!&FileUtils::directoryExists($out_dirname)) { 
    321321    &FileUtils::makeDirectory($out_dirname); 
    322322    } 
     
    328328 
    329329    my @in_file_list = ( "solrconfig.xml", "stopwords.txt", "stopwords_en.txt", 
    330              "synonyms.txt", "protwords.txt" ); 
     330             "synonyms.txt", "protwords.txt", "currency.xml", "elevate.xml" ); 
    331331  
    332332    foreach my $file ( @in_file_list ) { 
    333333    my $in_filename = &FileUtils::filenameConcatenate($in_dirname,$file.".in"); 
    334334    my $out_filename = &FileUtils::filenameConcatenate($out_dirname,$file); 
    335     filter_in_out_file($in_filename,$out_filename,[]); 
     335 
     336    if(&FileUtils::fileExists($in_filename)) { 
     337        filter_in_out_file($in_filename,$out_filename,[]); 
     338    } 
     339    } 
     340 
     341    my @in_dir_list = ( "lang" ); 
     342    foreach my $dir ( @in_dir_list ) { 
     343     
     344    my $full_subdir_name = &FileUtils::filenameConcatenate($in_dirname,$dir); 
     345 
     346    if(&FileUtils::directoryExists($full_subdir_name)) { 
     347        &FileUtils::copyFilesRecursiveNoSVN($full_subdir_name, $out_dirname); 
     348    } 
    336349    } 
    337350} 
     
    469482        &FileUtils::makeDirectory($full_index_dir); 
    470483 
     484        my $full_tlog_dir = &FileUtils::filenameConcatenate($full_index_dir, "tlog"); 
     485        &FileUtils::makeDirectory($full_tlog_dir); 
     486 
    471487        # Solr then wants an "index" folder within this general index area! 
    472488#       my $full_index_index_dir = &FileUtils::filenameConcatenate($full_index_dir,"index");