temporarily revert to case insensitive tag filter

the case insensitive filter is not currently working.
master
Andrew Engelbrecht 7 years ago
parent 4ac1a1930e
commit e39ca90b2e
  1. 5
      mediagoblin_libreplanet/__init__.py
  2. 2
      mediagoblin_libreplanet/lp_helper.py
  3. 5
      mediagoblin_libreplanet/views.py

@ -20,6 +20,7 @@ import os
from mediagoblin import mg_globals from mediagoblin import mg_globals
from mediagoblin.tools.pluginapi import get_config, register_template_path, register_routes from mediagoblin.tools.pluginapi import get_config, register_template_path, register_routes
from mediagoblin.db.models import MediaEntry from mediagoblin.db.models import MediaEntry
from mediagoblin.db.util import media_entries_for_tag_slug
from lp_helper import media_entries_for_tag_slug_case_insensitive from lp_helper import media_entries_for_tag_slug_case_insensitive
from mediagoblin.tools.pagination import Pagination from mediagoblin.tools.pagination import Pagination
from mediagoblin.tools.response import render_to_response from mediagoblin.tools.response import render_to_response
@ -53,7 +54,9 @@ def lp_media_for_type(db, type, tag=None, max_items=MAX_HOME_ITEMS):
if (tag == None): if (tag == None):
cursor = MediaEntry.query cursor = MediaEntry.query
else: else:
cursor = media_entries_for_tag_slug_case_insensitive(db, tag) ## case insensitive tag search is not working yet -- sudoman
#cursor = media_entries_for_tag_slug_case_insensitive(db, tag)
cursor = media_entries_for_tag_slug(db, tag)
return cursor.\ return cursor.\
filter((MediaEntry.media_type == type) filter((MediaEntry.media_type == type)

@ -25,5 +25,5 @@ def media_entries_for_tag_slug_case_insensitive(dummy_db, tag_slug):
.join(MediaTag.tag_helper) \ .join(MediaTag.tag_helper) \
.filter( .filter(
(MediaEntry.state == u'processed') (MediaEntry.state == u'processed')
& (Tag.slug.lower() == tag_slug.lower())) & (Tag.slug.lower() == tag_slug.lower())) # Tag.slug.lower() currently doesn't work.

@ -16,6 +16,7 @@
from mediagoblin import mg_globals from mediagoblin import mg_globals
from mediagoblin.db.models import MediaEntry from mediagoblin.db.models import MediaEntry
from mediagoblin.db.util import media_entries_for_tag_slug
from lp_helper import media_entries_for_tag_slug_case_insensitive from lp_helper import media_entries_for_tag_slug_case_insensitive
from mediagoblin.tools.pagination import Pagination from mediagoblin.tools.pagination import Pagination
from mediagoblin.tools.response import render_to_response from mediagoblin.tools.response import render_to_response
@ -25,7 +26,9 @@ def type_listing(media_type, title, request, page, tag=None):
if (tag == None): if (tag == None):
cursor = MediaEntry.query cursor = MediaEntry.query
else: else:
cursor = media_entries_for_tag_slug_case_insensitive(request.db, tag) ## case insensitive tag search is not working yet -- sudoman
#cursor = media_entries_for_tag_slug_case_insensitive(request.db, tag)
cursor = media_entries_for_tag_slug(request.db, tag)
cursor = cursor.\ cursor = cursor.\
filter((MediaEntry.media_type == media_type) filter((MediaEntry.media_type == media_type)

Loading…
Cancel
Save