Fixed bugs on some GetInt/GetSmallInt proxy actions; fixed read_json …

…and read_rss context being inverted
Antaniserse · Nov 18, 2016 · c127d82 · c127d82
1 parent db5553c
commit c127d82
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 94 deletions.
diff --git a/VAExtensions/ContextHandlers/ContextFactory.vb b/VAExtensions/ContextHandlers/ContextFactory.vb
@@ -10,9 +10,9 @@
         <EnumInfo("Read an XML File", "read_xml")>
         ReadXml
         <EnumInfo("Read a RSS feed", "read_rss")>
-        ReadJSON
-        <EnumInfo("Read a JSON feed", "read_json")>
         ReadRSS
+        <EnumInfo("Read a JSON feed", "read_json")>
+        ReadJSON
         <EnumInfo("Loads a CSV file in memory", "load_csv")>
         LoadCSV
         <EnumInfo("Read a value from a previously loaded CSV file", "read_csv")>

diff --git a/VAExtensions/ContextHandlers/ContextHandlerCountdown.vb b/VAExtensions/ContextHandlers/ContextHandlerCountdown.vb
@@ -16,7 +16,7 @@
         For i = 0 To 9
             key = String.Format("{0}{1}", App.KEY_TIMER, i)
             If VAProxy.GetInt(key) IsNot Nothing Then
-                countDownList.Add(key, VAProxy.GetInt(key).Value)
+                countDownList.Add(key, VAProxy.GetInt(key))
             End If
         Next
 

diff --git a/VAExtensions/ContextHandlers/ContextHandlerRandom.vb b/VAExtensions/ContextHandlers/ContextHandlerRandom.vb
@@ -15,7 +15,7 @@
                     Return False
                 Else
                     Dim numberList As New List(Of Int32)
-                    For n As Int16 = VAProxy.GetInt(App.KEY_RANGEMIN).Value To VAProxy.GetInt(App.KEY_RANGEMAX).Value
+                    For n As Int16 = VAProxy.GetInt(App.KEY_RANGEMIN) To VAProxy.GetInt(App.KEY_RANGEMAX)
                         numberList.Add(n)
                     Next
                     numbers = numberList.OrderBy(Function(s) Guid.NewGuid()).ToArray

diff --git a/VAExtensions/ContextHandlers/ContextHandlerReadRSS.vb b/VAExtensions/ContextHandlers/ContextHandlerReadRSS.vb
@@ -17,10 +17,10 @@
             VAProxy.SetText(App.KEY_RESULT, String.Format("Unknown file name. Text variable '{0}' not set.", App.KEY_FILE))
             Return False
         End If
-        If VAProxy.GetSmallInt(App.KEY_INDEX) Is Nothing OrElse VAProxy.GetSmallInt(App.KEY_INDEX).Value < 1 Then
+        If VAProxy.GetSmallInt(App.KEY_INDEX) Is Nothing OrElse VAProxy.GetSmallInt(App.KEY_INDEX) < 1 Then
             elementCount = 1
         Else
-            elementCount = VAProxy.GetSmallInt(App.KEY_INDEX).Value
+            elementCount = VAProxy.GetSmallInt(App.KEY_INDEX)
         End If
         If VAProxy.GetText(App.KEY_REGEX) IsNot Nothing Then
             regexPattern = VAProxy.GetText(App.KEY_REGEX)
@@ -71,7 +71,7 @@
                     If i > elementCount Then Exit For
                 Next
                 VAProxy.SetText(App.KEY_RESULT, App.LimitResponse(result, regexPattern))
-                VAProxy.SetSmallInt(App.KEY_INDEX) = elementCount + 1S
+                VAProxy.SetSmallInt(App.KEY_INDEX, elementCount + 1S)
             Else
                 VAProxy.SetSmallInt(App.KEY_ERROR, ERR_ARGUMENTS)
                 VAProxy.SetText(App.KEY_RESULT, String.Format("Element not found: '{0}'", VAProxy.GetText(App.KEY_ARGUMENTS)))

diff --git a/VAExtensions/ContextHandlers/ContextHandlerReadXML.vb b/VAExtensions/ContextHandlers/ContextHandlerReadXML.vb
@@ -27,10 +27,10 @@
         Else
             elementPath = {}
         End If
-        If VAProxy.GetSmallInt(App.KEY_INDEX) Is Nothing OrElse VAProxy.GetSmallInt(App.KEY_INDEX).Value < 1 Then
+        If VAProxy.GetSmallInt(App.KEY_INDEX) Is Nothing OrElse VAProxy.GetSmallInt(App.KEY_INDEX) < 1 Then
             elementCount = 1
         Else
-            elementCount = VAProxy.GetSmallInt(App.KEY_INDEX).Value
+            elementCount = VAProxy.GetSmallInt(App.KEY_INDEX)
         End If
 
         Try

diff --git a/VAExtensions/Profiles/_test-Profile.html b/VAExtensions/Profiles/_test-Profile.html
diff --git a/VAExtensions/VAExtensions.vbproj b/VAExtensions/VAExtensions.vbproj
@@ -24,8 +24,7 @@
     <DocumentationFile>VAExtensions.xml</DocumentationFile>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DefineConstants>
-    </DefineConstants>
+    <DefineConstants>SHOW_DEBUG_UI=true</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>