switch tables now that new data is reloaded to belyi_galmaps

Author: SamSchiavone

lmfdb/belyi/main.py

@@ -94,15 +94,15 @@ def index():
 @belyi_page.route("/random")
 @redirect_no_cache
 def random_belyi_galmap():
-    label = db.belyi_galmaps_new.random()
+    label = db.belyi_galmaps.random()
     return url_for_belyi_galmap_label(label)
 
 
 @belyi_page.route("/interesting")
 def interesting():
     return interesting_knowls(
         "belyi",
-        db.belyi_galmaps_new,
+        db.belyi_galmaps,
         url_for_label,
         title=r"Some interesting Belyi maps and passports",
         bread=get_bread("Interesting"),
@@ -414,7 +414,7 @@ def make_base_field(rec):
 
 
 class Belyi_download(Downloader):
-    table = db.belyi_galmaps_new
+    table = db.belyi_galmaps
     title = "Belyi maps"
     inclusions = {
         "perms": (
@@ -484,7 +484,7 @@ def embedding_maker(self, rec, lang):
 
     def download_galmap_magma(self, label, lang="magma"):
         s = ""
-        rec = db.belyi_galmaps_new.lookup(label)
+        rec = db.belyi_galmaps.lookup(label)
         if rec is None:
             return abort(404, "Label not found: %s" % label)
         s += "// Magma code for Belyi map with label %s\n\n" % label
@@ -537,7 +537,7 @@ def download_galmap_magma(self, label, lang="magma"):
 
     def download_galmap_sage(self, label, lang="sage"):
         s = ""
-        rec = db.belyi_galmaps_new.lookup(label)
+        rec = db.belyi_galmaps.lookup(label)
         if rec is None:
             return abort(404, "Label not found: %s" % label)
         s += "# Sage code for Belyi map with label %s\n\n" % label
@@ -600,7 +600,7 @@ def download_galmap_sage(self, label, lang="sage"):
         return self._wrap(s, label, lang=lang)
 
     def download_galmap_text(self, label, lang="text"):
-        data = db.belyi_galmaps_new.lookup(label)
+        data = db.belyi_galmaps.lookup(label)
         if data is None:
             return abort(404, f"Label not found: {label}")
         return self._wrap(Json.dumps(data),
@@ -635,11 +635,11 @@ def belyi_data(label):
     if label.count("-") == 1:  # passport label length
         labels = [label, label]
         label_cols = ["plabel", "plabel"]
-        tables = ["belyi_passports", "belyi_galmaps_new"]
+        tables = ["belyi_passports", "belyi_galmaps"]
     elif label.count("-") == 2:  # galmap label length
         labels = [label, "-".join(label.split("-")[:-1]), label]
         label_cols = ["label", "plabel", "label"]
-        tables = ["belyi_galmaps_new", "belyi_passports", "belyi_galmap_portraits"]
+        tables = ["belyi_galmaps", "belyi_passports", "belyi_galmap_portraits"]
     else:
         return abort(404, f"Invalid label {label}")
     return datapage(labels, tables, title=f"Belyi map data - {label}", bread=bread, label_cols=label_cols)
@@ -723,7 +723,7 @@ def primitivization_search(info, query, search_type):
             raise ValueError("%s is not a valid %s label" % (primitivization, err_name))
 
 @search_wrap(
-    table=db.belyi_galmaps_new,
+    table=db.belyi_galmaps,
     title="Belyi map search results",
     err_title="Belyi map search input error",
     columns=belyi_columns,
@@ -779,13 +779,13 @@ class Belyi_stats(StatsDisplay):
     """
 
     def __init__(self):
-        self.ngalmaps = comma(db.belyi_galmaps_new.stats.count())
+        self.ngalmaps = comma(db.belyi_galmaps.stats.count())
         self.npassports = comma(db.belyi_passports.stats.count())
         self.max_deg = comma(db.belyi_passports.max("deg"))
         self.deg_knowl = display_knowl("belyi.degree", title="degree")
         self.belyi_knowl = '<a title="Belyi maps (up to Galois conjugation) [belyi.galmap]" knowl="belyi.galmap" kwargs="">Belyi maps</a>'
 
-    table = db.belyi_galmaps_new
+    table = db.belyi_galmaps
     baseurl_func = ".index"
     short_display = {"deg": "degree", "orbit_size": "size", "g": "genus"}
     top_titles = {"orbit_size": "Galois orbit size"}

lmfdb/belyi/web_belyi.py

@@ -187,9 +187,9 @@ def by_label(label, triple=None):
         try:
             slabel = label.split("-")
             if len(slabel) == 2: # passport label length
-                galmap = db.belyi_galmaps_new.lucky({"plabel": label})
+                galmap = db.belyi_galmaps.lucky({"plabel": label})
             elif len(slabel) == 3: # galmap label length
-                galmap = db.belyi_galmaps_new.lucky({"label": label})
+                galmap = db.belyi_galmaps.lucky({"label": label})
             else:
                 raise ValueError("Invalid Belyi map label %s." % label)
         except AttributeError:
@@ -452,7 +452,7 @@ def make_passport_object(self, passport):
         data["primitivization_url"] = url_for_belyi_passport_label(data['primitivization'])
 
         # Permutation triples
-        galmaps_for_plabel = db.belyi_galmaps_new.search(
+        galmaps_for_plabel = db.belyi_galmaps.search(
             {"plabel": passport["plabel"]}
         )  # , sort = ['label_index'])
         galmapdata = []