Changeset 28211 for main/trunk/greenstone2/perllib/inexport.pm

Timestamp:

2013-09-04T21:46:07+12:00 (11 years ago)

Author:

ak19

Message:

No more absolute paths in archiveinf-doc.gdb and archiveinf-src.gdb

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -729 +729 @@
     &dbutil::read_infodb_file($collectcfg->{'infodbtype'}, $arcinfo_src_filename, $arcinfodb_map);
     foreach my $f (@full_new_files) {
+        my $rel_f = &util::abspath_to_placeholders($f);
+
         # check that we haven't seen it already
-        if (defined $arcinfodb_map->{$f}) {
+        if (defined $arcinfodb_map->{$rel_f}) {
         # TODO make better warning
-        print STDERR "Warning: $f already in src archive, \n";
+        print STDERR "Warning: $f ($rel_f) already in src archive, \n";
         } else {
         $block_hash->{'new_files'}->{$f} = 1;
@@ -1283 +1285 @@
     # that this file is used in (note in most cases, it's just one OID)
     
-    my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file);
+    my $relfile = &util::abspath_to_placeholders($file);
+
+    my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $relfile);
     my $oids = $src_rec->{'oid'};
     my $file_record_deleted = 0;
@@ -1289 +1293 @@
     # delete the src record
     my $src_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_src_filename, "append");
-    &dbutil::delete_infodb_entry($infodbtype, $src_infodb_file_handle, $file);
+    &dbutil::delete_infodb_entry($infodbtype, $src_infodb_file_handle, $relfile);
     &dbutil::close_infodb_write_handle($infodbtype, $src_infodb_file_handle);
 
@@ -1298 +1302 @@
         my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $oid);
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
+        $doc_source_file = &util::placeholders_to_abspath($doc_source_file);
+
         if (!&util::filename_is_absolute($doc_source_file)) {
         $doc_source_file = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$doc_source_file);