Jip J. Dekker
|
b44ab49255
|
Merge branch 'develop' into feature/parser-selection
Conflicts:
fourmi.py
|
2014-04-22 19:27:49 +02:00 |
|
Jip J. Dekker
|
bf3ec069ef
|
Merge branch 'release/v0.2.0' into develop
|
2014-04-22 19:11:01 +02:00 |
|
Jip J. Dekker
|
23189499e6
|
Merge branch 'release/v0.2.0'
v0.2.0
|
2014-04-22 19:10:51 +02:00 |
|
Jip J. Dekker
|
67bc3f3144
|
Bumped the version number
|
2014-04-22 19:10:24 +02:00 |
|
Jip J. Dekker
|
53049330e9
|
Merge pull request #1 from Recondor/feature/chemspider-parser
Feature/chemspider parser
|
2014-04-22 19:05:42 +02:00 |
|
Jip J. Dekker
|
595af7aa32
|
PEP-8 and fixed a bug in set_spider
|
2014-04-22 19:03:29 +02:00 |
|
Jip J. Dekker
|
ba7bed0250
|
Disabled name mangling for the spider reference in the parsers
|
2014-04-22 18:55:14 +02:00 |
|
Jip J. Dekker
|
648b23e466
|
PEP-8 standards for a lot of things
|
2014-04-22 18:54:10 +02:00 |
|
Jip J. Dekker
|
0da2d74e2c
|
PEP-8 indentation for multi-line statements
|
2014-04-22 18:46:49 +02:00 |
|
Jip J. Dekker
|
7a1e99605b
|
Uniform TODO tags, indentation faults.
|
2014-04-22 18:40:14 +02:00 |
|
Bas Vb
|
b0146cdce8
|
Added regular expressions to clean up temperature data
|
2014-04-22 09:46:19 +02:00 |
|
RTB
|
63fb9f4733
|
added comment to parse_searchrequest and added optional todo for extract()[0] usage
|
2014-04-18 17:33:00 +02:00 |
|
RTB
|
3c5dbc44dc
|
added comments for chemspider parse_extendedinfo
|
2014-04-18 17:14:19 +02:00 |
|
RTB
|
2ac6d1711d
|
added comments for chemspider new_synonym
|
2014-04-18 17:11:04 +02:00 |
|
RTB
|
3862bfb7d8
|
added comments for ChemSpider class, parse_properties, and parse_synonyms
|
2014-04-18 16:54:30 +02:00 |
|
RTB
|
f18f23dfc6
|
chemspider new_compound_request is now PEP-8 compliant
|
2014-04-18 16:20:47 +02:00 |
|
RTB
|
074fbdf9e2
|
changed source for properties by parse_extendedinfo to 'ChemSpider ExtendedCompoundInfo'
|
2014-04-18 16:13:44 +02:00 |
|
RTB
|
fa22356cb2
|
chemspider parse_extendedinfo is now PEP-8 compliant
|
2014-04-18 16:12:07 +02:00 |
|
RTB
|
479182d77e
|
chemspider new_synonym is now PEP-8 compliant
|
2014-04-18 16:07:06 +02:00 |
|
RTB
|
319e028717
|
chemspider parse_properties a bit more PEP-8 compliant
|
2014-04-18 15:55:04 +02:00 |
|
RTB
|
9aae8d2d07
|
chemspider parse_properties is now PEP-8 compliant, hopefully
|
2014-04-18 15:38:07 +02:00 |
|
RTB
|
c1c7cfc117
|
edited global strings to be consistent (PEP-8)
|
2014-04-18 15:12:22 +02:00 |
|
RTB
|
f2cacb79eb
|
properties from Predicted - ACD/Labs tab now include conditions from value variable
|
2014-04-18 15:03:06 +02:00 |
|
RTB
|
3bf8dccf18
|
properties from Predicted - ACD/Labs tab now include conditions from attribute variable
|
2014-04-18 14:59:56 +02:00 |
|
RTB
|
cd8a64816f
|
removed colon at end of attributes in Experimental and Predicted ACD/labs tabs
|
2014-04-18 14:10:53 +02:00 |
|
RTB
|
22c765b6e5
|
simplified setting of Results for Predicted ACD/Labs tab
|
2014-04-18 14:08:48 +02:00 |
|
RTB
|
75d248e6cf
|
changed for loop in parse_properties to use zip instead of enumerate
|
2014-04-18 13:45:32 +02:00 |
|
RTB
|
bf4a5bb41f
|
added scraping of synonyms labeled as 'synonym_cn'
|
2014-04-18 13:36:33 +02:00 |
|
RTB
|
a4a21f2578
|
changed default reliability from empty string to Unknown as per UML design
|
2014-04-18 13:19:05 +02:00 |
|
RTB
|
9389af99ba
|
removed manual Requests for wikipedia URLs as wikipedia parser handles those through synonyms
|
2014-04-18 13:17:24 +02:00 |
|
RTB
|
ae21fa7c67
|
chemspider now scrapes for reference data on synonyms
|
2014-04-18 13:16:22 +02:00 |
|
RTB
|
119d48890d
|
fixed conditional for emitting synonyms, it compiles again
|
2014-04-18 12:14:54 +02:00 |
|
Jip J. Dekker
|
000bc556ec
|
Merge branch 'develop' into feature/parser-selection
Conflicts:
fourmi.py
|
2014-04-17 23:44:00 +02:00 |
|
RTB
|
04751b6670
|
chemspider parser now only emits synonyms labeled as 'English'
|
2014-04-17 22:47:43 +02:00 |
|
RTB
|
ce5eeb56a6
|
added scraping of synonym language
|
2014-04-17 22:37:37 +02:00 |
|
RTB
|
4f2c046c9c
|
rewrote parse_synonyms and new_synonym to use an internal dictionary structure
|
2014-04-17 22:06:45 +02:00 |
|
RTB
|
2e95d35283
|
modified parse_synonyms and new_synonym to include a Selector for future edits
|
2014-04-17 21:30:53 +02:00 |
|
Bas Vb
|
be63315ca2
|
regex
|
2014-04-16 17:01:35 +02:00 |
|
Jip J. Dekker
|
bd7fb38497
|
Merge branch 'feature/chemspider-parser' of code.giphouse.nl:giphouse/descartes-2 into feature/chemspider-parser
|
2014-04-16 17:01:09 +02:00 |
|
Jip J. Dekker
|
3aaed985fe
|
Merge branch 'develop' into feature/chemspider-parser
|
2014-04-16 17:00:59 +02:00 |
|
Jip J. Dekker
|
873231439c
|
Merge branch 'develop' into feature/Wikipedia
|
2014-04-16 16:59:25 +02:00 |
|
Jip J. Dekker
|
d603e388e6
|
Merge branch 'hotfix/1-searchable' into develop
|
2014-04-16 16:58:53 +02:00 |
|
Jip J. Dekker
|
8cf307127a
|
Merge branch 'hotfix/1-searchable'
|
2014-04-16 16:57:43 +02:00 |
|
Jip J. Dekker
|
ab2a3fdc08
|
typo!
|
2014-04-16 16:57:27 +02:00 |
|
Jip J. Dekker
|
f0d10902b5
|
Searchable can't be a list!
|
2014-04-16 16:57:08 +02:00 |
|
Jip J. Dekker
|
efacc08a3d
|
Merge branch 'develop' into feature/Wikipedia
Conflicts:
Fourmi.py
|
2014-04-16 16:49:03 +02:00 |
|
Bas Vb
|
6f82b117c9
|
new function to clean up the datapoints
|
2014-04-16 16:23:33 +02:00 |
|
Rob tB
|
9a78e186bc
|
chemspider parser now grabs data from ExtendedCompoundInfo() of chemspider API (no units)
|
2014-04-16 16:22:47 +02:00 |
|
Bas Vb
|
74aa446f40
|
minor edits (comments etc.)
|
2014-04-16 15:27:36 +02:00 |
|
Rob tB
|
caf7d3df4e
|
fixed ExtendedCompoundInfo url to have csid parameter instead of query
|
2014-04-16 15:27:10 +02:00 |
|