Merge pull request #1868 from UlrichB22/rm_wikiname

Remove WIKINAME from schema and queries

Author: RogerHaase

docs/user/search.rst

@@ -200,8 +200,6 @@ The following table includes fields that may be useful for searching.
 +-------------------------+-------------------------------------------------------+
 | ``username``            | submitter user name, e.g. JoeDoe                      |
 +-------------------------+-------------------------------------------------------+
-| ``wikiname``            | wiki name, e.g. ITWiki, EngineeringWiki, SalesWiki    |
-+-------------------------+-------------------------------------------------------+
 
 ** These fields exist only in the current revisions index, see Notes below.
 
@@ -220,10 +218,6 @@ Search items with an item ACL that explicitly gives Joe read rights::
 
   acl:Joe:+read
 
-Limiting search to a specific wiki, for example in a wiki farm's shared index::
-
-  wikiname:SomeWiki  # requires correct caps
-
 Notes
 =====
 
@@ -233,10 +227,9 @@ button under the Search Options link is selected. The larger indexes all
 revisions of all items including revisions of deleted items. As noted in the table
 above the larger index omits several fields to save space.
 
-By default, all namespaces and all wikinames are searched, including the userprofiles
-index. Because the userprofiles index is normally read restricted, hits will be
-blocked and included as `n items are not shown because read permission was denied` at
-the bottom of the page.
+By default, all namespaces are searched, including the userprofiles index. Because
+the userprofiles index is normally read restricted, hits will be blocked and included
+as `n items are not shown because read permission was denied` at the bottom of the page.
 
 Items with transcluded content do not contain the transcluded content within the
 item's index. An item containing "foo" within its content and trancluding an item with

src/moin/apps/admin/views.py

@@ -37,7 +37,6 @@
     EMAIL,
     DISABLED,
     NAME_EXACT,
-    WIKINAME,
     TRASH,
     NAMESPACE,
     NAME_OLD,
@@ -391,9 +390,7 @@ def interwikihelp():
 def itemsize():
     """display a table with item sizes"""
     headings = [_("Size"), _("Item name")]
-    query = And(
-        [Term(WIKINAME, app.cfg.interwikiname), Not(Term(NAMESPACE, NAMESPACE_USERPROFILES)), Not(Term(TRASH, True))]
-    )
+    query = And([Not(Term(NAMESPACE, NAMESPACE_USERPROFILES)), Not(Term(TRASH, True))])
     revs = flaskg.storage.search_meta(query, idx_name=LATEST_REVS, sortedby=[NAME], limit=None)
     rows = [(rev[SIZE], CompositeName(rev[NAMESPACE], NAME_EXACT, rev[NAME][0])) for rev in revs]
     rows = sorted(rows, reverse=True)
@@ -414,7 +411,7 @@ def trash(namespace):
 
 
 def _trashed(namespace):
-    q = And([Term(WIKINAME, app.cfg.interwikiname), Term(TRASH, True)])
+    q = Term(TRASH, True)
     if namespace != NAMESPACE_ALL:
         q = And([q, Term(NAMESPACE, namespace)])
     trashedEntry = namedtuple("trashedEntry", "fqname oldname revid rev_number mtime comment editor parentid")
@@ -439,7 +436,7 @@ def _trashed(namespace):
 @admin.route("/user_acl_report/<uid>", methods=["GET"])
 @require_permission(SUPERUSER)
 def user_acl_report(uid):
-    query = And([Term(WIKINAME, app.cfg.interwikiname), Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))])
+    query = Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))
     all_metas = flaskg.storage.search_meta(query, idx_name=LATEST_REVS, sortedby=[NAMESPACE, NAME], limit=None)
     theuser = user.User(uid=uid)
     itemwise_acl = []
@@ -504,7 +501,7 @@ def item_acl_report():
     Item names are prefixed with the namespace, if there is a non-default namespace.
     If there are multiple names, the first name is used for sorting.
     """
-    query = And([Term(WIKINAME, app.cfg.interwikiname), Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))])
+    query = Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))
     all_metas = flaskg.storage.search_meta(query, idx_name=LATEST_REVS, sortedby=[NAMESPACE, NAME], limit=None)
     items_acls = []
     for meta in all_metas:
@@ -558,7 +555,7 @@ def group_acl_report(group_name):
     Display a table of items and permissions, where the ACL rule specifies any
     WikiGroup or ConfigGroup name.
     """
-    query = And([Term(WIKINAME, app.cfg.interwikiname), Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))])
+    query = Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))
     all_metas = flaskg.storage.search_meta(query, idx_name=LATEST_REVS, sortedby=[NAMESPACE, NAME], limit=None)
     group_items = []
     for meta in all_metas:

src/moin/apps/feed/views.py

@@ -17,22 +17,11 @@
 from feedgen.feed import FeedGenerator
 from markupsafe import Markup
 
-from whoosh.query import Term, And
+from whoosh.query import Term, And, Every
 
 from moin.i18n import _
 from moin.apps.feed import feed
-from moin.constants.keys import (
-    NAME,
-    NAME_EXACT,
-    NAMESPACE,
-    WIKINAME,
-    COMMENT,
-    MTIME,
-    REVID,
-    ALL_REVS,
-    PARENTID,
-    LATEST_REVS,
-)
+from moin.constants.keys import NAME, NAME_EXACT, NAMESPACE, COMMENT, MTIME, REVID, ALL_REVS, PARENTID, LATEST_REVS
 from moin.themes import get_editor_info, render_template
 from moin.items import Item
 from moin.utils.crypto import cache_key
@@ -54,10 +43,10 @@ def atom(item_name):
     - First item is always rendered fully
     - Revision meta(id, size and comment) is shown for parent and current revision
     """
-    query = Term(WIKINAME, app.cfg.interwikiname)
+    query = Every()
     if item_name:
         fqname = split_fqname(item_name)
-        query = And([query, Term(NAME_EXACT, fqname.value), Term(NAMESPACE, fqname.namespace)])
+        query = And([Term(NAME_EXACT, fqname.value), Term(NAMESPACE, fqname.namespace)])
     revs = list(flaskg.storage.search(query, idx_name=LATEST_REVS, sortedby=[MTIME], reverse=True, limit=1))
     if revs:
         rev = revs[0]
@@ -76,9 +65,9 @@ def atom(item_name):
         feed.title(title)
         feed.link(href=request.host_url)
         feed.link(href=request.url, rel="self")
-        query = Term(WIKINAME, app.cfg.interwikiname)
+        query = Every()
         if item_name:
-            query = And([query, Term(NAME_EXACT, fqname.value), Term(NAMESPACE, fqname.namespace)])
+            query = And([Term(NAME_EXACT, fqname.value), Term(NAMESPACE, fqname.namespace)])
         history = flaskg.storage.search(query, idx_name=ALL_REVS, sortedby=[MTIME], reverse=True, limit=100)
         for rev in history:
             name = rev.fqname.fullname

src/moin/apps/frontend/views.py

@@ -256,10 +256,9 @@ def lookup():
                     term = Term(key, value)
                 terms.append(term)
         if terms:
-            LookupEntry = namedtuple("LookupEntry", "name revid wikiname")
+            LookupEntry = namedtuple("LookupEntry", "name revid")
             name = lookup_form[NAME].value
             name_exact = lookup_form[NAME_EXACT].value or ""
-            terms.append(Term(WIKINAME, app.cfg.interwikiname))
             q = And(terms)
             with flaskg.storage.indexer.ix[idx_name].searcher() as searcher:
                 flaskg.clock.start("lookup")
@@ -269,7 +268,7 @@ def lookup():
                 for result in results:
                     analyzer = item_name_analyzer()
                     lookup_results += [
-                        LookupEntry(n, result[REVID], result[WIKINAME])
+                        LookupEntry(n, result[REVID])
                         for n in result[NAME]
                         if not name or name.lower() in analyze(analyzer, n)
                         if n.startswith(name_exact)
@@ -1522,7 +1521,7 @@ def name_initial(files, uppercase=False, lowercase=False):
         # there will likely be false missing_dirs caused by filter
         missing = set()
         for m_dir in missing_dirs:
-            query = And([Term(WIKINAME, app.cfg.interwikiname), (Term(NAME_EXACT, m_dir))])
+            query = Term(NAME_EXACT, m_dir)
             metas = tuple(flaskg.unprotected_storage.search_meta(query, idx_name=LATEST_REVS, limit=1))
             if not metas:
                 missing.add(m_dir)
@@ -1585,7 +1584,7 @@ def mychanges():
     page_num = request.values.get("page_num", 1)
     page_num = max(int(page_num), 1)
 
-    query = And([Term(WIKINAME, app.cfg.interwikiname), Term(USERID, flaskg.user.itemid)])
+    query = Term(USERID, flaskg.user.itemid)
     if results_per_page:
         len_revs = flaskg.storage.search_results_size(query, idx_name=ALL_REVS)
         metas = flaskg.storage.search_meta_page(
@@ -1670,7 +1669,6 @@ def _forwardrefs(item_name):
     """
     fqname = split_fqname(item_name)
     q = fqname.query
-    q[WIKINAME] = app.cfg.interwikiname
     rev = flaskg.storage.document(**q)
     if rev is None:
         refs = []
@@ -1713,9 +1711,7 @@ def _backrefs(item_name):
     :type item_name: unicode
     :returns: the list of all items which ref fq_name
     """
-    q = And(
-        [Term(WIKINAME, app.cfg.interwikiname), Or([Term(ITEMTRANSCLUSIONS, item_name), Term(ITEMLINKS, item_name)])]
-    )
+    q = Or([Term(ITEMTRANSCLUSIONS, item_name), Term(ITEMLINKS, item_name)])
     metas = flaskg.storage.search_meta(q)
     return {fqname for meta in metas for fqname in meta[FQNAMES]}
 
@@ -1739,8 +1735,7 @@ def history(item_name):
         results_per_page = flaskg.user.results_per_page
     else:
         results_per_page = app.cfg.results_per_page
-    terms = [Term(WIKINAME, app.cfg.interwikiname)]
-    terms.extend(Term(term, value) for term, value in fqname.query.items())
+    terms = [Term(term, value) for term, value in fqname.query.items()]
     if bookmark_time:
         terms.append(DateRange(MTIME, start=utcfromtimestamp(bookmark_time), end=None))
     query = And(terms)
@@ -1808,7 +1803,7 @@ def editor_info_for_reports():
     This is useful for history and index reports that show the last editor's name and email address.
     It avoids multiple calls to whoosh for same userid.
     """
-    query = And([Term(WIKINAME, app.cfg.interwikiname), (Term(NAMESPACE, NAMESPACE_USERPROFILES))])
+    query = Term(NAMESPACE, NAMESPACE_USERPROFILES)
     metas = flaskg.unprotected_storage.search_meta(query, idx_name=LATEST_REVS, limit=None)
     editors = {}
     for meta in metas:
@@ -1830,13 +1825,12 @@ def global_history(namespace):
 
     page_num = request.values.get("page_num", 1)
     page_num = max(int(page_num), 1)
-    terms = [Term(WIKINAME, app.cfg.interwikiname)]
     fqname = CompositeName(NAMESPACE_ALL, NAME_EXACT, "")
     if namespace != NAMESPACE_ALL:
-        terms.append(Term(NAMESPACE, namespace))
+        terms = [Term(NAMESPACE, namespace)]
         fqname = split_fqname(namespace)
     else:
-        terms.append(Not(Term(NAMESPACE, NAMESPACE_USERPROFILES)))
+        terms = [Not(Term(NAMESPACE, NAMESPACE_USERPROFILES))]
     bookmark_time = flaskg.user.bookmark
     if bookmark_time is not None:
         terms.append(DateRange(MTIME, start=utcfromtimestamp(bookmark_time), end=None))
@@ -1902,9 +1896,7 @@ def _compute_item_sets(wanted=False):
     transcluded = set()
     existing = set()
     who_wants = {}
-    query = And(
-        [Term(WIKINAME, app.cfg.interwikiname), Not(Term(NAMESPACE, NAMESPACE_USERPROFILES)), Not(Term(TRASH, True))]
-    )
+    query = And([Not(Term(NAMESPACE, NAMESPACE_USERPROFILES)), Not(Term(TRASH, True))])
     metas = flaskg.storage.search_meta(query, idx_name=LATEST_REVS, sortedby=[NAME], limit=None)
     if wanted:
         for meta in metas:
@@ -2746,8 +2738,7 @@ def diff(item_name):
     offset = request.values.get("offset", 0)
     offset = max(int(offset), 0)
     bookmark_time = int(request.values.get("bookmark", 0))
-    terms = [Term(WIKINAME, app.cfg.interwikiname)]
-    terms.extend(Term(term, value) for term, value in fqname.query.items())
+    terms = [Term(term, value) for term, value in fqname.query.items()]
     query = And(terms)
     metas = flaskg.storage.search_meta(query, idx_name=ALL_REVS, sortedby=[MTIME, REV_NUMBER], reverse=True, limit=None)
     close_file(item.rev.data)
@@ -3009,10 +3000,10 @@ def global_tags(namespace):
     """
     title_name = _("Global Tags")
     if namespace == NAMESPACE_ALL:
-        query = And([Term(WIKINAME, app.cfg.interwikiname), Term(HAS_TAG, True)])
+        query = Term(HAS_TAG, True)
         fqname = CompositeName(NAMESPACE_ALL, NAME_EXACT, "")
     else:
-        query = And([Term(WIKINAME, app.cfg.interwikiname), Term(NAMESPACE, namespace), Term(HAS_TAG, True)])
+        query = And([Term(NAMESPACE, namespace), Term(HAS_TAG, True)])
         fqname = split_fqname(namespace)
     if namespace == NAMESPACE_DEFAULT:
         headline = _("Global Tags")
@@ -3056,7 +3047,7 @@ def tagged_items(tag, namespace):
     """
     show all items' names that have tag <tag> and belong to namespace <namespace>
     """
-    terms = And([Term(WIKINAME, app.cfg.interwikiname), Term(TAGS, tag)])
+    terms = Term(TAGS, tag)
     if namespace != NAMESPACE_ALL:
         terms = And([terms, Term(NAMESPACE, namespace)])
     query = And(terms)

src/moin/apps/misc/views.py

@@ -45,7 +45,7 @@ def format_timestamp(t):
         root_fqnames.append(CompositeName(rev.meta[NAMESPACE], NAME_EXACT, rev.meta[NAME][0]))
 
     sitemap = []
-    for rev in flaskg.storage.documents(wikiname=app.cfg.interwikiname):
+    for rev in flaskg.storage.documents():
         fqnames = rev.fqnames
         mtime = rev.meta[MTIME]
         # default for content items:
@@ -74,7 +74,7 @@ def urls_names():
     """
     # XXX we currently also get deleted items, fix this
     fq_names = []
-    for rev in flaskg.storage.documents(wikiname=app.cfg.interwikiname):
+    for rev in flaskg.storage.documents():
         fq_names += [fqname for fqname in rev.fqnames]
     content = render_template("misc/urls_names.txt", fq_names=fq_names)
     return Response(content, mimetype="text/plain")

src/moin/cli/_tests/data/Corrupt.meta

@@ -20,6 +20,5 @@
   "sha1": "6e17f7841d0771d781ef187d6fb8c97540c29fae",
   "size": 8,
   "summary": "",
-  "tags": [],
-  "wikiname": "MyMoinMoin"
+  "tags": []
 }

src/moin/cli/_tests/data/Corrupt2.meta

@@ -1 +1 @@
-{"itemtype": "default", "contenttype": "text/x.moin.wiki;charset=utf-8", "namespace": "", "summary": "", "name": ["Page2"], "tags": [], "comment": "", "rev_number": 1, "itemlinks": [], "itemtransclusions": [], "itemid": "9999989aca5e45cc8683432f986a0e50", "wikiname": "MyMoinMoin", "name_old": [], "mtime": 1683243630, "action": "SAVE", "address": "127.0.0.1", "externallinks": [], "dataid": "8ad82a97211e4de18537e183c235c1a8", "size": 13, "sha1": "25ff6d28976a9e0feb97710a0c4b08ae197a0000", "revid": "0a2f1b476b6c42be80908b3b799df3fd"}
+{"itemtype": "default", "contenttype": "text/x.moin.wiki;charset=utf-8", "namespace": "", "summary": "", "name": ["Page2"], "tags": [], "comment": "", "rev_number": 1, "itemlinks": [], "itemtransclusions": [], "itemid": "9999989aca5e45cc8683432f986a0e50", "name_old": [], "mtime": 1683243630, "action": "SAVE", "address": "127.0.0.1", "externallinks": [], "dataid": "8ad82a97211e4de18537e183c235c1a8", "size": 13, "sha1": "25ff6d28976a9e0feb97710a0c4b08ae197a0000", "revid": "0a2f1b476b6c42be80908b3b799df3fd"}

src/moin/cli/_tests/data/Corrupt3.meta

@@ -1 +1 @@
-{"itemtype": "default", "contenttype": "text/x.moin.wiki;charset=utf-8", "namespace": "", "summary": "", "tags": [], "rev_number": 2, "itemlinks": [], "itemtransclusions": [], "itemid": "3c7e36466726441faf6d7d266ac224e2", "externallinks": [], "wikiname": "MyMoinMoin", "parentid": "002e5210cc884010b0dd75a1c337032d", "name": ["Page3"], "comment": "", "name_old": [], "mtime": 1683245964, "action": "SAVE", "address": "127.0.0.1", "dataid": "c3615a8d48d440c2a344a0e1dcfe7388", "size": 24, "sha1": "3c8b6b1f192549155fa6fef1545b29a06f2441a6", "revid": "39c8fe8da0a048c0b7839bf8aa02cd04"}
+{"itemtype": "default", "contenttype": "text/x.moin.wiki;charset=utf-8", "namespace": "", "summary": "", "tags": [], "rev_number": 2, "itemlinks": [], "itemtransclusions": [], "itemid": "3c7e36466726441faf6d7d266ac224e2", "externallinks": [], "parentid": "002e5210cc884010b0dd75a1c337032d", "name": ["Page3"], "comment": "", "name_old": [], "mtime": 1683245964, "action": "SAVE", "address": "127.0.0.1", "dataid": "c3615a8d48d440c2a344a0e1dcfe7388", "size": 24, "sha1": "3c8b6b1f192549155fa6fef1545b29a06f2441a6", "revid": "39c8fe8da0a048c0b7839bf8aa02cd04"}

src/moin/cli/_tests/data/Home.meta

@@ -20,6 +20,5 @@
   "sha1": "9521dba25709a79ede4a34b50471419774c41099",
   "size": 9,
   "summary": "",
-  "tags": [],
-  "wikiname": "MyMoinMoin"
+  "tags": []
 }

src/moin/cli/_tests/data/MyPage-v1.meta

@@ -20,6 +20,5 @@
   "sha1": "487076f6c9eb3ce9cb18fd9800a62b35383a34ee",
   "size": 16,
   "summary": "",
-  "tags": [],
-  "wikiname": "MyMoinMoin"
+  "tags": []
 }