Changeset 27697 for main/trunk/greenstone2/perllib/arcinfo.pm

Timestamp:

2013-06-24T17:23:04+12:00 (11 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed it so that the gdb files generated on Windows for diffcol match those on Linux. This actually involved changing the order in which docids appear in archiveinf-doc. This last needed the newly invented flag -sort to the ArchivesInfPlugin in combination with -sortmeta OID to import.pl

File:

• main/trunk/greenstone2/perllib/arcinfo.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/arcinfo.pm

@@ -67 +67 @@
         'reverse-info'=>{},
         'order'=>[],
-        'reverse_sort'=>0};
+        'reverse_sort'=>0,
+        'sort'=>0};
 
     return bless $self, $class;
@@ -323 +324 @@
 
     $self->{'info'}->{$OID} = [$doc_file,$index_status,$sortmeta];
-    push (@{$self->{'order'}}, [$OID, $sortmeta]);
+    push (@{$self->{'order'}}, [$OID, $sortmeta]); # ORDER_OID_INDEX and ORDER_SORT_INDEX
 
 
@@ -393 +394 @@
     $self->{'reverse_sort'} = 1;
 }
+sub sort 
+{
+    my $self = shift(@_);
+    $self->{'sort'} = 1;
+}
+
 
 # returns a list of the form [[OID, doc_file, index_status], ...]
@@ -404 +411 @@
     if ($self->{'reverse_sort'}) {
     @sorted_order = sort {$b->[ORDER_SORT_INDEX] cmp $a->[ORDER_SORT_INDEX]} @$order;
-    } else {
+    } elsif ($self->{'sort'}) {
     @sorted_order = sort {$a->[ORDER_SORT_INDEX] cmp $b->[ORDER_SORT_INDEX]} @$order;
+    } else { # not sorting, don't bother
+    @sorted_order = @$order;
     }
 
@@ -430 +439 @@
     if ($self->{'reverse_sort'}) {
     @sorted_order = sort {$b->[ORDER_SORT_INDEX] cmp $a->[ORDER_SORT_INDEX]} @$order;
-    } else {
+    } elsif ($self->{'sort'}) {
     @sorted_order = sort {$a->[ORDER_SORT_INDEX] cmp $b->[ORDER_SORT_INDEX]} @$order;
+    } else { # not sorting, don't bother
+    @sorted_order = @$order;
     }