regex search

Author: raimu

xdoc/documents.py

@@ -10,6 +10,7 @@ class Node(mongoengine.Document):
     parent = mongoengine.ReferenceField('Node')
 
     _id_path = mongoengine.StringField()
+    _keywords = mongoengine.ListField(mongoengine.StringField())
 
     meta = {
         'allow_inheritance': True,
@@ -20,12 +21,16 @@ class Node(mongoengine.Document):
     def pre_save(cls, sender, document, **kwargs):
         if isinstance(document, Node):
             document._id_path = '/' + '/'.join(document._get_path())
+            document._keywords = document._get_keywords()
 
     def _get_path(self):
         if self.parent == None:
             return [unicode(self.id)]
         return self.parent._get_path() + [unicode(self.id)]
 
+    def _get_keywords(self):
+        return [self.name]
+
     def __unicode__(self):
         return unicode(self.name)
 
@@ -42,10 +47,16 @@ class Text(Document):
 
     content = mongoengine.StringField()
 
+    def _get_keywords(self):
+        return [self.name, self.content]
+
 
 class Link(Document):
 
     url = mongoengine.URLField()
 
+    def _get_keywords(self):
+        return [self.name, self.url]
+
 
 signals.pre_save.connect(Node.pre_save)

xdoc/views.py

@@ -9,6 +9,7 @@
 from pygments import highlight
 from pygments.formatters.html import HtmlFormatter
 from pygments.lexers.web import JsonLexer
+import re
 from xdoc.documents import Node, Folder
 
 
@@ -47,7 +48,8 @@ def table(request):
     result = Node.objects.all()
 
     if request.GET['sSearch'] != '':
-        result = result.filter(name__icontains=request.GET['sSearch'])
+        result = result.filter(_keywords=re.compile(request.GET['sSearch'],
+                                                    re.IGNORECASE))
     if request.GET['sSortDir_0'] == 'asc':
         result = result.order_by('+%s' % order_column)
     if request.GET['sSortDir_0'] == 'desc':