add patches bei Wolfgang Ocker

git-svn-id: file:///home/lennart/svn/public/ivam2/trunk@61 dbf6933d-3bce-0310-9bcc-ed052ba35b35

3 files changed, 20 insertions, 6 deletions

diff --git a/clients/ivam-autobox b/clients/ivam-autobox
index 800953e..fbe5e10 100755
--- a/clients/ivam-autobox
+++ b/clients/ivam-autobox
@@ -25,12 +25,12 @@ from ivamUtil import getContents, setContents
 import ivamCore, ivamVoiceBox
 
 def usage():
-    log("%s [--record-time=SECS] [--pin=PIN] [--pin-file=PINFILE] [--default-record-time=SECS] [--default-pin=PIN] [--default-pin-file=PINFILE] [--record-only] [--no-record] [--debug] [--notify-script=PATH] [--email=EMAIL] [DIRECTORY]" % sys.argv[0])
+    log("%s [--record-time=SECS] [--welcome-message=MESSAGE] [--pin=PIN] [--pin-file=PINFILE] [--default-record-time=SECS] [--default-pin=PIN] [--default-pin-file=PINFILE] [--record-only] [--no-record] [--debug] [--notify-script=PATH] [--email=EMAIL] [DIRECTORY]" % sys.argv[0])
 
 def parseArgs(vb, argv):
 
     try:
-        opts, args = getopt.getopt(argv[1:], "dh", ["help", "record-time=", "pin=", "pin-file=", "default-record-time=", "default-pin=", "default-pin-file=", "debug", "record-only", "no-record", "email=", "notify-script="])
+        opts, args = getopt.getopt(argv[1:], "dh", ["help", "record-time=", "welcome-message=", "pin=", "pin-file=", "default-record-time=", "default-pin=", "default-pin-file=", "debug", "record-only", "no-record", "email=", "notify-script="])
     except getopt.GetoptError:
         usage()
         sys.exit(1)
@@ -86,7 +86,10 @@ def parseArgs(vb, argv):
             
         elif o in ("--pin",):
             vb.setPin(a)
-            
+
+        elif o in ("--welcome-message",):
+            vb.setWelcomeMessage(a)
+ 
         elif o in ("--pin-file",):
             vb.setPin(getContents(a))
 
diff --git a/clients/ivam-voicebox b/clients/ivam-voicebox
index 88b6778..02e5b33 100755
--- a/clients/ivam-voicebox
+++ b/clients/ivam-voicebox
@@ -25,12 +25,12 @@ from ivamUtil import getContents, setContents
 import ivamCore, ivamVoiceBox
 
 def usage():
-    log("%s [--record-time=SECS] [--pin=PIN] [--pin-file=PINFILE] [--message-program=BINARY] [--debug] [--record-only] [--no-record] DIRECTORY" % sys.argv[0])
+    log("%s [--record-time=SECS] [--welcome-message=MESSAGE] [--pin=PIN] [--pin-file=PINFILE] [--message-program=BINARY] [--debug] [--record-only] [--no-record] DIRECTORY" % sys.argv[0])
 
 def parseArgs(vb, argv):
 
     try:
-        opts, args = getopt.getopt(argv[1:], "hd", ["help", "record-time=", "pin=", "pin-file=", "debug", "message-program=", "record-only", "no-record"])
+        opts, args = getopt.getopt(argv[1:], "hd", ["help", "record-time=", "welcome-message=", "pin=", "pin-file=", "debug", "message-program=", "record-only", "no-record"])
     except getopt.GetoptError:
         usage()
         sys.exit(1)
@@ -54,6 +54,9 @@ def parseArgs(vb, argv):
         elif o in ("--record-time",):
             vb.recordTime = int(a)
             
+        elif o in ("--welcome-message",):
+            vb.setWelcomeMessage(a)
+ 
         elif o in ("--pin",):
             vb.setPin(a)
             
diff --git a/clients/ivamVoiceBox.py b/clients/ivamVoiceBox.py
index 68eff9c..e358e7b 100644
--- a/clients/ivamVoiceBox.py
+++ b/clients/ivamVoiceBox.py
@@ -32,6 +32,7 @@ class VoiceBox(ivamApi.Processor):
     fileSuffix = ".ulaw.gz"
     recordOnly = False
     noRecord = False
+    welcomeMessage = "welcome"
 
     def getClip(self, s):
         return "%s/%s%s" % (self.directory, s, self.fileSuffix)
@@ -48,7 +49,7 @@ class VoiceBox(ivamApi.Processor):
             self.authNow(c)
         else:
             self.currentState = self.STATE_WELCOME
-            c.playClip(self.getClip("welcome"))
+            c.playClip(self.getClip(self.welcomeMessage))
 
     def loginComplete(self, c):
         self.messages = self.getMessageNames()
@@ -267,6 +268,13 @@ class VoiceBox(ivamApi.Processor):
 
         return "%s/%010u:%s:%s%s" % (self.messageDirectory, time.time(), self.ringNumber, self.callerNumber, self.fileSuffix)
 
+    def setWelcomeMessage(self, welcomeMessage):
+
+        if ivamCore.DEBUG:
+            ivamCore.log("setWelcomeMessage('%s')" % welcomeMessage)
+        
+        self.welcomeMessage = welcomeMessage
+
     def setPin(self, pin):
 
         if ivamCore.DEBUG: