Changeset 8034 in genesis for tools/proxy-8.0/g_list.pl

Timestamp:

May 25, 2010, 5:30:26 PM (15 years ago)

Author:

rick

Message:

Cosmetic:

• Sort ordering more logical, based on the Key and then the #

• Instead of fixed matches allow regEx so we can only list proxies for example

File:

• tools/proxy-8.0/g_list.pl (modified) (3 diffs)

tools/proxy-8.0/g_list.pl

@@ -40 +40 @@
   foreach $dir (sort @tmpdirs) {
     no warnings "once";
-    if( not exists($removefromnodelist{$dir}) )
+    my $remove = 0;
+    foreach $pattern (@removefromnodelist) {
+      print $pattern;
+       if ($dir =~ /$pattern/i) {
+          $remove = 1;
+          break;
+       }
+    };
+    if( $remove == 0 )
     {
       push(@nodelist, $dir);
@@ -50 +58 @@
     use warnings "once";
   };
-  return @nodelist;
+  # Looks like magic, but actually just sorting an array, first based on
+  # the Alpha key and next numerics sort on the numeric port
+  return sort {
+     $a =~ m/^([a-zA-Z]+)([0-9]+)$/; $nameA = $1; $numberA = $2;
+     $b =~ m/^([a-zA-Z]+)([0-9]+)$/; $nameB = $1; $numberB = $2;
+     if ($nameA == $nameB) {
+      $numberA <=> $numberB;
+     } else {
+       $nameA cmp $nameB;
+     } } @nodelist;
 }
 
@@ -158 +175 @@
 
   @dirs = listnodes( );
-  foreach $dir (sort @dirs) {
+  foreach $dir (@dirs) {
     if( $dir=~/attic/ ) {
       next;