Skip to content

added index_code input as a list instead of a single code string #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jjcc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added index_code input as a list instead of a single code string #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion opendatatools/swindex/swindex_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@ def get_index_cons(self, index_code):

def get_index_daily(self, index_code, start_date, end_date):
url = 'http://www.swsindex.com/excel2.aspx?ctable=swindexhistory&where=%s '
where_cond = " swindexcode in ('%s') and BargainDate >= '%s' and BargainDate <= '%s'" % (index_code, start_date, end_date)
if isinstance(index_code, str):
where_cond = " swindexcode in ('%s') and BargainDate >= '%s' and BargainDate <= '%s'" % (index_code, start_date, end_date)
elif isinstance(index_code,list):
index_code_list = "','".join(index_code)
where_cond = " swindexcode in ('%s') and BargainDate >= '%s' and BargainDate <= '%s'" % (index_code_list, start_date, end_date)
else:
return None, 'Input Error:index_code should be a string or a list of string'
url = url % where_cond
print(url)

Expand Down