Commit 706d042f authored by Rinus Plasmeijer's avatar Rinus Plasmeijer

*** empty log message ***


git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@67 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 77deda67
.comp 920 000110010
.start _nostart_
.depend "StdDynamic" "20061208183212"
.depend "_SystemEnum" "20061218140208"
.depend "StdEnum" "20061218140208"
.depend "StdMisc" "20061218140208"
......@@ -8,6 +9,7 @@
.depend "StdTuple" "20061218140208"
.depend "StdOrdList" "20061218140208"
.depend "StdList" "20061218140208"
.depend "StdClass" "20061218140208"
.depend "StdFile" "20061218140208"
.depend "StdString" "20061218140208"
.depend "_SystemArray" "20061218140208"
......@@ -15,19 +17,17 @@
.depend "StdChar" "20061218140208"
.depend "StdReal" "20061218140208"
.depend "StdInt" "20061218140208"
.depend "StdEnv" "20061218140208"
.depend "StdBool" "20061218140208"
.depend "StdClass" "20061218140208"
.depend "StdDynamic" "20061208183212"
.depend "StdEnv" "20061218140208"
.depend "StdOverloaded" "20061218140208"
.depend "_SystemDynamic" "20061208183212"
.depend "StdCleanTypes" "20061208183212"
.depend "dynamic_string" "20070709113944"
.depend "dynamic_string" "20070913164239"
.impobj "copy_graph_to_string_interface.obj"
.impobj "copy_graph_to_string.obj"
.impobj "copy_string_to_graph_interface.obj"
.impobj "copy_string_to_graph.obj"
.module m_dynamic_string "dynamic_string" "20070709114033"
.module m_dynamic_string "dynamic_string" "20070913164251"
.endinfo
.implab _cycle_in_spine
.implab _type_error
......
......@@ -91,7 +91,7 @@ return_VF :: return the value and show the Html code specified
return_D :: return the value and show it in iData display format
*/
(?>>) infix 5 :: ![BodyTag] !(Task a) -> Task a | iData a
(?>>) infix 5 :: ![BodyTag] !(Task a) -> Task a | iCreate a
(!>>) infix 5 :: ![BodyTag] !(Task a) -> Task a | iCreate a
(<|) infix 6 :: !(Task a) !(a -> (Bool, [BodyTag])) -> Task a | iCreate a
(<!) infix 6 :: !(Task a) !(a -> .Bool) -> Task a | iCreateAndPrint a
......
......@@ -541,8 +541,9 @@ where
| not activated || fst (pred a) = (a,{tst & html = ohtml +|+ nhtml})
= doTask {tst & html = ohtml +|+ BT (snd (pred a))}
(?>>) infix 5 :: ![BodyTag] !(Task a) -> (Task a) | iData a
//(?>>) infix 5 :: [BodyTag] (Task a) -> (Task a) | iCreate a
//(?>>) infix 5 :: ![BodyTag] !(Task a) -> (Task a) | iData a
//(?>>) infix 5 :: [BodyTag] !(Task a) -> (Task a) | iCreate a
(?>>) infix 5 :: ![BodyTag] !(Task a) -> Task a | iCreate a
(?>>) prompt task = doTask
where
doTask tst=:{html=ohtml,activated}
......@@ -1289,14 +1290,15 @@ deserializeThread :: .String -> .(Task .a)
deserializeThread thread = IF_Sapl (abort "Cannot de-serialize Server thread on Client\n") (fst (copy_from_string {c \\ c <-: thread} ))
serializeThreadClient :: !(Task a) -> String
serializeThreadClient task = IF_Ajax (IF_OnClient (IF_Sapl "Cannot (yet) serialize Client thread on Client\n" (graph_to_sapl_string task)) "") ""
//serializeThreadClient task = IF_Ajax (IF_OnClient (IF_Sapl "Cannot (yet) serialize Client thread on Client\n" (graph_to_sapl_string task)) "") ""
serializeThreadClient task = IF_Ajax (IF_OnClient (IF_Sapl (graph_to_sapl_string task) (graph_to_sapl_string task)) "") ""
deserializeThreadClient :: .String -> .(Task .a)
deserializeThreadClient thread = IF_Sapl (deserializeSapl thread) (abort "cannot de-serialize Client thread on Server\n")
deserializeSapl thread = string_to_graph thread
string_to_graph thread = abort "Cannot create Sapl graph while you are in Clean.\n"
//string_to_graph thread = abort "Cannot create Sapl graph while you are in Clean.\n"
// mkTaskThread creates a thread for an iTask
......@@ -1313,7 +1315,7 @@ mkTaskThread OnClient taska = IF_Ajax // only if Ajax & threads e
taska
mkTaskThread2 :: !Bool !(Task a) -> Task a // execute a thread
mkTaskThread2 onclient task = IF_Sapl task evalTask // XXX THREADS CANNOT BE CREATED ON CLIENT !!! XXX
mkTaskThread2 onclient task = /*IF_Sapl task */ evalTask // XXX THREADS CANNOT BE CREATED ON CLIENT !!! XXX
where
evalTask tst=:{tasknr,activated,options,userId} // thread - task is not yet finished
# (mbthread,tst) = findThreadInTable tasknr tst // look if there is an entry for this task
......
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