Changeset 19775

Timestamp:

2009-06-09T14:37:13+12:00 (15 years ago)

Author:

davidb

Message:

Switch to using more batched approach (for efficiency reasons) for arcinfo writing out DB information

Location:

gsdl/trunk

Files:

• bin/script/import.pl (modified) (1 diff)
• perllib/plugouts/BasePlugout.pm (modified) (5 diffs)

gsdl/trunk/bin/script/import.pl

@@ -696 +696 @@
     $archive_info->save_info($arcinfo_doc_filename);
     }
+    else {
+    $archive_info->save_revinfo_gdbm($arcinfo_src_filename);
+    }
+
 
 ##    }

gsdl/trunk/perllib/plugouts/BasePlugout.pm

@@ -518 +518 @@
 
     my $working_dir  = $self->get_output_dir();
-    my $working_info = $self->{output_info}; 
+    my $working_info = $self->{'output_info'}; 
     return if (!defined $working_info);
 
@@ -722 +722 @@
               'index-status' => $index_status,
               'src-file' => $source_filename,
-              'assoc-files' => [],
-              'meta-files'  => [] };
+              'assoc-file' => [],
+              'meta-file'  => [] };
     
     my $reverse_lookups = { $source_filename => "1" };
 
 
-    $self->archiveinf_files_to_field($doc_obj->get_assoc_files(),"assoc-files",
+    $self->archiveinf_files_to_field($doc_obj->get_assoc_files(),"assoc-file",
                      $collect_dir,$oid_files,$reverse_lookups);
 
@@ -749 +749 @@
 #       $reverse_lookups->{$real_filename} = 1;
 #
-#       push(@{$oid_files->{'assoc-files'}},$full_afile);
+#       push(@{$oid_files->{'assoc-file'}},$full_afile);
 #   }
 #   else {
@@ -756 +756 @@
 #    }
 
-    $self->archiveinf_files_to_field($doc_obj->get_meta_files(),"meta-files",
+    $self->archiveinf_files_to_field($doc_obj->get_meta_files(),"meta-file",
                      $collect_dir,$oid_files,$reverse_lookups);
 
@@ -768 +768 @@
     my $src_db = &util::filename_cat($output_dir,"archiveinf-src.gdb");
 
-    my $doc_db_text = "";
-    $doc_db_text .= "<doc-file>$oid_files->{'doc-file'}\n";
-    $doc_db_text .= "<index-status>$oid_files->{'index-status'}\n";
-    $doc_db_text .= "<src-file>$oid_files->{'src-file'}\n";
-
-    foreach my $af (@{$oid_files->{'assoc-files'}}) {
-    $doc_db_text .= "<assoc-file>$af\n";
-    }
-
-    foreach my $mf (@{$oid_files->{'meta-files'}}) {
-    $doc_db_text .= "<meta-file>$mf\n";
-    }
-
-    chomp($doc_db_text); # remove trailing \n
+#    my $doc_db_text = "";
+#    $doc_db_text .= "<doc-file>$oid_files->{'doc-file'}\n";
+#    $doc_db_text .= "<index-status>$oid_files->{'index-status'}\n";
+#    $doc_db_text .= "<src-file>$oid_files->{'src-file'}\n";
+
+#    foreach my $af (@{$oid_files->{'assoc-file'}}) {
+#   $doc_db_text .= "<assoc-file>$af\n";
+#    }
+
+#    foreach my $mf (@{$oid_files->{'meta-file'}}) {
+#   $doc_db_text .= "<meta-file>$mf\n";
+#    }
+
+#    chomp($doc_db_text); # remove trailing \n
 
     ##print STDERR "*** To set in db: \n\t$doc_db\n\t$oid\n\t$doc_db_text\n";
-    &GDBMUtils::gdbmDatabaseSet($doc_db,$oid,$doc_db_text);
+
+    ### &GDBMUtils::gdbmDatabaseSet($doc_db,$oid,$doc_db_text);
+
+    # switch to using GDBMUtils
+
+    $oid_files->{'doc-file'} = [ $oid_files->{'doc-file'} ];
+    $oid_files->{'index-status'} = [ $oid_files->{'index-status'} ];
+    $oid_files->{'src-file'} = [ $oid_files->{'src-file'} ];
+
+    my $infodb_file_handle 
+    = &dbutil::open_infodb_write_handle_gdbm($doc_db,"append");
+    &dbutil::write_infodb_entry_gdbm($infodb_file_handle,$oid,$oid_files);
+    &dbutil::close_infodb_write_handle_gdbm($infodb_file_handle);
+
+
 
     foreach my $rl (keys %$reverse_lookups) {
-    &GDBMUtils::gdbmDatabaseAppend($src_db,$rl,"<oid>$oid\n");
-    }
-    
+    ## &GDBMUtils::gdbmDatabaseAppend($src_db,$rl,"<oid>$oid\n");   
+    $working_info->add_reverseinfo($rl,$oid);
+    }    
 }