Commit abd060e1 authored by Rinus Plasmeijer's avatar Rinus Plasmeijer

*** empty log message ***


git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@84 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 2e7f3c0b
......@@ -64,7 +64,7 @@ doHtmlServer2 userpages world
doHtmlServer :: UserPage !*World -> *World
doHtmlServer userpage world
| ServerKind == Internal // link in the Clean http 1.0 server
= IF_Sapl
= IF_Client
( thd3 (doHtmlClient world userpage [("dontcare","")]) // on Client side calculate page using SAPL
)
......
......@@ -70,14 +70,14 @@ IF_Database db no_db :== no_db // otherwise, BUT also manually flag of ", gerd
//IF_DataFile df no_df :== df // If DataFile option is used
IF_DataFile df no_df :== no_df // otherwise, BUT also manually flag of ", read {|*|}, write {|*|}" in the iSpecialStore class definition above
IF_Ajax th no_th :== th // If you want to enable sub-page (thread) handling using "Ajax" technology
//IF_Ajax th no_th :== no_th // Otherwise
//IF_Ajax th no_th :== th // If you want to enable sub-page (thread) handling using "Ajax" technology
IF_Ajax th no_th :== no_th // Otherwise
IF_ClientServer th no_th :== th // If we have a client server architecture (Sapl running on the client)
//IF_ClientServer th no_th :== no_th // Otherwise
//IF_ClientServer th no_th :== th // If you want to have a client server architecture (with Sapl running on the client)
IF_ClientServer th no_th :== no_th // Otherwise
//IF_Sapl sp no_sp :== sp // If Sapl code for the client has to be generated
IF_Sapl sp no_sp :== no_sp // Otherwise
//IF_Client sp no_sp :== sp // If you want to generatecode for the Client (Sapl); IF_ClientServer should be set as well
IF_Client sp no_sp :== no_sp // If you want to generatecode for the Sever ; IF_ClientServer should be set as well
// Global Settings determining where files are stored
......
......@@ -6,7 +6,7 @@ import iDataHandler, ArgEnv, StdList, iDataTrivial, StdArray
// global names setting depending on kind of server used
ThisExe :: String
ThisExe = IF_Sapl "clean" myName
ThisExe = IF_Client "clean" myName
myName =: toString (reverse (takeWhile (\c -> (<>) c '\\') (drop 4 (reverse [x \\ x <-: getCommandLine.[0]]))))
......
......@@ -161,13 +161,13 @@ where
// read out file and store as string
findState` {id,lifespan = TxtFile,storage = PlainString} Leaf_ world
# (string,world) = IF_Sapl ("",world) (readState id world)
# (string,world) = IF_Client ("",world) (readState id world)
= case parseString string of
Just a = (True, Just a, Node_ Leaf_ (id,OldState {format = PlainStr string, life = TxtFile}) Leaf_,world)
Nothing = (False,Nothing,Leaf_,world)
findState` {id,lifespan = TxtFileRO,storage = PlainString} Leaf_ world
# (string,world) = IF_Sapl ("",world) (readState id world)
# (string,world) = IF_Client ("",world) (readState id world)
= case parseString string of
Just a = (True, Just a, Node_ Leaf_ (id,OldState {format = PlainStr string, life = TxtFileRO}) Leaf_,world)
Nothing = (False,Nothing,Leaf_,world)
......@@ -175,7 +175,7 @@ where
// read out file and store as dynamic
findState` {id,lifespan = TxtFile,storage = StaticDynamic} Leaf_ world
# (string,world) = IF_Sapl ("",world) (readState id world)
# (string,world) = IF_Client ("",world) (readState id world)
= case string of
"" = (False,Nothing,Leaf_,world)
_ = case string_to_dynamic` string of
......@@ -183,7 +183,7 @@ where
else = (False,Nothing, Leaf_,world)
findState` {id,lifespan = TxtFileRO,storage = StaticDynamic} Leaf_ world
# (string,world) = IF_Sapl ("",world) (readState id world)
# (string,world) = IF_Client ("",world) (readState id world)
= case string of
"" = (False,Nothing,Leaf_,world)
_ = case string_to_dynamic` string of
......@@ -350,7 +350,7 @@ where
StatDyn dynval = {nworld & datafile = writeDataFile sid (dynamic_to_string dynval) datafile} // write the dynamic as a string to the datafile
writeTxtFileState (sid,NewState {format,life = TxtFile}) nworld
= IF_Sapl nworld
= IF_Client nworld
( case format of
PlainStr string = writeState sid string nworld
StatDyn dynval = writeState sid (dynamic_to_string dynval) nworld)
......
......@@ -6,7 +6,7 @@ definition module iTasks
// (c) iTask & iData Concept and Implementation by Rinus Plasmeijer, 2006,2007 - MJP
// This library is still under construction - MJP
iTaskVersion :== "0.95 - September 2007"
iTaskVersion :== "0.96 - December 2007"
import iDataSettings, iDataButtons, StdBimap
derive gForm Void, TCl
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment