pew
/
phenny-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix .hs command to handle new format

master
mutantmonkey 2013-07-21 00:02:41 -07:00
parent 5d53cc6b11
commit aadd97eea8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/hs.py
View File

@ -11,25 +11,25 @@ import lxml.etree
SEARCH_URL = "https://webapps.middleware.vt.edu/peoplesearch/PeopleSearch?query={0}&dsml-version=2" SEARCH_URL = "https://webapps.middleware.vt.edu/peoplesearch/PeopleSearch?query={0}&dsml-version=2"
RESULTS_URL = "http://search.vt.edu/search/people.html?q={0}" RESULTS_URL = "http://search.vt.edu/search/people.html?q={0}"
PERSON_URL = "http://search.vt.edu/search/person.html?person={0:d}" PERSON_URL = "http://search.vt.edu/search/person.html?person={0:d}"
NS = NS = '{urn:oasis:names:tc:DSML:2:0:core}' NS = '{http://www.dsml.org/DSML}'
"""Search the people search database using the argument as a query.""" """Search the people search database using the argument as a query."""
def search(query): def search(query):
query = web.quote(query) query = web.quote(query)
try: try:
req = web.get(SEARCH_URL.format(query), verify=False) r = web.get(SEARCH_URL.format(query), verify=False)
except (web.ConnectionError, web.HTTPError): except (web.ConnectionError, web.HTTPError):
raise GrumbleError("THE INTERNET IS FUCKING BROKEN. Please try again later.") raise GrumbleError("THE INTERNET IS FUCKING BROKEN. Please try again later.")
xml = lxml.etree.fromstring(req.encode('utf-8')) xml = lxml.etree.fromstring(r.encode('utf-8'))
results = xml.findall('{0}searchResponse/{0}searchResultEntry'.format(NS)) results = xml.findall('{0}directory-entries/{0}entry'.format(NS))
if len(results) <= 0: if len(results) <= 0:
return False return False
ret = [] ret = []
for entry in results: for entry in results:
entry_data = {} entry_data = {}
for attr in entry: for attr in entry.findall('{0}attr'.format(NS)):
entry_data[attr.attrib['name']] = attr[0].text entry_data[attr.attrib['name']] = attr[0].text
ret.append(entry_data) ret.append(entry_data)