Changeset 15117 for gsdl/trunk

Timestamp:

2008-03-20T20:54:49+13:00 (16 years ago)

Author:

ak19

Message:

Dr Bainbridge made some changes to tidy up the code (replaced file global params with args and removed unnecessary statements)

File:

• gsdl/trunk/perllib/acronym.pm (modified) (6 diffs)

gsdl/trunk/perllib/acronym.pm

@@ -58 +58 @@
 my @acronym_list = ();
 
-#the file to collate acronyms into
-my $acronym_accumulate_file = $ENV{'GSDLCOLLECTDIR'} . "/etc/acronym_definitions.pm";
-my $acronym_options_file = $ENV{'GSDLCOLLECTDIR'} . "/etc/acronym_options.pm";
 
 my %acronyms_found_in_collection = ();
@@ -87 +84 @@
     my $local_allow_all_caps = $allow_all_caps;
     my @local_stop_words = @stop_words;
-    my $local_acronym_accumulate_file = $acronym_accumulate_file;
-    
-    
+    
+    
+    # the file to collate acronyms into
+
+    my $def_acronym_acc_file_pm = '&util::filename_cat($ENV{\'GSDLCOLLECTDIR\'}, "etc","acronym_definitions.pm");';
+    my $acronym_accumulate_file = eval { $def_acronym_acc_file_pm };
+    my $acronym_options_file = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc","acronym_options.pm");
+
+
     my $file_text = "";
     if (open ACRONYM_HANDLE, "<$acronym_options_file")
@@ -99 +102 @@
     print STDERR "failed to open $acronym_options_file\n";
     open ACRONYM_HANDLE, ">$acronym_options_file\n";
+    print ACRONYM_HANDLE "use util;\n";
     print ACRONYM_HANDLE "#Config file for acronym extraction. EDIT THIS FILE, it should\n";
     print ACRONYM_HANDLE "#not be overridden by the software. It's read by GSDL using perl's\n";
@@ -129 +133 @@
     print ACRONYM_HANDLE "\n"; 
     print ACRONYM_HANDLE "#the file to collate acronyms into\n";
-    print ACRONYM_HANDLE "\$local_acronym_accumulate_file = \$ENV{'GSDLCOLLECTDIR'} . \"/etc/acronym_definitions.pm\";\n";
+    print ACRONYM_HANDLE "\$acronym_accumulate_file = $def_acronym_acc_file_pm\n";
     print ACRONYM_HANDLE "\n";
     print ACRONYM_HANDLE "# any acronym definitions which should always be marked up can be copied here\n";
@@ -153 +157 @@
     $allow_all_caps = $local_allow_all_caps;
     @stop_words = @local_stop_words;
-    
-    $local_acronym_accumulate_file = $local_acronym_accumulate_file;
-    
-
-    &read_all_acronyms_from_file();
+        
+
+    &read_all_acronyms_from_file($acronym_accumulate_file);
 #    rename $acronym_file, $acronym_file . "." . int(rand (2<<7)). 
 #   int(rand (2<<7)). int(rand (2<<7)). int(rand (2<<7));
@@ -187 +189 @@
 #eval a file of accumulated acronyms
 sub read_all_acronyms_from_file {
-    
+    my ($acronym_accumulate_file) = @_;
+
     my $file_text = " ";
     if (open ACRONYM_HANDLE, "<$acronym_accumulate_file")