Changeset 27329 for main/trunk/greenstone2/perllib/lucenebuilder.pm

Timestamp:

2013-05-14T11:11:21+12:00 (11 years ago)

Author:

kjdon

Message:

changes to match mgpp's shortname mapping stuff. Changed some util functions to FileUtil functions

File:

• main/trunk/greenstone2/perllib/lucenebuilder.pm (modified) (10 diffs)

main/trunk/greenstone2/perllib/lucenebuilder.pm

@@ -47 +47 @@
 no strict 'refs';
 use util;
+use FileUtils;
 
 sub BEGIN {
@@ -64 +65 @@
     # If ENABLE_LUCENE was turned off during GS compilation, then we won't be able to
     # continue. Check for existence of LuceneWrapper to see if Lucene was disabled.
-    my $lucene = &util::filename_cat($ENV{'GSDLHOME'},"bin","java","LuceneWrapper.jar");
+    my $lucene = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","LuceneWrapper3.jar");
     if (! -f $lucene) {
     die "***** ERROR: $lucene does not exist\n";      
@@ -74 +75 @@
 
     # So where is lucene_passes.pl anyway?
-    my $lucene_passes_script = &util::filename_cat($scriptdir, "lucene_passes.pl");
+    my $lucene_passes_script = &FileUtils::filenameConcatenate($scriptdir, "lucene_passes.pl");
 
     # So tack perl on the beginning to ensure execution
@@ -109 +110 @@
     if (defined $buildcfg->{'indexfields'}) {
     foreach $field (@{$buildcfg->{'indexfields'}}) {
-        $self->{'buildproc'}->{'indexfields'}->{$field} = 1;
+        # extraindexfields is only supposed to have extra ones in it, not those already specified in indexes. And this list has all indexes in it. But we do a check before including things from extraindexfields whether it was specified in indexes, so it all ok.
+        $self->{'buildproc'}->{'extraindexfields'}->{$field} = 1;
     }
     }
@@ -116 +118 @@
     foreach $field (@{$buildcfg->{'indexfieldmap'}}) {
         my ($f, $v) = $field =~ /^(.*)\-\>(.*)$/;
-        $self->{'buildproc'}->{'indexfieldmap'}->{$f} = $v;
-        $self->{'buildproc'}->{'indexfieldmap'}->{$v} = 1;
+        $self->{'buildproc'}->{'fieldnamemap'}->{$f} = $v;
+        $self->{'buildproc'}->{'fieldnamemap'}->{$v} = 1;
+        $self->{'buildproc'}->{'allindexfields'}->{$f} = 1;
     }
     }       
@@ -151 +154 @@
 
     # the text directory
-    my $text_dir = &util::filename_cat($self->{'build_dir'}, "text");
-    my $build_dir = &util::filename_cat($self->{'build_dir'},"");
-    &util::mk_all_dir ($text_dir);
+    my $text_dir = &FileUtils::filenameConcatenate($self->{'build_dir'}, "text");
+    my $build_dir = &FileUtils::filenameConcatenate($self->{'build_dir'},"");
+    &FileUtils::makeAllDirectories ($text_dir);
 
     my $osextra = "";
@@ -209 +212 @@
     $self->{'buildproc'}->set_index ($textindex);
     $self->{'buildproc'}->set_indexing_text (0);
-    #$self->{'buildproc'}->set_indexfieldmap ($self->{'indexfieldmap'});
     $self->{'buildproc'}->set_levels ($levels);
     $self->{'buildproc'}->set_db_level ($db_level);
@@ -306 +308 @@
     # get the full index directory path and make sure it exists
     my $indexdir = $self->{'index_mapping'}->{$index};
-    &util::mk_all_dir (&util::filename_cat($build_dir, $indexdir));
+    &FileUtils::makeAllDirectories (&FileUtils::filenameConcatenate($build_dir, $indexdir));
 
     # get any os specific stuff
@@ -433 +435 @@
 
     # Get info database file path
-    my $text_directory_path = &util::filename_cat($self->{'build_dir'}, "text");
+    my $text_directory_path = &FileUtils::filenameConcatenate($self->{'build_dir'}, "text");
     my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'infodbtype'}, $self->{'collection'}, $text_directory_path);
 
@@ -460 +462 @@
     #    don't expect to pipe anything to the database so we can do away with the
     #    complex output handle.
-    my $assocdir = &util::filename_cat($self->{'build_dir'}, "assoc");
-    &util::mk_all_dir ($assocdir);
+    my $assocdir = &FileUtils::filenameConcatenate($self->{'build_dir'}, "assoc");
+    &FileUtils::makeAllDirectories ($assocdir);
     $self->{'buildproc'}->set_mode ('incinfodb'); # Very Important
     $self->{'buildproc'}->set_assocdir ($assocdir);