Skip to content

Reliable sorting #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chuhn wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −2
Open

Reliable sorting #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72ceb0
Sort DHCP entries of each host by its option number
chuhn Nov 23, 2018
2ea1bf5
Also add nice sorting for subnet options
chuhn Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions build_isc_dhcp.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,10 @@ function subnet_conf ($subnet=array(), $indent=0) {
// Loop through all of the dhcp entries and print them
$i = 0;
do {
list($status, $rows, $dhcp_entry) = ona_get_dhcp_option_entry_record(array('subnet_id' => $subnet['id']));
list($status, $rows, $dhcp_entry) = ona_get_record(
array('e.subnet_id' => $subnet['id']),
'dhcp_option_entries e LEFT JOIN dhcp_options o ON e.dhcp_option_id = o.id',
'o.number');
printmsg("DEBUG => subnet_conf(): Processing option {$dhcp_entry['display_name']}", 3);
if (!$rows) { break; }
if ($status) { $exit++; break; }
Expand Down Expand Up @@ -446,6 +449,7 @@ function build_hosts($server_id=0) {
dns D,
domains Z,
interfaces I LEFT OUTER JOIN dhcp_option_entries B ON I.host_id = B.host_id
LEFT JOIN dhcp_options opts ON B.dhcp_option_id = opts.id
WHERE I.mac_addr NOT like ''
AND I.host_id = H.id
AND D.domain_id = Z.id
Expand All @@ -468,7 +472,7 @@ interfaces I LEFT OUTER JOIN dhcp_option_entries B ON I.host_id = B.host_id
OR secondary_server_id = {$server_id}))
)
)
ORDER BY I.ip_addr";
ORDER BY I.ip_addr, opts.number";



Expand Down