Do a better job ordering switch names.

www/export_deadman.php

@@ -64,7 +64,7 @@ $logger->setMask($mask);
 
 $base = get_base($_SERVER['SCRIPT_NAME']);
 
-$sql = "SELECT * FROM DEVICE_MAP WHERE checked_out='1'";
+$sql = "SELECT * FROM DEVICE_MAP WHERE checked_out='1' ORDER BY LPAD(lower(assigned_switch), 10, 0)";
 $res = null;
 try {
     $res = $dbh->query($sql);

www/index.php

@@ -144,7 +144,7 @@ if (isset($_REQUEST['filter'])) {
 
 $res = null;
 if (isset($_REQUEST['switch_name'])) {
-    $sql = "SELECT * FROM DEVICE_MAP WHERE serial_number LIKE :swname1 OR assigned_switch LIKE :swname2 ORDER BY serial_number";
+    $sql = "SELECT * FROM DEVICE_MAP WHERE serial_number LIKE :swname1 OR assigned_switch LIKE :swname2 ORDER BY LPAD(lower(serial_number), 10, 0)";
     try {
         $res = $dbh->prepare($sql);
         $res->execute(['swname1' => "%{$_REQUEST['switch_name']}%", 'swname2' => "%{$_REQUEST['switch_name']}%"]);
@@ -153,7 +153,7 @@ if (isset($_REQUEST['switch_name'])) {
         exit(1);
     }
 } else {
-    $sql = 'SELECT * FROM DEVICE_MAP '.$wc.' ORDER BY serial_number';
+    $sql = 'SELECT * FROM DEVICE_MAP '.$wc.' ORDER BY LPAD(lower(serial_number), 10, 0)';
     try {
         $res = $dbh->query($sql);
     } catch (PDOException $e) {
@@ -162,7 +162,7 @@ if (isset($_REQUEST['switch_name'])) {
     }
 }
 
-$sql = 'SELECT name, pid FROM SWITCHES WHERE ip_address IS NOT NULL ORDER BY name';
+$sql = 'SELECT name, pid FROM SWITCHES WHERE ip_address IS NOT NULL ORDER BY LPAD(lower(name), 10, 0)';
 $ls_res = null;
 try {
     $ls_res = $dbh->query($sql);

www/logicsw.php

@@ -200,7 +200,7 @@ if (isset($_REQUEST['filter'])) {
 
 $res = null;
 if (isset($_REQUEST['switch_name'])) {
-    $sql = "SELECT * FROM SWITCHES WHERE name LIKE :swname1 OR ip_address LIKE :swname2 ORDER BY name";
+    $sql = "SELECT * FROM SWITCHES WHERE name LIKE :swname1 OR ip_address LIKE :swname2 ORDER BY LPAD(lower(name), 10, 0)";
     try {
         $res = $dbh->prepare($sql);
         $res->execute(['swname1' => "%{$_REQUEST['switch_name']}%", 'swname2' => "%{$_REQUEST['switch_name']}%"]);
@@ -209,7 +209,7 @@ if (isset($_REQUEST['switch_name'])) {
         exit(1);
     }
 } else {
-    $sql = 'SELECT SWITCHES.* FROM SWITCHES '.$wc.' ORDER BY name';
+    $sql = 'SELECT SWITCHES.* FROM SWITCHES '.$wc.' ORDER BY LPAD(lower(name), 10, 0)';
     try {
         $res = $dbh->query($sql);
     } catch (PDOException $e) {