add PB courses, change mount point syntax

diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index 6aa9138c72a0479ded10860acdd7fe1fd883d7f6..cf0e78e4989e52716612fb0649c8bf4206c3c1f2 100644 (file)
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -125,6 +125,18 @@
           <conference>
             <name>Procedure_penale_Cours</name>
           </conference>
+          <conference>
+            <name>Oral-Procedures_communautaires</name>
+          </conference>
+         <conference>
+            <name>Oral-Voies_d_ex</name>
+          </conference>
+          <conference>
+            <name>Oral-Comptabilite_privee</name>
+          </conference>
+          <conference>
+            <name>Oral-Finances_publiques</name>
+          </conference>
           <conference>
             <name>TEST</name>
           </conference>

diff --git a/station.py b/station.py
index 3d3a1f9223415f07a7975b0e750b4778bd1a2f97..c97161995e0f4798880b11d7335d4ec59a296e4d 100644 (file)
--- a/station.py
+++ b/station.py
@@ -99,9 +99,9 @@ class Station(Conference):
         self.description = [self.title, self.department, self.conference, self.session, self.professor, self.comment]
         self.server_name = [self.title, self.department, self.conference]
         self.ServerDescription = clean_string('-'.join(self.description))
-        self.ServerName = clean_string('-'.join(self.server_name))
-        self.mount_point = '-'.join([clean_string(self.title),  clean_string(self.department),  clean_string(self.conference)])
-        self.filename = clean_string('-'.join(self.description[1:])) + '-' + self.time_txt + '.' + self.format
+        self.ServerName = clean_string('_-_'.join(self.server_name))
+        self.mount_point = self.ServerName
+        self.filename = clean_string('_-_'.join(self.description[1:])) + '-' + self.time_txt + '.' + self.format
         self.output_dir = self.rec_dir + os.sep + self.date + os.sep + self.department
         self.file_dir = self.output_dir + os.sep + self.ServerName
         self.uid = os.getuid()