Changeset 32846 for main

Timestamp:

2019-03-04T13:44:41+13:00 (5 years ago)

Author:

ak19

Message:

On windows, our block hash filelists deal in full 'long' pathnames, like gs3-svn-26Feb/web. but reverse_info structure has full paths in windows short form, like GS3-SV~2/web. So need to do a bit of upgrading and downgrading of filenames to make sure when we compare the names we are comparing the same form. By kjdon

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -413 +413 @@
       &FileUtils::sanitizePath($importdir);
     }
+
     if (!&FileUtils::directoryExists($importdir))
     {
@@ -1196 +1197 @@
 
     foreach my $prev_file (keys %$prev_all_files) {
-
+        # arcinfo deals in real filenames ie windows short names. but the block hash stuff is all full long versions.
+    $prev_file = &util::upgrade_if_dos_filename($prev_file);
+    
     if (!&FileUtils::isFilenameAbsolute($prev_file)) {
         my $full_prev_file = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$prev_file);
@@ -1211 +1214 @@
     # there any more => mark them for deletion
     foreach my $curr_file (keys %{$block_hash->{'all_files'}}) {
-    
+      
     my $full_curr_file = $curr_file;
 
@@ -1226 +1229 @@
         # delete it so that only files that need deleting are left
         delete $full_prev_all_files->{$full_curr_file};
-        
         # had it before. is it a metadata file?
         if ($block_hash->{'metadata_files'}->{$full_curr_file}) {
-        
         # is it modified??
         if (-M $full_curr_file < $archiveinf_timestamp) {
@@ -1366 +1367 @@
 
       if (!-e $full_curr_file) {
+            $curr_file = &util::upgrade_if_dos_filename($curr_file);
           $block_hash->{'deleted_files'}->{$curr_file} = 1;
       }
@@ -1398 +1400 @@
     # that this file is used in (note in most cases, it's just one OID)
 
-    my $oids = $archive_info->get_reverseinfo($file);
-    $archive_info->remove_reverseinfo($file);
+    my $downgraded_file = &util::downgrade_if_dos_filename($file);
+    my $oids = $archive_info->get_reverseinfo($downgraded_file);
+    $archive_info->remove_reverseinfo($downgraded_file);
     
     foreach my $oid (@$oids) {
@@ -1406 +1409 @@
         # find the source doc (the primary file that becomes this oid)
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
-        $doc_source_file = &util::placeholders_to_abspath($doc_source_file);
+        $doc_source_file = &util::placeholders_to_abspath($doc_source_file, "long");
 
         if (!&FileUtils::isFilenameAbsolute($doc_source_file)) {
@@ -1414 +1417 @@
         if ($doc_source_file ne $file) {
         # its an associated or metadata file
-        
         # mark source doc for reimport as one of its assoc files has changed or deleted
+        #$doc_source_file = &util::upgrade_if_dos_filename($doc_source_file);
         $block_hash->{'reindex_files'}->{$doc_source_file} = 1;
         
@@ -1427 +1430 @@
             if (!defined $archive_info->get_reverseinfo($assocfile)) {
             # nothing refers to it anymore, mark for reindex.
+                # block hash needs full filenames
+                $assocfile =  &util::upgrade_if_dos_filename($assocfile);
             $block_hash->{'reindex_files'}->{$assocfile} = 1;
             }