This commit is contained in:
2023-11-06 19:54:13 -06:00
parent fd6d581422
commit 6489696bf3
5 changed files with 26 additions and 11 deletions

View File

@@ -4,7 +4,7 @@ ModulesStructureVersion=1
Type=Class
Version=6.8
@EndOfDesignText@
'Class module
''Class module
Sub Class_Globals
Private mTarget As Object
Type DBResult (Tag As Object, Columns As Map, Rows As List)
@@ -15,6 +15,8 @@ Sub Class_Globals
,T_DOUBLE = 6, T_BOOLEAN = 7, T_BLOB = 8 As Byte
Private VERSION As Float = 0.9
Private tempArray(1) As Object
Dim jobTagAnterior As String = "" 'Mod por CHV - 211109
Dim reqsList As List
End Sub
'Target - The module that handles JobDone (usually Me).
@@ -22,6 +24,7 @@ End Sub
Public Sub Initialize (Target As Object, ConnectorLink As String)
mTarget = Target
link = ConnectorLink
reqsList.Initialize
End Sub
'Sends a query request.
@@ -32,7 +35,8 @@ Public Sub ExecuteQuery(Command As DBCommand, Limit As Int, Tag As Object)
Dim j As HttpJob
Dim ms As OutputStream
Dim out2 As OutputStream = StartJob(j,ms, Tag)
If reqsList.IsInitialized Then reqsList.Add(Tag)
WriteObject(Command.Name, out2)
WriteInt(Limit, out2)
WriteList(Command.Parameters, out2)
@@ -58,6 +62,7 @@ End Sub
'Similar to ExecuteBatch. Sends a single command.
Public Sub ExecuteCommand(Command As DBCommand, Tag As Object)
If reqsList.IsInitialized Then reqsList.Add(Tag)
ExecuteBatch(Array As DBCommand(Command), Tag)
End Sub
@@ -112,7 +117,7 @@ Private Sub WriteObject(o As Object, out As OutputStream)
Else If GetType(tempArray(0)) = "[B" Then
data = o
out.WriteBytes(Array As Byte(T_BLOB), 0, 1)
WriteInt(data.Length, out)
WriteInt(data.Length, out)
Else 'If o Is String Then (treat all other values as string)
out.WriteBytes(Array As Byte(T_STRING), 0, 1)
data = bc.StringToBytes(o, "UTF8")
@@ -185,7 +190,7 @@ End Sub
'Handles the Job result and returns a DBResult.
Public Sub HandleJob(Job As HttpJob) As DBResult
Dim start As Long = DateTime.Now
Dim start As Long = DateTime.Now 'ignore
Dim In As InputStream = Job.GetInputStream
Dim cs As CompressedStreams
In = cs.WrapInputStream(In, "gzip")
@@ -196,6 +201,8 @@ Public Sub HandleJob(Job As HttpJob) As DBResult
table.Columns.Initialize
table.rows.Initialize
table.Tag = Job.Tag
If jobTagAnterior <> Job.Tag Then LogColor("HandleJob: '"&Job.Tag&"'", Colors.Blue) 'Mod por CHV - 211109
jobTagAnterior = Job.Tag 'Mod por CHV - 211109
If method = "query" Then
Dim numberOfColumns As Int = ReadInt(In)
For i = 0 To numberOfColumns - 1
@@ -217,7 +224,7 @@ Public Sub HandleJob(Job As HttpJob) As DBResult
Next
End If
In.Close
Log("HandleJob: " & (DateTime.Now - start))
' Log("HandleJob: " & (DateTime.Now - start))'Comentado por CHV - 211112
Return table
End Sub
'Reads a file and returns the file as a bytes array.

View File

@@ -181,7 +181,7 @@ Sub Activity_Create(FirstTime As Boolean)
skmt.Initialize(ruta,"kmt.db", True)
' server = "http://10.0.0.205:1782"
server = "http://keymon.lat:1782"
server = "http://keymon.lat:1781"
If FirstTime Then
' reqManager.Initialize(Me,"http://201.99.139.28:1782")

View File

@@ -64,6 +64,6 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=3,6,8,17,18,19
ModuleClosedNodes9=
NavigationStack=seleccion,inv_Click,1071,0,seleccion,e_ruta_EnterPressed,1042,0,seleccion,JobDone,679,0,seleccion,cargar_Click,484,0,seleccion,Subir_Click,436,0,seleccion,trabajar_Click,422,0,seleccion,Activity_Pause,418,0,seleccion,to_number_vb,410,0,seleccion,Activity_Resume,287,0,colonia,Activity_Create,33,0,Main,Activity_Create,81,0
NavigationStack=seleccion,to_number_vb,410,0,colonia,Activity_Create,33,0,Main,Activity_Create,70,0,Starter,pe_BatteryChanged,42,0,Starter,Service_Start,26,0,DBRequestManager,PrintTable,267,0,DBRequestManager,Class_Globals,11,0,seleccion,Activity_Resume,287,0,seleccion,cargar_Click,612,0,seleccion,JobDone,624,0
SelectedBuild=0
VisibleModules=18,21,10,9,12,8,4,14,11,2,5,7,15,16,17,20,19
VisibleModules=18,21,10,9,12,8,4,14,11,2,5,7,15,16,17,20,19,6

View File

@@ -46,7 +46,7 @@ End Sub
Sub pe_BatteryChanged (Level As Int, Scale As Int, Plugged As Boolean, Intent As Intent)
Main.batt=Level
Log(main.batt)
' Log(main.batt)
End Sub
Private Sub Timer1_Tick

View File

@@ -618,9 +618,17 @@ Sub cargar_Click
ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias" , True)
End Sub
Sub JobDone(Job As HttpJob)
If Job.Success = False Then
'ToastMessageShow("Error: " & Job.ErrorMessage, True)
If reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then
reqManager.reqsList.RemoveAt(reqManager.reqsList.IndexOf(Job.tag))
LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue)
End If
LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue)
End If
If Not(Job.Success) Then
LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red)
Else
LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green)
If Job.JobName = "DBRequest" Then
Dim RESULT As DBResult = reqManager.HandleJob(Job)
If RESULT.Tag = "kmt_datos" Then 'query tag