Changeset 22328

Timestamp:

2010-06-30T12:57:29+12:00 (14 years ago)

Author:

kjdon

Message:

store the path to doc.xml with unix / slashes so that the collection can be copied between OS and still be rebuilt without reimport. Note that full paths are used for file paths (not for doc.xml path) so incremental build won't work if collection is moved

File:

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

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

@@ -693 +693 @@
 #       $real_filename =~ s/^$collect_dir_re_safe//;
 #       }
+        
         if (defined $reverse_lookups) {
         $reverse_lookups->{$real_filename} = 1;
@@ -723 +724 @@
     my $oid = $doc_obj->get_OID();
     my $source_filename = $doc_obj->get_unmodified_source_filename();
-
     my $working_info = $self->{'output_info'}; 
     my $doc_info = $working_info->get_info($oid);
 
     my ($doc_file,$index_status,$sortmeta) = @$doc_info;
-
+    # doc_file is the path to the archive doc.xml. Make sure it has unix 
+    # slashes, then if the collection is copied to linux, it can be built without reimport
+    $doc_file =~ s/\\/\//g;
     my $oid_files = { 'doc-file' => $doc_file,
               'index-status' => $index_status,