Changeset 1985 in genesis

Timestamp:

Apr 11, 2004, 5:55:16 PM (21 years ago)

Author:

dirkx

Message:

Tweaks so that java reads it

File:

• tools/inc2minimal.pl (modified) (4 diffs)

tools/inc2minimal.pl

@@ -7 +7 @@
 my %ips = ();
 
-foreach my $node (keys %$VAR1) {
+foreach my $node (sort keys %$VAR1) {
         foreach my $iface (keys %{ $VAR1->{$node}->{ifaces} }) {
                 my $v = $VAR1->{$node}->{ifaces}->{$iface};
@@ -31 +31 @@
 }
 
-while (my ($node,$vals) = each %$VAR1) {
+foreach my $node (sort keys %$VAR1) {
+        my $vals = $VAR1->{$node};
         print qq|<node id="$node" ip="$vals->{master_ip}>
         <location>$vals->{location}</location>
@@ -37 +38 @@
         foreach my $iface (sort keys(%{$vals->{ifaces}})) {
                 my $v = $vals->{ifaces}->{$iface};
-                print qq|       <iface id="$iface"|;
+                print qq|       <iface\tid="$iface"\n|;
                 
                 if ($v->{TYPE} =~ m/wireless/i) {
                         my $ssid = "ERROR!";
                         if ($v->{MODE} =~ m/master/i) {
-                                print qq| channel="$v->{CHANNEL}"|;
+                                print qq|\t\tchannel="$v->{CHANNEL}"\n|;
                                 $ssid = $v->{ESSID};
-                                print " master";
+                                print "\t\tmaster\n";
                         } else {
                                 # Channel vollows; ESSID is
@@ -55 +56 @@
                                 }
                         };
-                        print qq| ssid="$ssid"|;
+                        print qq|\t\tssid="$ssid"\n|;
                 }
                 if ($v->{DHCP} =~ m/(\d+)\-(\d+)/) {
                         my $x = $2 - $1;
-                        print qq| dhcp="$x"|;
+                        print qq|\t\tdhcp="$x"\n|;
                 };
-                print ">\n";
+                print "\t\t>\n";
                 print qq|       </iface>\n|;
         }