Changeset 3884 for lliurex-store/trunk/fuentes/python3-lliurex-store.install

Timestamp:

Mar 10, 2017, 10:19:24 AM (3 years ago)

Author:

Juanma

Message:

Changed tokenize search terms method

Location:

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins

Files:

• loadStore.py (modified) (1 diff)
• searchManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py

@@ -93 +93 @@
                                 if fn != uniqDict[pkg]['fn']:
                                         if fn != pkg:
-                                                self._debug("Removed duplicated"+app.get_id())
+                                                self._debug("Removed duplicated "+app.get_id())
                                                 store.remove_app(app)
                                         else:
-                                                self._debug("Removed duplicated"+uniqDict[pkg]['app'].get_id())
+                                                self._debug("Removed duplicated "+uniqDict[pkg]['app'].get_id())
                                                 store.remove_app(uniqDict[pkg]['app'])
                                                 uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/searchManager.py

@@ -37 +37 @@
                 if not type(tokens) is str:
                         tokens=''
-                if len(tokens.split(' '))>1 or action=='list':
+                else:
+                        tokens=tokens.lower()
+                if len(tokens.split(' '))>1 and action=='search':
                         self._debug("Tokenizing search items")
                         tokens=appstream.utils_search_tokenize(tokens)
                 else:
-                        tokens=[tokens]
+                        tokens=tokens.split(' ')
                 self.store=appstreamStore
                 self.result['status']={'status':-1,'msg':''}
@@ -61 +63 @@
 
         def _search_app(self,tokens,exact_match):
-                self._debug("Searching app "+str(tokens)+ "with exact_match="+str(exact_match))
+                self._debug("Searching app "+str(tokens)+ " with exact_match="+str(exact_match))
                 applist=[]
                 app=None
                 if len(tokens)==1:
                         app=self._app_exists(tokens[0])
-
                 if app:
                         applist.append(app)