rwrapper function renaming

Author: chreman

server/workers/base/src/base.py

@@ -20,7 +20,7 @@ def next_item(self):
         endpoint = msg.get('endpoint')
         return k, params, endpoint
 
-    def execute_r(self, params):
+    def execute_search(self, params):
         q = params.get('q')
         service = params.get('service')
         data = {}
@@ -52,14 +52,16 @@ def execute_r(self, params):
             self.logger.error(error)
             raise
 
+    def execute_contentproviders(self):
+
     def run(self):
         while True:
             k, params, endpoint = self.next_item()
             self.logger.debug(k)
             self.logger.debug(params)
             if endpoint == "search":
                 try:
-                    res = self.execute_r(params)
+                    res = self.execute_search(params)
                     res["id"] = k
                     if res.get("status") == "error" or params.get('raw') is True:
                         self.redis_store.set(k+"_output", json.dumps(res))
@@ -68,3 +70,7 @@ def run(self):
                 except Exception as e:
                     self.logger.exception("Exception during data retrieval.")
                     self.logger.error(params)
+
+            if endpoint == "contentproviders":
+                try:
+                    res = self.execute

server/workers/common/r_wrapper.py

@@ -37,7 +37,7 @@ def add_default_params(self, params):
     def next_item(self):
         raise NotImplementedError
 
-    def execute_r(self, params):
+    def execute_search(self, params):
         raise NotImplementedError
 
     def run(self):
@@ -49,7 +49,7 @@ def run(self):
                 try:
                     res = {}
                     res["id"] = k
-                    res["input_data"] = self.execute_r(params)
+                    res["input_data"] = self.execute_search(params)
                     res["params"] = params
                     if params.get('raw') is True:
                         redis_store.set(k+"_output", json.dumps(res))

server/workers/dataprocessing/src/headstart.py

@@ -52,7 +52,7 @@ def next_item(self):
         input_data = msg.get('input_data')
         return k, params, input_data
 
-    def execute_r(self, params, input_data):
+    def execute_search(self, params, input_data):
         q = params.get('q')
         service = params.get('service')
         data = {}
@@ -92,7 +92,7 @@ def run(self):
                 if params.get('vis_type') == "timeline":
                     # the step of create_map can be dropped once deduplication is possible in API backend as well
                     # TODO: create deduplicate endpoint in service worker and connect to that
-                    metadata = self.execute_r(params, input_data)
+                    metadata = self.execute_search(params, input_data)
                     sg_data = sg.get_streamgraph_data(json.loads(metadata),
                                                     params.get('q'),
                                                     params.get('top_n', 12),
@@ -103,7 +103,7 @@ def run(self):
                     res["status"] = "success"
                     self.redis_store.set(k+"_output", json.dumps(res))
                 else:
-                    res = self.execute_r(params, input_data)
+                    res = self.execute_search(params, input_data)
                     self.redis_store.set(k+"_output", json.dumps(res))
             except ValueError as e:
                 self.logger.error(params)

server/workers/openaire/src/openaire.py

@@ -19,7 +19,7 @@ def next_item(self):
         endpoint = msg.get('endpoint')
         return k, params, endpoint
 
-    def execute_r(self, params):
+    def execute_search(self, params):
         q = params.get('acronym')
         service = params.get('service')
         data = {}
@@ -52,7 +52,7 @@ def run(self):
                 try:
                     res = {}
                     res["id"] = k
-                    res["input_data"] = self.execute_r(params)
+                    res["input_data"] = self.execute_search(params)
                     res["params"] = params
                     if params.get('raw') is True:
                         self.redis_store.set(k+"_output", json.dumps(res))

server/workers/pubmed/src/pubmed.py

@@ -19,7 +19,7 @@ def next_item(self):
         endpoint = msg.get('endpoint')
         return k, params, endpoint
 
-    def execute_r(self, params):
+    def execute_search(self, params):
         q = params.get('q')
         service = params.get('service')
         data = {}
@@ -52,7 +52,7 @@ def run(self):
                 try:
                     res = {}
                     res["id"] = k
-                    res["input_data"] = self.execute_r(params)
+                    res["input_data"] = self.execute_search(params)
                     res["params"] = params
                     if params.get('raw') is True:
                         self.redis_store.set(k+"_output", json.dumps(res))