Browse Source

[enh] improve yacy engine

Thomas Pointhuber 10 years ago
parent
commit
7e30633edd
1 changed files with 12 additions and 13 deletions
  1. 12
    13
      searx/engines/yacy.py

+ 12
- 13
searx/engines/yacy.py View File

@@ -68,9 +68,18 @@ def response(resp):
68 68
 
69 69
     search_results = raw_search_results.get('channels', {})[0].get('items', [])
70 70
 
71
-    if resp.search_params['category'] == 'general':
71
+    for result in search_results:
72
+        # parse image results
73
+        if result.get('image'):
74
+            # append result
75
+            results.append({'url': result['url'],
76
+                            'title': result['title'],
77
+                            'content': '',
78
+                            'img_src': result['image'],
79
+                            'template': 'images.html'})
80
+
72 81
         # parse general results
73
-        for result in search_results:
82
+        else:
74 83
             publishedDate = parser.parse(result['pubDate'])
75 84
 
76 85
             # append result
@@ -79,17 +88,7 @@ def response(resp):
79 88
                             'content': result['description'],
80 89
                             'publishedDate': publishedDate})
81 90
 
82
-    elif resp.search_params['category'] == 'images':
83
-        # parse image results
84
-        for result in search_results:
85
-            # append result
86
-            results.append({'url': result['url'],
87
-                            'title': result['title'],
88
-                            'content': '',
89
-                            'img_src': result['image'],
90
-                            'template': 'images.html'})
91
-
92
-    #TODO parse video, audio and file results
91
+        #TODO parse video, audio and file results
93 92
 
94 93
     # return results
95 94
     return results