Changeset 27880 for main

Timestamp:

2013-07-16T15:40:31+12:00 (11 years ago)

Author:

ak19

Message:

Intermediate commit. Bugfix to what broke ISIS/Marc tutorials. The archives doc dirs for each of the many records were not being created. This is an intermediate commit that fixes the bug in the usual situation. Dr Bainbridge has a better solution in mind that, once John has created the parallel building FileUtils subroutines for, will work in the parallel case too.

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -623 +623 @@
 }
 
+# Before parallel building, this was the method that created the new doc dirs in archives
+sub get_new_doc_dir_OLD {
+   my $self = shift (@_);  
+   my($working_info,$working_dir,$OID) = @_;      
+   
+   
+   my $doc_dir = "";
+   my $doc_dir_rest = $OID;
+
+   # remove any \ and / from the OID
+   $doc_dir_rest =~ s/[\\\/]//g;
+
+   # Remove ":" if we are on Windows OS, as otherwise they get confused with the drive letters
+   $doc_dir_rest =~ s/\://g if ($ENV{'GSDLOS'} =~ /^windows$/i);
+
+   my $doc_dir_num = 0;
+
+   do {
+       $doc_dir .= "/" if $doc_dir_num > 0;
+       my $pattern = '^(.{1,' . $self->{'subdir_split_length'} . '})';
+       if ($self->{'subdir_hash_prefix'})
+       {
+         $pattern = '^((HASH)?.{1,' . $self->{'subdir_split_length'} . '})';
+       }
+       #if ($doc_dir_rest =~ s/^(.{1,$limit})//) {
+       if ($doc_dir_rest =~ s/$pattern//i)
+       {
+       $doc_dir .= $1;
+       $doc_dir_num++;
+       }
+   } while ($doc_dir_rest ne "" && 
+        ((-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) || 
+         ($working_info->size() >= 1024 && $doc_dir_num < 2)));
+   my $i = 1;
+   my $doc_dir_base = $doc_dir;
+   while (-d &FileUtils::filenameConcatenate($working_dir, "$doc_dir.dir")) {
+       $doc_dir = "$doc_dir_base-$i";
+       $i++;
+   }
+          
+   return "$doc_dir.dir";
+}
+
 ## @function get_new_doc_dir()
 #
@@ -675 +718 @@
       $doc_dir .= $1;
       $doc_dir_num++;
-      $created_directory = &FileUtils::makeAllDirectories(&FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir'));
-    }
-    my $new_dir = &FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir');
+      my $full_doc_dir = &FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir');
+      if(!FileUtils::directoryExists($full_doc_dir)) {
+        &FileUtils::makeAllDirectories($full_doc_dir);
+        $created_directory = 1;
+      }
+    }
+    ###my $new_dir = &FileUtils::filenameConcatenate($working_dir, $doc_dir . '.dir');
     ###rint STDERR "[DEBUG] BasePlugout::get_new_doc_dir(<working_info>, $working_dir, $oid)\n";
     ###rint STDERR " - create directory: $new_dir => $created_directory\n";