Skip to content
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

Fixed whitespace trim issues #16

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

Fixed whitespace trim issues #16

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
20 changes: 10 additions & 10 deletions getngrams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ def getNgrams(query, corpus, startYear, endYear, smoothing, caseInsensitive):
return req.url, params['content'], df


def runQuery(argumentString):
arguments = argumentString.split()
def runQuery(arguments):
query = ' '.join([arg for arg in arguments if not arg.startswith('-')])
if '?' in query:
query = query.replace('?', '*')
Expand Down Expand Up @@ -92,6 +91,7 @@ def runQuery(argumentString):
notifyUser = False
url, urlquery, df = getNgrams(query, corpus, startYear, endYear,
smoothing, caseInsensitive)
queryPhrases = [phrase.strip() for phrase in urlquery.split(",")]
if not allData:
if caseInsensitive is True:
for col in df.columns:
Expand All @@ -104,7 +104,7 @@ def runQuery(argumentString):
elif col.count(':heb_') == 1 or corpus.startswith('heb_'):
pass
elif col.count('(All)') == 0 and col != 'year':
if col not in urlquery.split(','):
if col not in queryPhrases:
df.pop(col)
if '_INF' in query:
for col in df.columns:
Expand Down Expand Up @@ -151,11 +151,11 @@ def runQuery(argumentString):
print(warningMessage)

if __name__ == '__main__':
argumentString = ' '.join(sys.argv[1:])
if argumentString == '':
argumentString = eval(input('Enter query (or -help):'))
if len(sys.argv) <= 1:
arguments = input('Enter query (or -help):').split()
else:
try:
runQuery(argumentString)
except:
print('An error occurred.')
arguments = sys.argv[1:]
try:
runQuery(arguments)
except:
print('An error occurred.')