pandora/config.indiancinema.jsonc

@@ -312,14 +312,6 @@
             "autocomplete": true,
             "columnWidth": 128
         },
-        {
-            "id": "fulltext",
-            "operator": "+",
-            "title": "Fulltext",
-            "type": "text",
-            "fulltext": true,
-            "find": true
-        },
         {
             "id": "created",
             "operator": "-",

pandora/config.padma.jsonc

@@ -310,14 +310,6 @@
             "autocomplete": true,
             "columnWidth": 128
         },
-        {
-            "id": "fulltext",
-            "operator": "+",
-            "title": "Fulltext",
-            "type": "text",
-            "fulltext": true,
-            "find": true
-        },
         {
             "id": "created",
             "operator": "-",

pandora/document/fulltext.py

@@ -42,6 +42,7 @@ def ocr_image(path):
 
 class FulltextMixin:
     _ES_INDEX = "document-index"
+    _ES_DOC_TYPE = "document"
 
     @classmethod
     def elasticsearch(cls):
@@ -66,7 +67,7 @@ class FulltextMixin:
         if self.has_fulltext_key():
             from elasticsearch.exceptions import NotFoundError
             try:
-                res = self.elasticsearch().delete(index=self._ES_INDEX, id=self.id)
+                res = self.elasticsearch().delete(index=self._ES_INDEX, doc_type=self._ES_DOC_TYPE, id=self.id)
             except NotFoundError:
                 pass
             except:
@@ -79,7 +80,7 @@ class FulltextMixin:
                 doc = {
                     'text': text.lower()
                 }
-                res = self.elasticsearch().index(index=self._ES_INDEX, id=self.id, body=doc)
+                res = self.elasticsearch().index(index=self._ES_INDEX, doc_type=self._ES_DOC_TYPE, id=self.id, body=doc)
 
     @classmethod
     def find_fulltext(cls, query):
@@ -175,6 +176,7 @@ class FulltextMixin:
 
 class FulltextPageMixin(FulltextMixin):
     _ES_INDEX = "document-page-index"
+    _DOC_TYPE = 'page'
 
     def extract_fulltext(self):
         if self.document.file:

pandora/item/views.py

@@ -1289,15 +1289,12 @@ def atom_xml(request):
         'application/atom+xml'
     )
 
-
 def oembed(request):
     format = request.GET.get('format', 'json')
     maxwidth = int(request.GET.get('maxwidth', 640))
     maxheight = int(request.GET.get('maxheight', 480))
 
-    url = request.GET.get('url')
+    url = request.GET['url']
-    if not url:
-        raise Http404
     parts = urlparse(url).path.split('/')
     if len(parts) < 2:
         raise Http404