Changeset 20747

Timestamp:

2009-09-29T19:41:56+13:00 (15 years ago)

Author:

kjdon

Message:

sorting the build was broken. arcinfo was storing a sort order, but it wasn't being saved to archiveinf-doc.gdb, so during build, the order was lost. I have modifed arcinfo to store sortmeta in info as well as in order. get_info returns sortmeta. BasPlugout saves it in the gdbm database, and it is read in again by arcinfo

Location:

gsdl/trunk/perllib

Files:

• arcinfo.pm (modified) (4 diffs)
• plugouts/BasePlugout.pm (modified) (2 diffs)

gsdl/trunk/perllib/arcinfo.pm

@@ -100 +100 @@
     my ($doc_file) = ($vals=~/^<doc-file>(.*)$/m);
     my ($index_status) = ($vals=~/^<index-status>(.*)$/m);
-    $self->add_info ($oid,$doc_file,$index_status);
+    my ($sortmeta) = ($vals=~/^<sort-meta>(.*)$/m);
+    $self->add_info ($oid,$doc_file,$index_status,$sortmeta);
     }
 }
@@ -314 +315 @@
     }
 
-    $self->{'info'}->{$OID} = [$doc_file,$index_status];
+    $self->{'info'}->{$OID} = [$doc_file,$index_status,$sortmeta];
     push (@{$self->{'order'}}, [$OID, $sortmeta]);
 
@@ -427 +428 @@
 
 
-# returns a list of the form [doc_file]
+# returns a list of the form [doc_file,index_status,$sort_meta]
 sub get_info {
     my $self = shift (@_);
@@ -440 +441 @@
 
 
+
 # returns the number of documents so far
 sub size {

gsdl/trunk/perllib/plugouts/BasePlugout.pm

@@ -723 +723 @@
     my $doc_info = $working_info->get_info($oid);
 
-    my ($doc_file,$index_status) = @$doc_info;
+    my ($doc_file,$index_status,$sortmeta) = @$doc_info;
 
     my $oid_files = { 'doc-file' => $doc_file,
               'index-status' => $index_status,
               'src-file' => $source_filename,
+              'sort-meta' => $sortmeta,
               'assoc-file' => [],
               'meta-file'  => [] };
@@ -759 +760 @@
     $oid_files->{'index-status'} = [ $oid_files->{'index-status'} ];
     $oid_files->{'src-file'} = [ $oid_files->{'src-file'} ];
+    $oid_files->{'sort-meta'} = [ $oid_files->{'sort-meta'} ];
 
     my $infodb_file_handle