Merge lp:~dpb/ubuntu-manpage-repository/fix-search-order into lp:ubuntu-manpage-repository

[David Britton]

Fix distro search order now that we have wrapped around the alphabet.

Testing instructions.

Download bionic and xenial sources, and try this link:

http://<ip>/manpages/en/man1/man.1.html

You will get pointed to Xenial, with the change from this branch, you should get bionic.

I have something set up to test if you would like to see the bug and reproduction. It needs access to the canonical VPN to validate:

http://10.247.8.11:8080/manpages/en/man1/man.1.html

You can switch the code back and forth like this:

ssh ambipom
lxc exec manpages bash
cd /srv/manpages.ubuntu.com

# old code:
bzr switch lp:ubuntu-manpage-repository

# new code:
bzr switch lp:~davidpbritton/ubuntu-manpage-repository/fix-search-order

# After switching:
bzr resolved --take-this bin/config

And then, you can try the link. Also, you'll notice that a general search for 'man' has the man page table in the right order.

[lp:~dpb/ubuntu-manpage-repository/fix-search-order]

234. By David Britton on 2018-05-24

merge up along trunk

[Joshua Powers (powersj)]

2 questions below

[lp:~dpb/ubuntu-manpage-repository/fix-search-order]

235. By David Britton on 2018-05-24

fix per powersj

[Joshua Powers (powersj)]

review: Approve

=== modified file 'README.md'
--- README.md	2018-05-24 01:13:45 +0000
+++ README.md	2018-05-24 20:36:46 +0000
@@ -47,7 +47,6 @@
     # Also, do the actually conversion from debs into manpages
     make deps setup-and-mirror manpage-repo
 
-
 You can then reach the page at:
 
  * http://<ip>:8080/index_real.html
@@ -72,5 +71,3 @@
  * search.py really needs someone to make functions and simplify it.
  * switch container setup instructions to use 'manpages' user account
    instead of root as they do now
-
-

=== modified file 'cgi-bin/search.py'
--- cgi-bin/search.py	2018-05-23 17:53:08 +0000
+++ cgi-bin/search.py	2018-05-24 20:36:46 +0000
@@ -26,6 +26,7 @@
 # License can be found in /usr/share/common-licenses/GPL-3
 ###############################################################################
 
+from collections import OrderedDict
 import cgi
 import glob
 import os
@@ -112,15 +113,14 @@
 else:
     lr = "en"
 
-versions = dict(
-    precise="12.04 LTS",
-    trusty="14.04 LTS",
-    xenial="16.04 LTS",
-    artful="17.10",
-    bionic="18.04 LTS")
+versions = OrderedDict()
+versions["precise"] = "12.04 LTS"
+versions["trusty"] = "14.04 LTS"
+versions["xenial"] = "16.04 LTS"
+versions["artful"] = "17.10"
+versions["bionic"] = "18.04 LTS"
 
 distros = versions.keys()
-distros.sort()
 title_html += ("<br><table border=2 cellpadding=5 cellspacing=0><tr>"
                "<td><table cellspacing=0 cellpadding=5><tr>")
 for d in distros:

=== modified file 'www/functions.js'
--- www/functions.js	2018-01-29 14:27:29 +0000
+++ www/functions.js	2018-05-24 20:36:46 +0000
@@ -59,7 +59,7 @@
 
 function distroAndSection() {
     var parts = location.href.split("/");
-    if (parts.length < 5) {
+    if (parts.length < 6) {
         return;
     }
     var distro = parts[4];