Fixed a problem with the "sw" search alias.

asl_articles/config/app.cfg

@@ -10,7 +10,7 @@
 ; For example, the entry "a = b ; c" means that searching for "a" will become "( a OR b OR c )".
 ; NOTE: Searching for "b" or "c" will be unaffected.
 latw = atmm ; atr ; baz ; mol-p ; mol-projector ; piat ; pf ; pfk ; psk
-sw = lmg ; mmg ; hmg ; mtr ; mortar ; dc ; ft ; radio ; phone ; rcl ; atmm ; atr ; baz ; mol-p ; mol-projector ; piat ; pf ; pfk ; psk
+sw = support weapon ; lmg ; mmg ; hmg ; mtr ; mortar ; dc ; ft ; radio ; phone ; rcl ; atmm ; atr ; baz ; mol-p ; mol-projector ; piat ; pf ; pfk ; psk
 fortifications = cave ; a-t ditch ; foxhole ; sangar ; trench ; bunker ; minefield ; mines ; booby trap ; panji ; pillbox ; roadblock ; tetrahedron ; wire
 vehicles = tank ; halftrack ; half-track ; jeep ; carrier
 illumination = starshell ; illuminating round ; trip flare
@@ -44,7 +44,8 @@ ovr = overrun
 cc = close combat
 thh = tank-hunter hero
 scw = shaped-charge weapon
-sw = support weapon
+; NOTE: We can't define "sw" here since we've defined it above.
+; sw = support weapon
 mg = machinegun = machine gun
 ammo = ammunition
 lc = landing craft

asl_articles/search.py

@@ -421,21 +421,30 @@ def init_search( session, logger ):
 
 def _load_search_aliases( aliases, aliases2 ):
     """Load the search aliases."""
+
+    # initialize
     search_aliases = {}
+
+    def add_search_alias( key, vals ):
+        if key in search_aliases:
+            _logger.warning( "Found duplicate search alias: %s", key )
+        search_aliases[ key ] =vals
+
+    # load the search aliases
     for row in aliases:
         vals = [ row[0] ]
         vals.extend( v.strip() for v in row[1].split( ";" ) )
-        search_aliases[ row[0] ] = vals
+        add_search_alias( row[0], vals )
         _logger.debug( "- %s => %s", row[0], vals )
+
+    # load the search aliases
     for row in aliases2:
         vals = itertools.chain( [row[0]], row[1].split("=") )
         vals = [ v.strip().lower() for v in vals ]
         _logger.debug( "- %s", vals )
         for v in vals:
-            if v in search_aliases:
-                _logger.warning( "Found duplicate search alias: %s", v )
-                continue
-            search_aliases[ v ] = vals
+            add_search_alias( v, vals )
+
     return search_aliases
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -