change url render for web pages

diff --git a/etc/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
index a0a367d90e490bf67fd55c44c30035515464304a..82dd852fb4660ed13ec644b23cd17f61b5da0bdf 100644 (file)
--- a/etc/pre-barreau_conferences.xml
+++ b/etc/pre-barreau_conferences.xml
@@ -1,6 +1,6 @@
 <telecaster>
     <url>http://localhost</url>
-    <title>Pre-Barreau - Telecaster 1</title>
+    <title>Pre-Barreau</title>
     <port>8000</port>
     <format>mp3</format>
     

diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index b2b171644f9bcd9a20b6f3db4c232b3cbec486c1..b7f11832e55fe0500ee2ab1559d4f1393f567ee8 100644 (file)
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -1,9 +1,9 @@
 <telecaster>
     <infos>
-        <short_name>Pre-Barreau - ICP</short_name>
-        <name>Pre-Barreau - ICP</name>
+        <short_name>Pre-Barreau</short_name>
+        <name>Pre-Barreau</name>
         <description>La preparation au Barreau de Paris</description>
-        <url>http://pre-barreau.com</url>
+        <url>http://augustins.pre-barreau.com</url>
         <genre>Other</genre>
         <channels>1</channels>
     </infos>

diff --git a/telecaster.py b/telecaster.py
index 43732d8c2252a91d27eada3776a3622bf075d066..b38dad559b51abdf4af96f5d913ab043bc8e85a4 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -56,6 +56,7 @@ class TeleCaster:
         self.lock_file = self.root_dir + os.sep + self.conf['server']['lock_file']
         self.title = self.conf['infos']['name']
         self.uid = os.getuid()
+        self.url = self.conf['infos']['url']
 
     def main(self):
         odd_pid = get_pid('^oddcastv3\ -n', self.uid)
@@ -64,7 +65,7 @@ class TeleCaster:
         casting = False
         writing = rip_pid != []
         casting = odd_pid != []        
-        form = WebView(self.school_file, version)
+        form = WebView(self.school_file, self.url, version)
         
         if odd_pid == [] and form.has_key("action") and \
             form.has_key("department") and form.has_key("conference") and \

diff --git a/webview.py b/webview.py
index 65b552a6134699d5347c193bded17364fae5e7c2..2694023b41d1a45db8dc5d860760a8bc8c905631 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -38,7 +38,7 @@ cgitb.enable()
 class WebView(FieldStorage):
     """Gives the web CGI frontend"""
     
-    def __init__(self, school_file, version):
+    def __init__(self, school_file, url, version):
         FieldStorage.__init__(self)
         self.version = version
         self.conf = xml2dict(school_file)
@@ -53,7 +53,7 @@ class WebView(FieldStorage):
                 break
             except:
                 self.ip = 'localhost'
-        self.url = 'http://' + self.ip
+        self.url = url
         self.port = self.conf['port']
         self.acpi = acpi.Acpi()
         self.format = self.conf['format']