Changeset 37208 for main

Timestamp:

2023-01-29T17:25:11+13:00 (15 months ago)

Author:

davidb

Message:

Minor whitespace and variable name changes

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -138 +138 @@
        'type' => 'enum',
        'list' => [ { 'name' => "copy",      'desc' => "{import.assocfile_copymode_copy}"     },
-            { 'name' => "hardlink",  'desc' => "{import.assocfile_copymode_hardlink}" } ],
+           { 'name' => "hardlink",  'desc' => "{import.assocfile_copymode_hardlink}" } ],
        'deft' => 'copy',
        'reqd' => 'yes',
@@ -1027 +1027 @@
     } # end if (manifest ne "")
     else {
-    # if incremental, we read through the import folder to see whats changed.
+    # if incremental, we read through the import folder to see what's changed.
 
     if ($incremental || $incremental_mode eq "onlyadd") {
@@ -1047 +1047 @@
         # only look for deletions if we are truely incremental
         my @deleted_files = sort keys %{$block_hash->{'deleted_files'}};
+
         # Filter out any in gsdl/tmp area
         my @filtered_deleted_files = ();
-        my $gsdl_tmp_area = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "tmp");
+
+        my $gsdl_tmp_area    = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "tmp");
         my $collect_tmp_area = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "tmp");
-        $gsdl_tmp_area = &util::filename_to_regex($gsdl_tmp_area);
-        $collect_tmp_area = &util::filename_to_regex($collect_tmp_area);
+        
+        my $gsdl_tmp_area_re    = &util::filename_to_regex($gsdl_tmp_area);
+        my $collect_tmp_area_re = &util::filename_to_regex($collect_tmp_area);
         
         foreach my $df (@deleted_files) {
-            next if ($df =~ m/^$gsdl_tmp_area/);
-            next if ($df =~ m/^$collect_tmp_area/);
+            next if ($df =~ m/^$gsdl_tmp_area_re/);
+            next if ($df =~ m/^$collect_tmp_area_re/);
             
             push(@filtered_deleted_files,$df);
@@ -1076 +1079 @@
         my @reindex_files = sort keys %{$block_hash->{'reindex_files'}};
         
-        if (scalar(@reindex_files)>0) {
+        if (scalar(@reindex_files) > 0) {
             print STDERR "Files to reindex since last import:\n  ";
             print STDERR join("\n  ",@reindex_files), "\n";