Changeset 28564 for main

Timestamp:

2013-10-31T11:31:06+13:00 (10 years ago)

Author:

kjdon

Message:

changing some util:: methods to FileUtils:: methods

Location:

main/trunk/greenstone2/perllib/classify

Files:

• AZCompactList.pm (modified) (2 diffs)
• AZCompactSectionList.pm (modified) (2 diffs)
• HFileHierarchy.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/classify/AZCompactList.pm

@@ -32 +32 @@
 use BaseClassifier;
 use sorttools;
+use FileUtils;
 
 use Unicode::Normalize;
@@ -356 +357 @@
     {
     my $listname 
-        = &util::filename_cat($ENV{'GSDLHOME'},"perllib/classify/$pm.pm");
+        = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"perllib/classify/$pm.pm");
     if (-e $listname) { require $listname; }
     else 

main/trunk/greenstone2/perllib/classify/AZCompactSectionList.pm

@@ -10 +10 @@
 
 use AZCompactList;
+use FileUtils;
+
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
@@ -97 +99 @@
     {
     my $listname 
-        = &util::filename_cat($ENV{'GSDLHOME'},"perllib/classify/$pm.pm");
+        = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"perllib/classify/$pm.pm");
     if (-e $listname) { require $listname; }
     else 

main/trunk/greenstone2/perllib/classify/HFileHierarchy.pm

@@ -125 +125 @@
     if ($self->{'hfile'}) {
     my $hfile = $self->{'hfile'};
-    my $subjectfile;
-    $subjectfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
+    my $subjectfile;  
+    $subjectfile = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
     if (!-e $subjectfile) {
         my $collfile = $subjectfile;
-        $subjectfile = &util::filename_cat($ENV{'GSDLHOME'},"etc", $hfile);
+        $subjectfile = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"etc", $hfile);
         if (!-e $subjectfile) {
         my $outhandle = $self->{'outhandle'};