---
 test/send-message |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/test/send-message b/test/send-message
index 558fdaa..8522375 100755
--- a/test/send-message
+++ b/test/send-message
@@ -4,20 +4,23 @@ import sys
 import dbus
 import csv
 
-if (len(sys.argv) < 4):
+if (len(sys.argv) < 5):
        print "Usage: %s"\
                " <recipient>,..."\
+               "<delivery-report>"\
                " <smil-file-path>"\
                " <<content-id>,<content-type>,<file-path>>,..."\
                % (sys.argv[0])
        print "Sample(Related): %s"\
                " \"+33611111111,+33622222222\""\
+               " \"TRUE\""\
                " \"smil.txt\""\
                " \"cid-1,text/plain,text.txt\""\
                " \"cid-2,image/jpeg,image.jpg\""\
                % (sys.argv[0])
        print "Sample(Mixed): %s"\
                " \"+33611111111,+33622222222\""\
+               " \"FALSE\""\
                " \"\""\
                " \"cid-1,text/plain,text.txt\""\
                " \"cid-2,image/jpeg,image.jpg\""\
@@ -42,18 +45,22 @@ for r in reader:
        for i in r:
                recipients.append(dbus.String(i))
 
+if sys.argv[2].capitalize() == 'True':
+       delivery = True
+else:
+       delivery = False
 
-if sys.argv[2] == "":
+if sys.argv[3] == "":
        print "Send MMS as Mixed"
        smil = ""
 else:
        print "Send MMS as Related"
-       print "Smil path: %s" % (sys.argv[2])
-       file = open(sys.argv[2],"r")
+       print "Smil path: %s" % (sys.argv[3])
+       file = open(sys.argv[3],"r")
        smil = dbus.String(file.read())
 
 attachments = dbus.Array([],signature=dbus.Signature('(sss)'))
-for a in sys.argv[3:]:
+for a in sys.argv[4:]:
        print "Attachment: (%s)" % a
        reader = csv.reader([a])
        for r in reader:
@@ -62,6 +69,6 @@ for a in sys.argv[3:]:
                                                dbus.String(r[2])
                                                ), signature=None))
 
-path = service.SendMessage(recipients, smil, attachments)
+path = service.SendMessage(recipients, delivery, smil, attachments)
 
 print path
-- 
1.7.4.1

_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono

Reply via email to