Changeset 29680 for main/trunk/package-kits

Timestamp:

2015-01-09T15:30:46+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Fixed problems with XML parser introduced by the ordered hash change

File:

• main/trunk/package-kits/scripts/perllib/Greenstone/XML/Tidy.pm (modified) (3 diffs)

main/trunk/package-kits/scripts/perllib/Greenstone/XML/Tidy.pm

@@ -75 +75 @@
         my $attr = shift;
         if (scalar keys %$attr > 0) {
-            $hash->set ('.attr' => Hash::Ordered->new ($attr));
+            my $attr_ordered = Hash::Ordered->new;
+            for my $key (keys %$attr) {
+                $attr_ordered->set ($key => $attr->{$key});
+            }
+            $hash->set ('.attr' => $attr_ordered);
         }
         # Read any child elements or text value
@@ -121 +125 @@
         select $FH;
     }
+    sub escape {
+        my @r;
+        for (@_) {
+            my $str = ''. $_;
+            $str =~ s/(['\\])/\\$1'/g;
+            push @r, $str;
+        }
+        return @r;
+    }
     sub open_tag {
         my ($indent, $tag, $attr) = @_;
         print $indent, "<", $tag;
         if (defined $attr) {
-            for my $key ($attr->keys) {
-                print " ", $key, '="', $attr->get ($key), '"';
+            my $iter = $attr->iterator;
+            while (my ($key, $value) = $iter->()) {
+                print " ", $key, '="', escape $value, '"';
             }
         }
@@ -160 +174 @@
                     # If the element only has a value with attributes,
                     # it can be formatted on one line
-                    if (scalar keys %$val == 2 and $val->exists ('.value')) {
+                    if (scalar $val->keys == 2 and $val->exists ('.value')) {
                         print $val->get ('.value'), "</", $key, ">\n";
                     } else {