From 00528879294358d46a47ab3eee329c5a52fb1284 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 25 Sep 2022 14:57:02 +0200
Subject: [PATCH] [fix] springer: unsupported operand type(s) for +: 'NoneType'
 and 'str'

- fix issue reported #1809
- filter out `None` value from issn and isbn list
- add comments (from publicationName)
- add publisher

Closes: https://github.com/searxng/searxng/issues/1809
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/engines/springer.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/searx/engines/springer.py b/searx/engines/springer.py
index e5255b794..a4d0832d8 100644
--- a/searx/engines/springer.py
+++ b/searx/engines/springer.py
@@ -41,7 +41,6 @@ def response(resp):
     json_data = loads(resp.text)
 
     for record in json_data['records']:
-        content = record['abstract']
         published = datetime.strptime(record['publicationDate'], '%Y-%m-%d')
         authors = [" ".join(author['creator'].split(', ')[::-1]) for author in record['creators']]
         tags = record.get('genre')
@@ -50,20 +49,24 @@ def response(resp):
         results.append(
             {
                 'template': 'paper.html',
-                'title': record['title'],
                 'url': record['url'][0]['value'].replace('http://', 'https://', 1),
-                'type': record.get('contentType'),
-                'content': content,
-                'publishedDate': published,
-                'authors': authors,
-                'doi': record.get('doi'),
-                'journal': record.get('publicationName'),
-                'pages': record.get('start_page') + '-' + record.get('end_page'),
+                'title': record['title'],
+                'content': record['abstract'],
+                'comments': record['publicationName'],
                 'tags': tags,
-                'issn': [record.get('issn')],
-                'isbn': [record.get('isbn')],
+                'publishedDate': published,
+                'type': record.get('contentType'),
+                'authors': authors,
+                # 'editor': '',
+                'publisher': record.get('publisher'),
+                'journal': record.get('publicationName'),
                 'volume': record.get('volume') or None,
+                'pages': '-'.join([x for x in [record.get('startingPage'), record.get('endingPage')] if x]),
                 'number': record.get('number') or None,
+                'doi': record.get('doi'),
+                'issn': [x for x in [record.get('issn')] if x],
+                'isbn': [x for x in [record.get('isbn')] if x],
+                # 'pdf_url' : ''
             }
         )
     return results