Changeset 14

Timestamp:

1998-11-17T22:48:46+13:00 (25 years ago)

Author:

rjmcnab

Message:

modified internal representation so that order is preserved (and
therefore sorting is possible).

File:

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

trunk/gsdl/perllib/arcinfo.pm

@@ -11 +11 @@
 sub new {
     my ($class) = @_;
-    my $self = {'info'=>{}};
+    my $self = {'info'=>{},
+        'order'=>[]};
 
     return bless $self, $class;
@@ -31 +32 @@
         @line = split ("\t", $line); # filename, 
         if (scalar(@line) >= 2) {
-        $self->add_info ($line[0], $line[1]);
+        $self->add_info (@line);
         }
     }
@@ -43 +44 @@
     my ($filename) = @_;
 
-    my ($OID);
+    my ($OID, $info);
 
     open (OUTFILE, ">$filename") || 
     die "arcinfo::save_info couldn't write $filename\n";
 
-    foreach $OID (keys(%{$self->{'info'}})) {
-    my $info = $self->get_info($OID);
+    foreach $info (@{$self->get_OID_list()}) {
     if (defined $info) {
-        print OUTFILE "$OID\t", join("\t", @$info), "\n";
+        print OUTFILE join("\t", @$info), "\n";
     }
     }
@@ -58 +58 @@
 }
 
+sub delete_info {
+    my $self = shift (@_);
+    my ($OID) = @_;
+
+    if (defined $self->{'info'}->{$OID}) {
+    delete $self->{'info'}->{$OID};
+    
+    my $i = 0;
+    while ($i < scalar (@{$self->{'order'}})) {
+        if ($self->{'order'}->[$i] eq $OID) {
+        splice (@{$self->{'order'}}, $i, 1);
+        last;
+        }
+        
+        $i ++;
+    }
+    }
+}
+
 sub add_info {
     my $self = shift (@_);
     my ($OID, $doc_file) = @_;
 
+    $self->delete_info ($OID);
     $self->{'info'}->{$OID} = [$doc_file];
+    push (@{$self->{'order'}}, $OID);
 }
 
@@ -72 +93 @@
     my @list = ();
 
-    foreach $OID (sort(keys(%{$self->{'info'}}))) {
+    foreach $OID (@{$self->{'order'}}) {
     push (@list, [$OID, $self->{'info'}->{$OID}->[0]]);
     }
@@ -86 +107 @@
     my @list = ();
 
-    foreach $OID (sort(keys(%{$self->{'info'}}))) {
+    foreach $OID (@{$self->{'order'}}) {
     push (@list, [$self->{'info'}->{$OID}->[0], $OID]);
     }