Changeset 10157

Timestamp:

2005-06-23T11:22:04+12:00 (19 years ago)

Author:

davidb

Message:

arcinfo.pm upgraded to support incremental building. Opportunity also taken
to improve readability of code. Constants used instead of [0] [1] accesses
to array indexes.

File:

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

trunk/gsdl/perllib/arcinfo.pm

@@ -34 +34 @@
 
 package arcinfo;
+
+use constant ORDER_OID_INDEX  => 0;
+use constant ORDER_SORT_INDEX => 1;
+
+use constant INFO_FILE_INDEX    => 0;
+use constant INFO_STATUS_INDEX  => 1;
+
+# File format read in: OID <tab> Filename <tab> Optional-Index-Status
+
+# Index status can be:
+#  I = Index for the first time
+#  R = Reindex
+#  D = Delete
+#  B = Been indexed
 
 sub new {
@@ -91 +105 @@
     my $i = 0;
     while ($i < scalar (@{$self->{'order'}})) {
-        if ($self->{'order'}->[$i]->[0] eq $OID) {
+        if ($self->{'order'}->[$i]->[ORDER_OID_INDEX] eq $OID) {
         splice (@{$self->{'order'}}, $i, 1);
         last;
@@ -103 +117 @@
 sub add_info {
     my $self = shift (@_);
-    my ($OID, $doc_file, $sortmeta) = @_;
+    my ($OID, $doc_file, $index_status, $sortmeta) = @_;
     $sortmeta = "" unless defined $sortmeta;
+    $index_status = "I" unless defined $index_status; # I = needs indexing
 
     if (! defined($OID)) {
@@ -110 +125 @@
     return undef;
     }
+
     $self->delete_info ($OID);
-    $self->{'info'}->{$OID} = [$doc_file];
+    $self->{'info'}->{$OID} = [$doc_file,$index_status];
     push (@{$self->{'order'}}, [$OID, $sortmeta]);
 }
 
-# returns a list of the form [[OID, doc_file], ...]
-sub get_OID_list {
-    my $self = shift (@_);
-
-    my ($OID);
+sub set_status_info {
+    my $self = shift (@_);
+    my ($OID, $index_status) = @_;
+
+    my $OID_info = $self->{'info'}->{$OID};
+    $OID_info->[INFO_STATUS_INDEX] = $index_status;
+}
+
+
+sub get_status_info {
+    my $self = shift (@_);
+    my ($OID) = @_;
+
+    my $index_status = undef;
+
+    my $OID_info = $self->{'info'}->{$OID};
+    if (defined $OID_info) {
+    $index_status = $OID_info->[INFO_STATUS_INDEX];
+    }
+    else {
+    die "Unable to find document id $OID\n";
+    }
+
+    return $index_status;
+
+}
+
+
+# returns a list of the form [[OID, doc_file, index_status], ...]
+sub get_OID_list 
+{
+    my $self = shift (@_);
+
+    my $order = $self->{'order'};
+
+    my @sorted_order 
+    = sort {$a->[ORDER_SORT_INDEX] cmp $b->[ORDER_SORT_INDEX]} @$order;
+
     my @list = ();
 
-    foreach $OID (sort {$a->[1] cmp $b->[1]} @{$self->{'order'}}) {
-    push (@list, [$OID->[0], $self->{'info'}->{$OID->[0]}->[0]]);
+    foreach my $OID_order (@sorted_order) {
+    my $OID = $OID_order->[ORDER_OID_INDEX];
+    my $OID_info = $self->{'info'}->{$OID};
+
+    push (@list, [$OID, $OID_info->[INFO_FILE_INDEX], 
+              $OID_info->[INFO_STATUS_INDEX]]);
     }
 
@@ -133 +186 @@
     my $self = shift (@_);
 
-    my ($OID);
+    my $order = $self->{'order'};
+
+    my @sorted_order 
+    = sort {$a->[ORDER_SORT_INDEX] cmp $b->[ORDER_SORT_INDEX]} @$order;
+
     my @list = ();
 
-    foreach $OID (sort {$a->[1] cmp $b->[1]} @{$self->{'order'}}) {
-    push (@list, [$self->{'info'}->{$OID->[0]}->[0], $OID->[0]]);
+    foreach $OID_order (@sorted_order) {
+    my $OID = $OID_order->[ORDER_OID_INDEX];
+    my $OID_info = $self->{'info'}->{$OID};
+
+    push (@list, [$OID_info->[INFO_FILE_INDEX], $OID]);
     }