Changeset 27306 for main/trunk/greenstone2/perllib/mgppbuilder.pm

Timestamp:

2013-05-06T15:29:38+12:00 (11 years ago)

Author:

jmt12

Message:

Moving the critical file-related functions (copy, rm, etc) out of util.pm into their own proper class FileUtils. Use of the old functions in util.pm will prompt deprecated warning messages. There may be further functions that could be moved across in the future, but these are the critical ones when considering supporting other filesystems (HTTP, HDFS, WebDav, etc). Updated some key files to use the new functions so now deprecated messages thrown when importing/building demo collection 'out of the box'

File:

• main/trunk/greenstone2/perllib/mgppbuilder.pm (modified) (7 diffs)

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -31 +31 @@
 use strict; no strict 'refs';
 use util;
+use FileUtils;
 
 
@@ -171 +172 @@
     my $exedir = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
     my $exe = &util::get_os_exe ();
-    my $mgpp_passes_exe = &util::filename_cat($exedir, "mgpp_passes$exe");
-    my $mgpp_compression_dict_exe = &util::filename_cat($exedir, "mgpp_compression_dict$exe");
+    my $mgpp_passes_exe = &FileUtils::filenameConcatenate($exedir, "mgpp_passes$exe");
+    my $mgpp_compression_dict_exe = &FileUtils::filenameConcatenate($exedir, "mgpp_compression_dict$exe");
     my $outhandle = $self->{'outhandle'};
 
     my $maxnumeric = $self->{'maxnumeric'};
     
-    &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));
+    &FileUtils::makeAllDirectories (&FileUtils::filenameConcatenate($self->{'build_dir'}, "text"));
 
     my $collect_tail = &util::get_dirsep_tail($self->{'collection'});
-    my $basefilename = &util::filename_cat("text",$collect_tail);
-    my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, $basefilename);
+    my $basefilename = &FileUtils::filenameConcatenate("text",$collect_tail);
+    my $fulltextprefix = &FileUtils::filenameConcatenate($self->{'build_dir'}, $basefilename);
     
     my $osextra = "";
@@ -384 +385 @@
     # get the full index directory path and make sure it exists
     my $indexdir = $self->{'index_mapping'}->{$index};
-    &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, $indexdir));
+    &FileUtils::makeAllDirectories (&FileUtils::filenameConcatenate($self->{'build_dir'}, $indexdir));
 
     my $collect_tail = &util::get_dirsep_tail($self->{'collection'});
-    my $fullindexprefix = &util::filename_cat ($self->{'build_dir'}, 
+    my $fullindexprefix = &FileUtils::filenameConcatenate($self->{'build_dir'}, 
                            $indexdir, 
                            $collect_tail);
-    my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, "text", 
+    my $fulltextprefix = &FileUtils::filenameConcatenate($self->{'build_dir'}, "text", 
                            $collect_tail);
 
@@ -397 +398 @@
 
     my $exe = &util::get_os_exe ();
-    my $mgpp_passes_exe = &util::filename_cat($exedir, "mgpp_passes$exe");
+    my $mgpp_passes_exe = &FileUtils::filenameConcatenate($exedir, "mgpp_passes$exe");
 
     # define the section names for mgpasses
@@ -406 +407 @@
 
     my $mgpp_perf_hash_build_exe = 
-    &util::filename_cat($exedir, "mgpp_perf_hash_build$exe");
+    &FileUtils::filenameConcatenate($exedir, "mgpp_perf_hash_build$exe");
     my $mgpp_weights_build_exe = 
-    &util::filename_cat ($exedir, "mgpp_weights_build$exe");
+    &FileUtils::filenameConcatenate($exedir, "mgpp_weights_build$exe");
     my $mgpp_invf_dict_exe = 
-    &util::filename_cat ($exedir, "mgpp_invf_dict$exe");
+    &FileUtils::filenameConcatenate($exedir, "mgpp_invf_dict$exe");
     my $mgpp_stem_idx_exe =
-    &util::filename_cat ($exedir, "mgpp_stem_idx$exe");
+    &FileUtils::filenameConcatenate($exedir, "mgpp_stem_idx$exe");
 
     my $maxnumeric = $self->{'maxnumeric'};
@@ -595 +596 @@
 
     # remove unwanted files
-    my $tmpdir = &util::filename_cat ($self->{'build_dir'}, $indexdir);
+    my $tmpdir = &FileUtils::filenameConcatenate($self->{'build_dir'}, $indexdir);
     opendir (DIR, $tmpdir) || die
         "mgppbuilder::build_index - couldn't read directory $tmpdir\n";
@@ -604 +605 @@
         # delete it!
         print $outhandle "deleting $file\n" if $self->{'verbosity'} > 2;
-        #&util::rm (&util::filename_cat ($tmpdir, $file));
+        #&util::rm (&FileUtils::filenameConcatenate($tmpdir, $file));
         }
     }