From 40f29bdf514534dd0b1030c6951c657c8afc9798 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 6 Jan 2017 07:21:32 +0000 Subject: [PATCH] effect git-svn-id: svn://192.168.0.12/source@335 8346c931-da38-4b9b-9d4c-e48b93cbd075 --- WebBasedCrawler/effect/effectinstagram.py | 9 +++++++-- WebBasedCrawler/effect/effectkakaostory.py | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/WebBasedCrawler/effect/effectinstagram.py b/WebBasedCrawler/effect/effectinstagram.py index 5b6b855..b21f113 100644 --- a/WebBasedCrawler/effect/effectinstagram.py +++ b/WebBasedCrawler/effect/effectinstagram.py @@ -174,6 +174,7 @@ class EffectInsta(object): result_sender = ResultSender(cg['host'], cg['user'], cg['pass'], cg['name']) if cg else ResultSender() result_sender.connect() result['lastupdate_filter'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + result['status'] = 'OK' result_sender.send('stats_s1_effect', result) result_sender.close() except Exception as e: @@ -206,8 +207,12 @@ class EffectInsta(object): for reply in replies: str_reply_date = reply.get('article_date', '1990-01-01 00:00:00') - reply_date = datetime.datetime.strptime(str_reply_date, '%Y-%m-%d %H:%M:%S').date().strftime('%Y%m%d') + reply_date = datetime.datetime.strptime(str_reply_date, '%Y-%m-%d %H:%M:%S').date().strftime('%m-%d-%Y') if reply_date in date_dict: date_dict[reply_date] = date_dict[reply_date] + 1 - return json.dumps(date_dict, sort_keys=True) + + json_array = [{'date': k, 'value': v} for k, v in date_dict.items()] + + return json.dumps(json_array, sort_keys=True) + diff --git a/WebBasedCrawler/effect/effectkakaostory.py b/WebBasedCrawler/effect/effectkakaostory.py index b137d78..ccafb48 100644 --- a/WebBasedCrawler/effect/effectkakaostory.py +++ b/WebBasedCrawler/effect/effectkakaostory.py @@ -449,6 +449,7 @@ class EffectKakaostory(object): try: result = self.statistics(body, replies) result['lastupdate_filter'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + result['status'] = 'OK' except Exception as e: raise effect.effecterror.UnknownError(str(e)) #pprint.pprint(body) @@ -494,10 +495,13 @@ class EffectKakaostory(object): for reply in replies: str_reply_date = reply.get('article_date', '1990-01-01 00:00:00') - reply_date = datetime.datetime.strptime(str_reply_date, '%Y-%m-%d %H:%M:%S').date().strftime('%Y%m%d') + reply_date = datetime.datetime.strptime(str_reply_date, '%Y-%m-%d %H:%M:%S').date().strftime('%m-%d-%Y') if reply_date in date_dict: date_dict[reply_date] = date_dict[reply_date] + 1 - return json.dumps(date_dict, sort_keys=True) + + json_array = [{'date': k, 'value': v} for k, v in date_dict.items()] + + return json.dumps(json_array, sort_keys=True)