Dekker1/Fourmi
Archived
1
0
Fork 0
Code

replaced name variable with summary variable

Browse Source
This commit is contained in:
Rob tB 2014-05-21 10:40:44 +02:00
parent 6cd8edaf22
commit 6ce5ff2335
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FourmiCrawler/sources/NIST.py
View File

@ -163,7 +163,6 @@ class NIST(Source):
"""Parses the table containing properties regarding phase changes""" """Parses the table containing properties regarding phase changes"""
results = [] results = []
name = table.xpath('@summary').extract()[0]
tr_unit = ''.join(table.xpath('tr[1]/th[1]/node()').extract()) tr_unit = ''.join(table.xpath('tr[1]/th[1]/node()').extract())
m = re.search(r'\((.*)\)', tr_unit) m = re.search(r'\((.*)\)', tr_unit)
unit = '!' unit = '!'
@ -173,7 +172,7 @@ class NIST(Source):
for tr in table.xpath('tr[td]'): for tr in table.xpath('tr[td]'):
tds = tr.xpath('td/text()').extract() tds = tr.xpath('td/text()').extract()
result = Result({ result = Result({
'attribute': name, 'attribute': summary,
'value': tds[0] + ' ' + unit, 'value': tds[0] + ' ' + unit,
'source': 'NIST', 'source': 'NIST',
'reliability': 'Unknown', 'reliability': 'Unknown',
@ -193,7 +192,6 @@ class NIST(Source):
""" """
results = [] results = []
name = table.xpath('@summary').extract()[0]
tr_unit = ''.join(table.xpath('tr[1]/th[1]/node()').extract()) tr_unit = ''.join(table.xpath('tr[1]/th[1]/node()').extract())
m = re.search(r'\((.*)\)', tr_unit) m = re.search(r'\((.*)\)', tr_unit)
unit = '!' unit = '!'
@ -203,7 +201,7 @@ class NIST(Source):
for tr in table.xpath('tr[td]'): for tr in table.xpath('tr[td]'):
tds = tr.xpath('td/text()').extract() tds = tr.xpath('td/text()').extract()
result = Result({ result = Result({
'attribute': name, 'attribute': summary,
'value': tds[0] + ' ' + unit, 'value': tds[0] + ' ' + unit,
'source': 'NIST', 'source': 'NIST',
'reliability': 'Unknown', 'reliability': 'Unknown',
@ -217,12 +215,10 @@ class NIST(Source):
"""Parse table containing parameters for the Antione equation""" """Parse table containing parameters for the Antione equation"""
results = [] results = []
name = table.xpath('@summary').extract()[0]
for tr in table.xpath('tr[td]'): for tr in table.xpath('tr[td]'):
tds = tr.xpath('td/text()').extract() tds = tr.xpath('td/text()').extract()
result = Result({ result = Result({
'attribute': name, 'attribute': summary,
'value': 'A=%s, B=%s, C=%s' % (tds[1], tds[2], tds[3]), 'value': 'A=%s, B=%s, C=%s' % (tds[1], tds[2], tds[3]),
'source': 'NIST', 'source': 'NIST',
'reliability': 'Unknown', 'reliability': 'Unknown',