Merge pull request #6664 from roed314/gps_subgroups_removal

Remove all references to gps_subgroups

Author: roed314

lmfdb/groups/abstract/main.py

@@ -1730,7 +1730,7 @@ def cc_postprocess(res, info, query):
         info["columns"].above_table = f"<p>{gp.repr_strg(other_page=True)}</p>"
     info["group_factors"] = common_support if common_support else []
     complex_char_known = {rec["label"]: rec["complex_characters_known"] for rec in db.gps_groups.search({'label':{"$in":list(gps)}}, ["label", "complex_characters_known"])}
-    centralizer_data = {(".".join(rec["label"].split(".")[:2]), ".".join(rec["label"].split(".")[2:])): rec["subgroup_tex"] for rec in db.gps_subgroups.search({'label':{"$in":list(centralizers)}},["label","subgroup_tex"])}
+    centralizer_data = {(".".join(rec["label"].split(".")[:2]), ".".join(rec["label"].split(".")[2:])): rec["subgroup_tex"] for rec in db.gps_subgroup_search.search({'label':{"$in":list(centralizers)}},["label","subgroup_tex"])}
     highlight_col = {}
     for rec in res:
         label = rec.get("label")
@@ -2201,7 +2201,7 @@ def gp_data(label):
         group_counter = int(group_counter)
     else:
         group_counter = class_to_int(group_counter) + 1  # we start labeling at 1
-    return datapage([label, [group_order, group_counter], label, label, label], ["gps_groups", "gps_conj_classes", "gps_qchar", "gps_char", "gps_subgroups"], bread=bread, title=title, label_cols=["label", ["group_order","group_counter"], "group", "group", "ambient"])
+    return datapage([label, [group_order, group_counter], label, label, label, label], ["gps_groups", "gps_conj_classes", "gps_qchar", "gps_char", "gps_subgroup_search", "gps_subgroup_data"], bread=bread, title=title, label_cols=["label", ["group_order","group_counter"], "group", "group", "ambient", "ambient"])
 
 @abstract_page.route("/sdata/<label>")
 def sgp_data(label):
@@ -2213,9 +2213,9 @@ def sgp_data(label):
     if data is None:
         return abort(404)
     if data["quotient"] is None:
-        return datapage([label, data["subgroup"], data["ambient"]], ["gps_subgroups", "gps_groups", "gps_groups"], bread=bread, title=title)
+        return datapage([label, label, data["subgroup"], data["ambient"]], ["gps_subgroup_search", "gps_subgroup_data", "gps_groups", "gps_groups"], bread=bread, title=title)
     else:
-        return datapage([label, data["subgroup"], data["ambient"], data["quotient"]], ["gps_subgroups", "gps_groups", "gps_groups", "gps_groups"], bread=bread, title=title)
+        return datapage([label, label, data["subgroup"], data["ambient"], data["quotient"]], ["gps_subgroup_search", "gps_subgroup_data", "gps_groups", "gps_groups", "gps_groups"], bread=bread, title=title)
 
 
 # need to write characters in GAP or Magma formats for downloads

lmfdb/groups/abstract/test_abstract_groups.py

@@ -81,8 +81,8 @@ def test_underlying_data(self):
             "gps_conj_classes", "representative",
             "gps_qchar", "cdim",
             "gps_char", "indicator",
-            "gps_subgroups", "mobius_sub"])
+            "gps_subgroup_search", "mobius_sub"])
         self.check_args("/Groups/Abstract/sdata/16.8.2.b1.a1", [
-            "gps_subgroups", "16.8.2.b1.a1",
+            "gps_subgroup_search", "16.8.2.b1.a1",
             "gps_groups", "[28776, 16577, 5167]", # perm_gens
             "[[1, 1, 1]]"]) # faithful_reps

lmfdb/groups/abstract/web_groups.py

@@ -3546,7 +3546,7 @@ def display_quotient(self, subname=None, ab_invs=None):
     @lazy_attribute
     def _others(self):
         """
-        Get information from gps_subgroups for each of the other subgroups referred to
+        Get information from gps_subgroup_search for each of the other subgroups referred to
         (centralizer, complements, contained_in, contains, core, normal_closure, normalizer)
         """
         labels = []

scripts/groups/Make-images/dump-group-names.py

@@ -9,7 +9,7 @@
 for g in db.gps_groups.search({}, ['tex_name', 'label']):
     myhash[g['tex_name']].append(g['label'])
 
-for g in db.gps_subgroups.search({}, ['quotient_tex', 'subgroup_tex', 'label']):
+for g in db.gps_subgroup_search.search({}, ['quotient_tex', 'subgroup_tex', 'label']):
     if g['quotient_tex']:
         myhash[g['quotient_tex']].append(g['label'])
     if g['subgroup_tex']: