|
|
@ -1,6 +1,6 @@ |
|
|
|
from django.db import models |
|
|
|
from tagging.fields import TagField |
|
|
|
from oxdjango.fields import DictField |
|
|
|
from ox.django.fileds import DictField |
|
|
|
from tagging.models import Tag |
|
|
|
from django.contrib.auth.models import User, Group, Permission |
|
|
|
import os |
|
|
@ -12,7 +12,7 @@ from utils.add_file import hashFile, fileInfo, getFileType |
|
|
|
from django.core.files.base import ContentFile |
|
|
|
import operator |
|
|
|
from django.db.models import Q |
|
|
|
from ox.text import smartSplit |
|
|
|
import ox |
|
|
|
from sorl.thumbnail import get_thumbnail |
|
|
|
|
|
|
|
#FIXME: The following two functions are ridiculous. please remove and clean up all references to them. |
|
|
@ -26,7 +26,7 @@ def extFileName(filename): |
|
|
|
|
|
|
|
def splitSearch(string): |
|
|
|
ret = [] |
|
|
|
for s in smartSplit(string): |
|
|
|
for s in ox.smart_split(string): |
|
|
|
word = s.replace("'", "").replace('"', '') |
|
|
|
ret.append(word) |
|
|
|
return ret |
|
|
|