version 11.13

2 files changed, 35 insertions, 34 deletions

diff --git a/activity/activity.info b/activity/activity.info
index cfcbc40..ee2852d 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,5 +1,5 @@
 [Activity]
-#version = 11.12
+#version = 11.13
 name = Learn
 service_name = org.olerwanda.Learn
 icon = activity-learn
diff --git a/cgi-bin/saveFile.py b/cgi-bin/saveFile.py
index 5238278..33a2a9f 100755
--- a/cgi-bin/saveFile.py
+++ b/cgi-bin/saveFile.py
@@ -223,52 +223,53 @@ for screen in screens:
         opt = opt + '    title: "Opportunity",}\n'
         quiztxtout = quiztxtout + opt
     if nscreen > 0:
+        print >> log, 'write a*.txt','nscreen',nscreen
         apth = fpth / 'a' + str(nscreen) + '.txt'
-        nscreen += 1
+        nscreen += 1;
     else:
         apth = fpth / 'a.txt'
     fout = open(apth, 'w')
     fout.write(screen)
     fout.close()
-    print >> log, 'rewrite lesson.js'
-    #rewrite lesson.js
-    if nscreen < 1:
-        lessontxt = "function initialize(karma){\n"
+print >> log, 'rewrite lesson.js'
+#rewrite lesson.js
+if nscreen < 1:
+    lessontxt = "function initialize(karma){\n"
+    for image in imagelist:
+        lessontxt = lessontxt + generate_image(imagelist)
+    lessontxt = lessontxt + "   $('<div id = " + '"txtMain"/>' + "')\n"
+    lessontxt = lessontxt + "       .load('http://localhost:8008/cgi-bin/getFile.py',\n"
+    lessontxt = lessontxt + "       {'filename':'" + fpth + "/a.txt'})\n"
+    lessontxt = lessontxt + "       .appendTo('#content')\n};\n\n"
+    for audio in audiolist:
+        lessontxt = lessontxt + generate_audio(audiolist)
+    lessontxt = lessontxt + "function startGame(karma) {\n"
+    if len(quiztxt) > 0:
+        lessontxt = lessontxt + "    $('#quizArea')\n"
+        lessontxt = lessontxt + "        .appendTo('#content')\n"
+        lessontxt = lessontxt + "        .jQuizMe(quiz, options)\n" 
+    lessontxt = lessontxt + "};\n"
+    lessontxt = lessontxt + "setUpLesson(initialize, startGame);\n"
+else:
+    lessontxt = "var currentScreen;\n\n"
+    for s in range(len(screens)):
+        screen = screens[s]
+        lessontxt = lessontxt + "function generateScreen" + str(s+1) + "(karma) {\n"
+        lessontxt = lessontxt + "currentScreen = " + str(s+1) + '\n'
         for image in imagelist:
             lessontxt = lessontxt + generate_image(imagelist)
         lessontxt = lessontxt + "   $('<div id = " + '"txtMain"/>' + "')\n"
         lessontxt = lessontxt + "       .load('http://localhost:8008/cgi-bin/getFile.py',\n"
-        lessontxt = lessontxt + "       {'filename':'" + fpth + "/a.txt'})\n"
+        lessontxt = lessontxt + "       {'filename':'" + fpth + "/a" + str(s+1) + ".txt'})\n"
         lessontxt = lessontxt + "       .appendTo('#content')\n};\n\n"
         for audio in audiolist:
             lessontxt = lessontxt + generate_audio(audiolist)
-        lessontxt = lessontxt + "function startGame(karma) {\n"
-        if len(quiztxt) > 0:
-            lessontxt = lessontxt + "    $('#quizArea')\n"
-            lessontxt = lessontxt + "        .appendTo('#content')\n"
-            lessontxt = lessontxt + "        .jQuizMe(quiz, options)\n" 
-        lessontxt = lessontxt + "};\n"
-        lessontxt = lessontxt + "setUpLesson(initialize, startGame);\n"
-    else:
-        lessontxt = "var currentScreen;\n\n"
-        for s in range(len(screens)):
-            screen = screens[s]
-            lessontxt = lessontxt + "function generateScreen" + str(s+1) + "(karma) {\n"
-            lessontxt = lessontxt + "currentScreen = " + str(s+1) + '\n'
-            for image in imagelist:
-                lessontxt = lessontxt + generate_image(imagelist)
-            lessontxt = lessontxt + "   $('<div id = " + '"txtMain"/>' + "')\n"
-            lessontxt = lessontxt + "       .load('http://localhost:8008/cgi-bin/getFile.py',\n"
-            lessontxt = lessontxt + "       {'filename':'" + fpth + "/a" + str(s+1) + ".txt'})\n"
-            lessontxt = lessontxt + "       .appendTo('#content')\n};\n\n"
-            for audio in audiolist:
-                lessontxt = lessontxt + generate_audio(audiolist)
-        lessontxt = lessontxt + "function initialize() {};\n"
-        lessontxt = lessontxt + "function start_game(karma){\n};\n\n"
-        lessontxt = lessontxt + "setUpMultiScreenLesson([\n"
-        for s in range(len(screens)):
-            lessontxt = lessontxt + "    generateScreen" + str(s+1) + ",\n"
-        lessontxt = lessontxt + "]);\n"
+    lessontxt = lessontxt + "function initialize() {};\n"
+    lessontxt = lessontxt + "function start_game(karma){\n};\n\n"
+    lessontxt = lessontxt + "setUpMultiScreenLesson([\n"
+    for s in range(len(screens)):
+        lessontxt = lessontxt + "    generateScreen" + str(s+1) + ",\n"
+    lessontxt = lessontxt + "]);\n"
 lpth = fpth / 'js' / 'lesson.js'
 fout = open(lpth, 'w')
 fout.write(lessontxt)