Commit 7104894c authored by Rinus Plasmeijer's avatar Rinus Plasmeijer
Browse files

bugje uit pulldown tgv update triplets aanpassing

parent c48078d5
......@@ -58,3 +58,8 @@ MyDir :: !ServerKind -> String // name of directory in which persistent
traceHtmlInput :: !ServerKind !(Maybe [(String, String)]) -> BodyTag // for debugging showing the information received from browser
globalFormName :== "CleanForm" // name of hidden Html form in which iData state information is stored
updateInpName :== "UD" // marks update information
globalInpName :== "GS" // marks global state information
selectorInpName :== "CS_" // marks constructor update
......@@ -58,20 +58,9 @@ globalstateform globalstate
] ""
]
globalFormName :: String
globalFormName =: "CleanForm"
updateInpName :: String
updateInpName =: "UD"
globalInpName :: String
globalInpName =: "GS"
selectorInpName :: String
selectorInpName =: "CS_"
isSelector name = name%(0,size selectorInpName - 1) == selectorInpName
getSelector name = name%(size selectorInpName,size name - 1)
getSelector name = decodeString (name%(size selectorInpName,size name - 1))
// Serializing Html states...
......@@ -186,20 +175,21 @@ where
# (thisexe,input) = mscan '\"' input // get rid of garbage
# input = skipping ['UD\"'] input
# (triplet, input) = mscan '=' input // should give triplet
// # (new, input) = mscan '-' input // should give triplet value <<< *** Bug for negative integers??? ***
# (found,index) = FindSubstr ['--'] input
# (new, input) = splitAt index input // should give triplet value
# (_,input) = mscan '=' input
# input = skipping ['\"GS\"'] input
# (found,index) = FindSubstr ['---'] input
# state = if found (take index input) ['']
= if (toString triplet == "")
# striplet = toString triplet
= if (striplet == "")
("clean", [], toString state)
(if (isSelector (toString triplet))
("clean", [(fromJust (parseString (decodeChars new)), "")], toString state)
("clean", [(fromJust (parseString (decodeChars triplet)) , toString new)], toString state))
(if (isSelector striplet)
("clean", [(fromJust` (decodeChars new) (parseString (decodeChars new)), "")], toString state)
("clean", [(fromJust` (decodeChars triplet) (parseString (decodeChars triplet)) , toString new)], toString state))
fromJust` _ (Just value) = value
fromJust` string Nothing = ("",0,UpdI 0)
ordertriplets [] accu = accu
ordertriplets [x=:((id,_,_),_):xs] accu
......
Version: 1.4
Global
Built: True
Target: Everything
Target: Web Applications
Exec: {Project}\ConfManager.exe
CodeGen
CheckStacks: False
......@@ -64,8 +64,8 @@ MainModule
LastModified: No 0 0 0 0 0 0
OtherModules
Module
Name: stateHandlingIData
Dir: {Project}
Name: StdCleanTypes
Dir: {Application}\Libraries\Dynamics\extension
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -77,24 +77,12 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 139
Y: 28
SizeX: 800
SizeY: 624
DclOpen: False
Icl
WindowPosition
X: 218
Y: 38
SizeX: 1009
SizeY: 624
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: stateHandling
Dir: {Project}
Name: _SystemDynamic
Dir: {Application}\Libraries\Dynamics\implementation\windows
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -106,24 +94,12 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 48
Y: 116
SizeX: 800
SizeY: 624
DclOpen: False
Icl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 624
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: confIData
Dir: {Project}
Name: StdOverloaded
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -135,24 +111,12 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 100
Y: 13
SizeX: 800
SizeY: 624
DclOpen: False
Icl
WindowPosition
X: 24
Y: 18
SizeX: 889
SizeY: 547
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: loginAdmin
Dir: {Project}
Name: StdEnv
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -164,18 +128,12 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 124
Y: 36
SizeX: 800
SizeY: 624
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: loginAdminIData
Dir: {Project}
Name: StdBool
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -187,24 +145,12 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 624
DclOpen: False
Icl
WindowPosition
X: 87
Y: 9
SizeX: 800
SizeY: 624
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlTask
Dir: {Application}\Libraries\htmlGEC
Name: StdInt
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -220,8 +166,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdArrow
Dir: {Application}\Libraries\GEC\GEC Implementation
Name: StdMisc
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -237,8 +183,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlArrow
Dir: {Application}\Libraries\htmlGEC
Name: StdChar
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -254,8 +200,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlRefFormlib
Dir: {Application}\Libraries\htmlGEC
Name: StdClass
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -267,24 +213,12 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 624
DclOpen: False
Icl
WindowPosition
X: 10
Y: 10
SizeX: 1027
SizeY: 624
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlExceptions
Dir: {Application}\Libraries\htmlGEC
Name: StdArray
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -300,8 +234,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlDatabase
Dir: {Application}\Libraries\htmlGEC
Name: _SystemArray
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -317,8 +251,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlFormlib
Dir: {Application}\Libraries\htmlGEC
Name: StdReal
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -334,8 +268,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: GenLexOrd
Dir: {Application}\Libraries\Generics
Name: StdString
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -351,8 +285,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: htmlButtons
Dir: {Application}\Libraries\htmlGEC
Name: StdFile
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -368,8 +302,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: httpSubServer
Dir: {Application}\Libraries\htmlGEC
Name: StdList
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -384,19 +318,9 @@ OtherModules
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
NeededObjFiles
ObjectFile: SUBSERVER.OBJ
ObjectFile: CFUNCLIB.OBJ
ObjectFile: REGERROR.OBJ
ObjectFile: REGSUB.OBJ
ObjectFile: REGEXP.OBJ
NeededLibraries
Library: WSOCK32.TXT
Library: USER32.TXT
Library: KERNEL32.TXT
Module
Name: StdStringChannels
Dir: {Application}\Libraries\Tcp
Name: StdEnum
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -412,8 +336,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdEventTCP
Dir: {Application}\Libraries\Tcp
Name: _SystemEnum
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -429,8 +353,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: ostcp
Dir: {Application}\Libraries\Tcp
Name: StdOrdList
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -445,14 +369,9 @@ OtherModules
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
NeededObjFiles
ObjectFile: cCrossCallTCP_121.obj
ObjectFile: cTCP_121.obj
NeededLibraries
Library: wsock_library
Module
Name: tcp_bytestreams
Dir: {Application}\Libraries\Tcp
Name: StdTuple
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -468,8 +387,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdTCPDef
Dir: {Application}\Libraries\Tcp
Name: StdCharList
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -485,8 +404,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdTCPChannels
Dir: {Application}\Libraries\Tcp
Name: StdFunc
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -502,8 +421,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: osfileselect
Dir: {Application}\Libraries\ObjectIO\OS Windows
Name: StdHtml
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -518,11 +437,9 @@ OtherModules
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
NeededObjFiles
ObjectFile: cCrossCallFileSelectors_121.
Module
Name: StdFileSelect
Dir: {Application}\Libraries\ObjectIO
Name: htmlSettings
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -534,12 +451,18 @@ OtherModules
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 624
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdPStClass
Dir: {Application}\Libraries\ObjectIO
Name: htmlHandler
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -555,8 +478,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: scheduler
Dir: {Application}\Libraries\ObjectIO
Name: htmlDataDef
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -572,8 +495,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: receiverevent
Dir: {Application}\Libraries\ObjectIO\OS Windows
Name: htmlStyleDef
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -589,8 +512,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: receiverdevice
Dir: {Application}\Libraries\ObjectIO
Name: PrintUtil
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -606,8 +529,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdReceiverAttribute
Dir: {Application}\Libraries\ObjectIO
Name: StdGeneric
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -623,8 +546,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: receiverdefaccess
Dir: {Application}\Libraries\ObjectIO
Name: Gerda
Dir: {Application}\Libraries\Gerda
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -640,8 +563,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: receiveraccess
Dir: {Application}\Libraries\ObjectIO
Name: StdMaybe
Dir: {Application}\Libraries\StdLib
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -657,8 +580,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: receiverid
Dir: {Application}\Libraries\ObjectIO
Name: odbc
Dir: {Application}\Libraries\Gerda
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -673,9 +596,11 @@ OtherModules
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
NeededLibraries
Library: odbc_library
Module
Name: StdReceiver
Dir: {Application}\Libraries\ObjectIO
Name: odbccp
Dir: {Application}\Libraries\Gerda
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -690,9 +615,11 @@ OtherModules
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
NeededLibraries
Library: odbccp_library
Module
Name: StdReceiverDef
Dir: {Application}\Libraries\ObjectIO
Name: StdDebug
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -708,8 +635,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: world
Dir: {Application}\Libraries\ObjectIO
Name: StdStrictLists
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -725,8 +652,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: osbeep
Dir: {Application}\Libraries\ObjectIO\OS Windows
Name: _SystemStrictLists
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -742,8 +669,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdProcessDef
Dir: {Application}\Libraries\ObjectIO
Name: _SystemEnumStrict
Dir: {Application}\Libraries\StdEnv
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -759,8 +686,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: StdProcessAttribute
Dir: {Application}\Libraries\ObjectIO
Name: ArgEnv
Dir: {Application}\Libraries\ArgEnvWindows
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -775,9 +702,11 @@ OtherModules
DclOpen: False
IclOpen: False
LastModified: No 0 0 0 0 0 0
NeededObjFiles
ObjectFile: ArgEnvC.
Module
Name: StdPSt
Dir: {Application}\Libraries\ObjectIO
Name: htmlStylelib
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -793,8 +722,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: osmouse
Dir: {Application}\Libraries\ObjectIO\OS Windows
Name: htmlFormData
Dir: {Application}\Libraries\htmlGEC
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -810,8 +739,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: roundrobin
Dir: {Application}\Libraries\ObjectIO
Name: GenEq
Dir: {Application}\Libraries\Generics
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
......@@ -827,8 +756,8 @@ OtherModules
IclOpen: False
LastModified: No 0 0 0 0 0 0
Module
Name: processstack
Dir: {Application}\Libraries\ObjectIO
Name: GenPrint
Dir: {Application}\Libraries\Generics
Compiler