Merge pull request #7040 from jwj61/localsubsearch

Fix issue #7036

Author: roed314

lmfdb/local_fields/main.py

@@ -13,7 +13,8 @@
 from lmfdb.app import app
 from lmfdb.utils import (
     web_latex, coeff_to_poly, teXify_pol, display_multiset, display_knowl,
-    parse_inertia, parse_newton_polygon, parse_bracketed_posints, parse_floats, parse_regex_restricted,
+    parse_inertia, parse_newton_polygon, parse_bracketed_posints, parse_floats, 
+    parse_regex_restricted, parse_padicsubfields,
     parse_galgrp, parse_ints, clean_input, parse_rats, parse_noop, flash_error,
     SearchArray, TextBox, TextBoxWithSelect, SubsetBox, SelectBox, SneakyTextBox,
     HiddenBox, TextBoxNoEg, CountBox, to_dict, comma,
@@ -696,6 +697,7 @@ def common_parse(info, query):
     parse_noop(info,query,'packet')
     parse_noop(info,query,'family')
     parse_noop(info,query,'hidden')
+    parse_padicsubfields(info,query,'subfield')
 
 def count_fields(p, n=None, f=None, e=None, eopts=None):
     # Implement a formula due to Monge for the number of fields with given n or e,f
@@ -1609,11 +1611,17 @@ def common_boxes():
         label='Packet',
         knowl='lf.packet',
     )
+    subfield = TextBox(
+        name="subfield",
+        label="Intermediate field",
+        knowl="lf.intermediate_fields",
+        example_span="2.1.2.2a1.2 or 5.1.5.9a1.5",
+        example="2.1.2.2a1.2")
     hidden = SneakyTextBox(
         name="hidden",
         label="Hidden content",
         knowl="lf.slopes")
-    return degree, qp, c, e, f, topslope, slopes, visible, ind_insep, associated_inertia, jump_set, gal, aut, u, t, inertia, wild, family, packet, hidden
+    return degree, qp, c, e, f, topslope, slopes, visible, ind_insep, associated_inertia, jump_set, gal, aut, u, t, inertia, wild, subfield, family, packet, hidden
 
 class FamilySearchArray(EmbeddedSearchArray):
     sorts = [
@@ -1624,7 +1632,7 @@ class FamilySearchArray(EmbeddedSearchArray):
     ]
 
     def __init__(self, fam):
-        degree, qp, c, e, f, topslope, slopes, visible, ind_insep, associated_inertia, jump_set, gal, aut, u, t, inertia, wild, family, packet, hidden = common_boxes()
+        degree, qp, c, e, f, topslope, slopes, visible, ind_insep, associated_inertia, jump_set, gal, aut, u, t, inertia, wild, subfield, family, packet, hidden = common_boxes()
         if fam.packet_count is None:
             self.refine_array = [[gal, slopes, ind_insep, hidden], [associated_inertia, jump_set]]
         else:
@@ -1839,15 +1847,15 @@ class LFSearchArray(SearchArray):
     }
 
     def __init__(self):
-        degree, qp, c, e, f, topslope, slopes, visible, ind_insep, associated_inertia, jump_set, gal, aut, u, t, inertia, wild, family, packet, hidden = common_boxes()
+        degree, qp, c, e, f, topslope, slopes, visible, ind_insep, associated_inertia, jump_set, gal, aut, u, t, inertia, wild, subfield, family, packet, hidden = common_boxes()
         results = CountBox()
 
         self.browse_array = [[degree, qp], [e, f], [c, topslope], [u, t],
                              [slopes, visible], [ind_insep, associated_inertia],
-                             [jump_set, aut], [gal, inertia], [wild], [results]]
-        self.refine_array = [[degree, qp, c, gal],
-                             [e, f, t, u],
-                             [aut, inertia, ind_insep, associated_inertia, jump_set],
+                             [jump_set, aut], [gal, inertia], [wild,subfield], [results]]
+        self.refine_array = [[degree, qp, c, gal, aut],
+                             [e, f, t, u, subfield],
+                             [inertia, ind_insep, associated_inertia, jump_set],
                              [topslope, slopes, visible, wild],
                              [family, packet, hidden]]
 

lmfdb/utils/__init__.py

@@ -22,7 +22,7 @@
            'image_callback', 'encode_plot', 'graph_to_cytoscape_json', 'graph_to_svg',
            'make_graph', 'setup_isogeny_graph', 'GRAPH_LAYOUTS',
            'parse_ints', 'parse_posints', 'parse_signed_ints', 'parse_floats',
-           'parse_mod1', 'parse_rational', 'parse_padicfields',
+           'parse_mod1', 'parse_rational', 'parse_padicfields', 'parse_padicsubfields',
            'parse_rational_to_list', 'parse_inertia', 'parse_group_label_or_order',
            'parse_rats', 'parse_bracketed_posints', 'parse_bracketed_rats', 'parse_bool',
            'parse_bool_unknown', 'parse_primes', 'parse_element_of', 'parse_not_element_of',
@@ -143,7 +143,7 @@
 
 from .search_parsing import (
     parse_ints, parse_signed_ints, parse_posints,
-    parse_floats, parse_mod1, parse_rational,
+    parse_floats, parse_mod1, parse_rational, parse_padicsubfields,
     parse_rational_to_list, parse_padicfields, parse_rats, parse_inertia,
     parse_bracketed_posints, parse_bracketed_rats, parse_bool,
     parse_bool_unknown, parse_primes, parse_kerpol_string,

lmfdb/utils/search_parsing.py

@@ -1212,6 +1212,36 @@ def parse_padicfields(inp, query, qfield, flag_unramified=False):
         flash_info("Search results may be incomplete.  Given $p$-adic completions contain an <a title='unramified' knowl='nf.unramified_prime'>unramified</a> field and completions are only searched for <a title='ramified' knowl='nf.ramified_primes'>ramified primes</a>.")
     query[qfield] = {"$contains": labellist}
 
+@search_parser(clean_info=True)
+def parse_padicsubfields(inp, query, qfield):
+    from lmfdb.local_fields.main import NEW_LF_RE, OLD_LF_RE
+    labellist = inp.split(",")
+    fail = False
+    for indx, label in enumerate(labellist):
+        if OLD_LF_RE.fullmatch(label):
+            pass
+        elif NEW_LF_RE.fullmatch(label):
+            from lmfdb import db
+            oldlabel = db.lf_fields.lucky({'new_label':label})
+            if oldlabel:
+                oldlabel=oldlabel.get('old_label',None)
+            if oldlabel:
+                labellist[indx] = oldlabel
+            else:
+                fail = True
+        else:
+            fail = True
+        if not fail:
+            splitlab = labellist[indx].split('.')
+            if splitlab[1]=='1':
+                p = splitlab[0]
+                raise SearchParsingError('$\Q_{%s}$ is not considered a proper intermediate field'%str(p))
+
+    if fail:
+        raise SearchParsingError('It needs to be a <a title = "$p$-adic field label" knowl="lf.field.label">$p$-adic field label</a> or a list of local field labels')
+    else:
+        query[qfield] = {"$contains": labellist}
+
 def input_string_to_poly(FF):
     # Change unicode dash with minus sign
     FF = FF.replace("\u2212", "-")