Changeset 29679 for main/trunk/package-kits/scripts/gs-servlet.pl

Timestamp:

2015-01-09T14:50:58+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Switch to an Ordered Hash to stop the XML files from being scrambled

File:

• main/trunk/package-kits/scripts/gs-servlet.pl (modified) (3 diffs)

main/trunk/package-kits/scripts/gs-servlet.pl

@@ -11 +11 @@
 use Greenstone::XML::Tidy;
 
-my $hash;
+my $hash = Hash::Ordered->new;
 my %commands;
 # Command structure:
@@ -32 +32 @@
         'Clears the internal state',
         sub {
-            undef $hash;
-            $hash = {};
+            $hash = Hash::Ordered->new;
         }
     ],
@@ -41 +40 @@
             my $new = read_xml shift @ARGV;
             # Append the new data to the current data
-            for my $key (keys %$new) {
-                if ($key eq '.attr' and exists $hash->{'.attr'}) {
-                    for my $attr ($new->{'.attr'}) {
-                        $hash->{'.attr'}->{$attr} = $new->{'.attr'}->{$attr};
+            for my $key ($new->keys) {
+                if ($key eq '.attr' and $hash->exists ('.attr')) {
+                    my $existing_attr = $hash->get ('.attr');
+                    my $new_attr      = $new->get ('.attr');
+                    for my $attr ($new_attr->keys) {
+                        $existing_attr->set ($attr => $new_attr->get ($attr));
                     }
-                } elsif (exists $hash->{$key}) {
-                    if (ref $hash->{$key} ne 'ARRAY') {
-                        $hash->{$key} = [ $hash->{$key} ];
+                } elsif ($hash->exists ($key)) {
+                    my $existing = $hash->get ($key);
+                    if (ref $existing ne 'ARRAY') {
+                        $existing = [ $existing ];
+                        $hash->set ($key => $existing);
                     }
-                    push @{$hash->{$key}},
-                        (ref $new->{$key} eq 'ARRAY' ? @{$new->{$key}} : $new->{$key});
+                    my $new_val = $new->get ($key);
+                    push @{$existing},
+                        (ref $new_val eq 'ARRAY' ? @{$new_val} : $new_val);
                 } else {
-                    $hash->{$key} = $new->{$key};
+                    $hash->set ($key => $new->get ($key));
                 }
             }