# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1312274350 -7200
# Node ID 70ea754d3e04ac431d8ccbfbe1f12490861accf2
# Parent  fdae265d36e77f689fd54635e42dd0607f9b850b
[server] host mapping is better named url mapping (closes #1892461)

diff -r fdae265d36e7 -r 70ea754d3e04 server/sources/datafeed.py
--- a/server/sources/datafeed.py	Tue Aug 02 15:52:42 2011 +0200
+++ b/server/sources/datafeed.py	Tue Aug 02 10:39:10 2011 +0200
@@ -351,10 +351,10 @@
 
     def parse(self, url):
         if url.startswith('http'):
-            from cubicweb.sobjects.parsers import HOST_MAPPING
-            for mappedurl in HOST_MAPPING:
+            from cubicweb.sobjects.parsers import URL_MAPPING
+            for mappedurl in URL_MAPPING:
                 if url.startswith(mappedurl):
-                    url = url.replace(mappedurl, HOST_MAPPING[mappedurl], 1)
+                    url = url.replace(mappedurl, URL_MAPPING[mappedurl], 1)
                     break
             self.source.info('GET %s', url)
             stream = _OPENER.open(url)
diff -r fdae265d36e7 -r 70ea754d3e04 sobjects/parsers.py
--- a/sobjects/parsers.py	Tue Aug 02 15:52:42 2011 +0200
+++ b/sobjects/parsers.py	Tue Aug 02 10:39:10 2011 +0200
@@ -459,10 +459,10 @@
 
 def registration_callback(vreg):
     vreg.register_all(globals().values(), __name__)
-    global HOST_MAPPING
-    HOST_MAPPING = {}
+    global URL_MAPPING
+    URL_MAPPING = {}
     if vreg.config.apphome:
-        host_mapping_file = osp.join(vreg.config.apphome, 'hostmapping.py')
-        if osp.exists(host_mapping_file):
-            HOST_MAPPING = eval(file(host_mapping_file).read())
-            vreg.info('using host mapping %s from %s', HOST_MAPPING, host_mapping_file)
+        url_mapping_file = osp.join(vreg.config.apphome, 'urlmapping.py')
+        if osp.exists(url_mapping_file):
+            URL_MAPPING = eval(file(url_mapping_file).read())
+            vreg.info('using url mapping %s from %s', URL_MAPPING, url_mapping_file)