Mercurial > dive4elements > river
comparison backend/contrib/shpimporter/shpimporter.py @ 8611:e331a5ad2554
(issue1799) Strip whitespace from river names
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 24 Mar 2015 11:57:23 +0100 |
| parents | e68e414dceb2 |
| children | 4a13535ed949 |
comparison
equal
deleted
inserted
replaced
| 8610:1f6b30310360 | 8611:e331a5ad2554 |
|---|---|
| 197 for directory in directories: | 197 for directory in directories: |
| 198 if not config.river_name: | 198 if not config.river_name: |
| 199 river_name = utils.getUTF8Path( | 199 river_name = utils.getUTF8Path( |
| 200 os.path.basename(os.path.normpath(directory))) | 200 os.path.basename(os.path.normpath(directory))) |
| 201 else: | 201 else: |
| 202 river_name = config.river_name | 202 river_name = config.river_name.strip() |
| 203 river_id = utils.getRiverId(dbconn_raw, river_name, oracle) | 203 river_id = utils.getRiverId(dbconn_raw, river_name, oracle) |
| 204 | 204 |
| 205 if not river_id: | 205 if not river_id: |
| 206 logger.info(u"Could not find river in database. Skipping: %s" | 206 logger.info(u"Could not find river in database. Skipping: %s" |
| 207 % unicode(utils.getUTF8(river_name), "UTF-8")) | 207 % unicode(utils.getUTF8(river_name), "UTF-8")) |