3.3.2: update gesis search api

fiduswriter · Nov 30, 2017 · ecc2143 · ecc2143
1 parent 5c13da5
commit ecc2143
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 47 deletions.
diff --git a/citation-api-import/static/js/es6_modules/citation-api-import/gesis.js b/citation-api-import/static/js/es6_modules/citation-api-import/gesis.js
@@ -1,4 +1,6 @@
-import {searchApiResultGesisTemplate} from "./templates"
+import {
+    searchApiResultGesisTemplate
+} from "./templates"
 
 export class GesisSearcher {
 
@@ -18,55 +20,72 @@ export class GesisSearcher {
 
     lookup(searchTerm) {
 
-        return fetch('https://search.gesis.org/searchengine', {
-            method: "POST",
-            body: {
-               "query": {
-                  "bool": {
-                     "must": [
+        let searchQuery = {
+            "query": {
+                "bool": {
+                    "must": [{
+                        "query_string": {
+                            "query": searchTerm
+                        }
+                    }],
+                    "should": [ // We only search types which make sense to cite.
+                        {
+                            "term": {
+                                "type": "publication"
+                            }
+                        },
+                        {
+                            "term": {
+                                "type": "research_data"
+                            }
+                        },
                         {
-                          "query_string": {
-                             "query": searchTerm
-                          }
+                            "term": {
+                                "type": "instruments_tools"
+                            }
+                        },
+                        {
+                            "term": {
+                                "type": "gesis_bib"
+                            }
                         }
-                     ],
-                     "should": [ // We only search types which make sense to cite.
-                        {"term": {"type": "publication"}},
-                        {"term": {"type": "research_data"}},
-                        {"term": {"type": "instruments_tools"}},
-                        {"term": {"type": "gesis_bib"}}
-                     ],
-                     "minimum_should_match" : 1
-                  }
-               }
-           }
-        }).then(
-            response => response.json()
-        ).then(json => {
-            let items = json['hits']['hits'].map(hit => hit._source)
-            let searchEl = document.getElementById('bibimport-search-result-gesis')
-            if (!searchEl) {
-                // window was closed before result was ready.
-                return
-            }
-            if (items.length) {
-                searchEl.innerHTML = searchApiResultGesisTemplate({items})
-            } else {
-                searchEl.innerHTML = ''
+                    ],
+                    "minimum_should_match": 1
+                }
             }
-            this.bind()
-        })
-    }
+        }
 
-    getBibtex(id, type) {
-        fetch(`/proxy/citation-api-import/https://search.gesis.org/ajax/bibtex.php?type=${type}&docid=${id}&download=true`, {
-            method: "GET",
-            credentials: "same-origin"
+        return fetch(`https://search.gesis.org/searchengine?source=${encodeURI(JSON.stringify(searchQuery))}`, {
+            method: "GET"
         }).then(
-            response => response.text()
-        ).then(
-            bibtex => this.importer.importBibtex(bibtex)
-        )
-    }
+        response => response.json()
+    ).then(json => {
+        let items = json['hits']['hits'].map(hit => hit._source)
+        let searchEl = document.getElementById('bibimport-search-result-gesis')
+        if (!searchEl) {
+            // window was closed before result was ready.
+            return
+        }
+        if (items.length) {
+            searchEl.innerHTML = searchApiResultGesisTemplate({
+                items
+            })
+        } else {
+            searchEl.innerHTML = ''
+        }
+        this.bind()
+    })
+}
+
+getBibtex(id, type) {
+    fetch(`/proxy/citation-api-import/https://search.gesis.org/ajax/bibtex.php?type=${type}&docid=${id}&download=true`, {
+        method: "GET",
+        credentials: "same-origin"
+    }).then(
+        response => response.text()
+    ).then(
+        bibtex => this.importer.importBibtex(bibtex)
+    )
+}
 
 }
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='fiduswriter-citation-api-import',
-    version='3.3.1',
+    version='3.3.2',
     packages=find_packages(),
     include_package_data=True,
     license='AGPL License',