Adding missing changes to the extractor scripts.

diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy
index cf69fbb4f961a897e6d837730255d48699727c28..00b993d04ff9e2fb76d881995980be5bc37e351c 100644 (file)
--- a/Extractor/Extractor.groovy
+++ b/Extractor/Extractor.groovy
@@ -1016,8 +1016,11 @@ def input(LinkedHashMap metaData) {
                        def randomVariable = Math.abs(new Random().nextInt() % 2)
                        def modes = ["Yes", "No"]
                        //def userInput = modes[randomVariable]
-                       // TODO: We 
                        //def modes = metaData['options']
+                       if (metaData['options'] != null)
+                               modes = metaData['options']
+                       else // If it is not named 'options' then it is captured as 'metadata'
+                               modes = metaData['metadata']
                        def userInput = modes[0]
        
                        if (enumVariables == 0) {

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 11486bc7301702d1bc5b901f27af3cd275d015e6..50bc843c89b97bbdb600f79090cfe11efaeaf8d4 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -111,8 +111,7 @@ def AnalyzePhysicalInteraction(app1Capab, app2Capab):
 
 def ExtractEvents(extractedEvents):
        global eventMap
-       #extractedEvents.write("while(true) {\n")
-       extractedEvents.write("for(int i=0; i<100; i++) {\n")
+       extractedEvents.write("while(true) {\n")
        extractedEvents.write("\tdef eventNumber = Verify.getInt(0,%d)\n" % (len(eventMap) - 1))
        extractedEvents.write("\tswitch(eventNumber) {\n")
        for i in range(len(eventMap)):