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

Timestamp:

2010-12-14T16:16:48+13:00 (13 years ago)

Author:

davidb

Message:

read_infodb_entry now returns a hashmap directly. Code updated to take advantage of this, and in places where the hashmap is not needed, the alternative read_infodb_rawentry is called.

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -944 +944 @@
         # is it modified??
         if (-M $full_curr_file < $archiveinf_timestamp) {
-            print STDERR "*** Detected a modified metadata file: $full_curr_file\n" if $verbosity > 2;
+            print STDERR "*** Detected a *modified metadata* file: $full_curr_file\n" if $verbosity >= 2;
             # its newer than last build
             $block_hash->{'new_or_modified_metadata_files'}->{$full_curr_file} = 1;
@@ -974 +974 @@
         # Greenstone to always be this)
 
-        print STDERR "***** Detected new metadata file: $full_curr_file\n" if $verbosity > 2;
+        print STDERR "*** Detected *new* metadata file: $full_curr_file\n" if $verbosity >= 2;
         $block_hash->{'new_or_modified_metadata_files'}->{$full_curr_file} = 1;
         }
@@ -1012 +1012 @@
     
         if ($existing_f =~ m/^$situated_dir/) {
+
+        print STDERR "**** Existing file $existing_f\nis located within\n$situated_dir\n";
+
         push(@$reindex_files,$existing_f);
         $block_hash->{'reindex_files'}->{$existing_f} = 1;
@@ -1107 +1110 @@
     # that this file is used in (note in most cases, it's just one OID)
     
-    my $src_rec_string = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file);
-    my $src_rec = &dbutil::convert_infodb_string_to_hash($src_rec_string);
+    my $src_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file);
     my $oids = $src_rec->{'oid'};
     my $file_record_deleted = 0;
@@ -1121 +1123 @@
 
         # find the source doc (the primary file that becomes this oid)
-        my $doc_rec_string = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $oid);
-        my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
+        my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $oid);
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
         if (!&util::filename_is_absolute($doc_source_file)) {
@@ -1142 +1143 @@
         # mark oid for deletion (it will be deleted or reimported)
         $archive_info->set_status_info($oid,"D");
-        my $val = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $oid);
+        my $val = &dbutil::read_infodb_rawentry($infodbtype, $arcinfo_doc_filename, $oid);
         $val =~ s/^<index-status>(.*)$/<index-status>D/m;