src/Tools/isac/xmlsrc/interface-xml.sml
branchisac-update-Isa09-2
changeset 37941 ba7a01dc08d6
parent 37906 e2b23ba9df13
child 38015 67ba02dffacc
     1.1 --- a/src/Tools/isac/xmlsrc/interface-xml.sml	Mon Aug 23 11:05:54 2010 +0200
     1.2 +++ b/src/Tools/isac/xmlsrc/interface-xml.sml	Mon Aug 23 11:12:59 2010 +0200
     1.3 @@ -25,154 +25,154 @@
     1.4  (** add and delete users -----------------------------------------------
     1.5   FIXXME.8.03 addUser: clear code, because only CalcTrees distinguished**)
     1.6  fun adduserOK2xml (cI:calcID) (uI:iterID) = 
     1.7 -    writeln ("@@@@@begin@@@@@\n "^string_of_int uI^" \n\
     1.8 -	     \<ADDUSER>\n\
     1.9 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
    1.10 -	     \  <USERID> "^string_of_int uI^" </USERID>\n\
    1.11 -	     \</ADDUSER>\n\
    1.12 -	     \@@@@@end@@@@@");
    1.13 +    writeln ("@@@@@begin@@@@@\n "^string_of_int uI^" \n" ^
    1.14 +	     "<ADDUSER>\n" ^
    1.15 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.16 +	     "  <USERID> "^string_of_int uI^" </USERID>\n" ^
    1.17 +	     "</ADDUSER>\n" ^
    1.18 +	     "@@@@@end@@@@@");
    1.19  fun deluserOK2xml (cI:calcID) (uI:iterID) = 
    1.20 -    writeln ("@@@@@begin@@@@@\n "^string_of_int uI^" \n\
    1.21 -	     \<DELUSER>\n\
    1.22 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
    1.23 -	     \  <USERID> "^string_of_int uI^" </USERID>\n\
    1.24 -	     \</DELUSER>\n\
    1.25 -	     \@@@@@end@@@@@");
    1.26 +    writeln ("@@@@@begin@@@@@\n "^string_of_int uI^" \n" ^
    1.27 +	     "<DELUSER>\n" ^
    1.28 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.29 +	     "  <USERID> "^string_of_int uI^" </USERID>\n" ^
    1.30 +	     "</DELUSER>\n" ^
    1.31 +	     "@@@@@end@@@@@");
    1.32  (*---------------------------------------------------------------------*)
    1.33  
    1.34  fun calctreeOK2xml (*uI:iterID*) (cI:calcID) = 
    1.35 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
    1.36 -	     \<CALCTREE>\n\
    1.37 -	     \   <CALCID> "^string_of_int cI^" </CALCID>\n\
    1.38 -	     \</CALCTREE>\n\
    1.39 -	     \@@@@@end@@@@@");
    1.40 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
    1.41 +	     "<CALCTREE>\n" ^
    1.42 +	     "   <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.43 +	     "</CALCTREE>\n" ^
    1.44 +	     "@@@@@end@@@@@");
    1.45  fun deconstructcalctreeOK2xml (*uI:userID*) (cI:calcID) = 
    1.46 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
    1.47 -	     \<DELCALC>\n\
    1.48 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
    1.49 -	     \</DELCALC>\n\
    1.50 -	     \@@@@@end@@@@@");
    1.51 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
    1.52 +	     "<DELCALC>\n" ^
    1.53 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.54 +	     "</DELCALC>\n" ^
    1.55 +	     "@@@@@end@@@@@");
    1.56  
    1.57  fun iteratorOK2xml (cI:calcID) (p:pos')= 
    1.58 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
    1.59 -	     \<CALCITERATOR>\n\
    1.60 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.61 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
    1.62 +	     "<CALCITERATOR>\n" ^
    1.63 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.64  	     pos'2xml i ("POSITION", p) ^
    1.65 -	     "</CALCITERATOR>\n\
    1.66 -	     \@@@@@end@@@@@");
    1.67 +	     "</CALCITERATOR>\n" ^
    1.68 +	     "@@@@@end@@@@@");
    1.69  fun iteratorERROR2xml (cI:calcID) = 
    1.70 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
    1.71 -	     \<CALCITERATOR>\n\
    1.72 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
    1.73 -	     \  <ERROR> pos does not exist </ERROR>\n\
    1.74 -	     \</CALCITERATOR>\n\
    1.75 -	     \@@@@@end@@@@@");
    1.76 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
    1.77 +	     "<CALCITERATOR>\n" ^
    1.78 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.79 +	     "  <ERROR> pos does not exist </ERROR>\n" ^
    1.80 +	     "</CALCITERATOR>\n" ^
    1.81 +	     "@@@@@end@@@@@");
    1.82  
    1.83  fun sysERROR2xml (cI:calcID) "" = 
    1.84 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
    1.85 -	     \<SYSERROR>\n\
    1.86 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
    1.87 -	     \  <ERROR> in kernel </ERROR>\n\
    1.88 -	     \</SYSERROR>\n\
    1.89 -	     \@@@@@end@@@@@")
    1.90 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
    1.91 +	     "<SYSERROR>\n" ^
    1.92 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
    1.93 +	     "  <ERROR> in kernel </ERROR>\n" ^
    1.94 +	     "</SYSERROR>\n" ^
    1.95 +	     "@@@@@end@@@@@")
    1.96    | sysERROR2xml (cI:calcID) str = 
    1.97 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
    1.98 -	     \<SYSERROR>\n\
    1.99 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.100 -	     \  <ERROR> "^str^" </ERROR>\n\
   1.101 -	     \</SYSERROR>\n\
   1.102 -	     \@@@@@end@@@@@");
   1.103 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.104 +	     "<SYSERROR>\n" ^
   1.105 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.106 +	     "  <ERROR> "^str^" </ERROR>\n" ^
   1.107 +	     "</SYSERROR>\n" ^
   1.108 +	     "@@@@@end@@@@@");
   1.109  
   1.110  fun refformulaOK2xml (cI:calcID) p (Form t) = 
   1.111 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.112 -	     \<REFFORMULA>\n\
   1.113 -             \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.114 -	     \  <CALCFORMULA>\n"^
   1.115 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.116 +	     "<REFFORMULA>\n" ^
   1.117 +             "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.118 +	     "  <CALCFORMULA>\n"^
   1.119  	     pos'2xml (2*i) ("POSITION", p) ^
   1.120 -	     "    <FORMULA>"^
   1.121 -	     term2xml (2*i) t ^"\n"^
   1.122 -	     "    </FORMULA>\n\ 
   1.123 -	     \  </CALCFORMULA>\n\ 
   1.124 -	     \</REFFORMULA>\n\ 
   1.125 -	     \@@@@@end@@@@@") 
   1.126 +	     "    <FORMULA>" ^
   1.127 +	     term2xml (2*i) t ^ "\n" ^
   1.128 +	     "    </FORMULA>\n" ^
   1.129 +	     "  </CALCFORMULA>\n" ^
   1.130 +	     "</REFFORMULA>\n" ^
   1.131 +	     "@@@@@end@@@@@") 
   1.132    | refformulaOK2xml (cI:calcID) p (ModSpec modspec) =
   1.133 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.134 -	     \<REFFORMULA>\n\
   1.135 -             \  <CALCID> "^string_of_int cI^" </CALCID>\n"^
   1.136 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.137 +	     "<REFFORMULA>\n" ^
   1.138 +             "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.139  	     pos'calchead2xml i (p, modspec)^ 
   1.140 -	     "</REFFORMULA>\n\ 
   1.141 -	     \@@@@@end@@@@@"); 
   1.142 +	     "</REFFORMULA>\n" ^
   1.143 +	     "@@@@@end@@@@@"); 
   1.144  
   1.145  fun refformulaERROR2xml (cI:calcID) = (*FIXME.WN.29.8.03 unused*)
   1.146 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.147 -	     \<REFFORMULA>\n\
   1.148 -	     \   <ERROR> object is not a formula </ERROR>\n\
   1.149 -	     \</REFFORMULA>\n\
   1.150 -	     \@@@@@end@@@@@");
   1.151 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.152 +	     "<REFFORMULA>\n" ^
   1.153 +	     "   <ERROR> object is not a formula </ERROR>\n" ^
   1.154 +	     "</REFFORMULA>\n" ^
   1.155 +	     "@@@@@end@@@@@");
   1.156  
   1.157  (* val (cI, tac) = (cI, ta);
   1.158     *)
   1.159  fun gettacticOK2xml (cI:calcID) tac = 
   1.160 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.161 -	     \<GETTACTIC>\n\
   1.162 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n"^
   1.163 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.164 +	     "<GETTACTIC>\n" ^
   1.165 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n"^
   1.166  	     tac2xml i tac^
   1.167 -	     "</GETTACTIC>\n\
   1.168 -	     \@@@@@end@@@@@");
   1.169 +	     "</GETTACTIC>\n" ^
   1.170 +	     "@@@@@end@@@@@");
   1.171  fun gettacticERROR2xml (cI:calcID) str = 
   1.172 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.173 -	     \<GETTACTIC>\n\
   1.174 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.175 -	     \  <ERROR> "^str^" </ERROR>\n\
   1.176 -	     \</GETTACTIC>\n\
   1.177 -	     \@@@@@end@@@@@");
   1.178 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.179 +	     "<GETTACTIC>\n" ^
   1.180 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.181 +	     "  <ERROR> "^str^" </ERROR>\n" ^
   1.182 +	     "</GETTACTIC>\n" ^
   1.183 +	     "@@@@@end@@@@@");
   1.184  
   1.185  fun applicabletacticsOK cI tacs =
   1.186 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.187 -	     \<APPLICABLETACTICS>\n\
   1.188 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.189 -	     \  <TACLIST>\n"^
   1.190 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.191 +	     "<APPLICABLETACTICS>\n" ^
   1.192 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.193 +	     "  <TACLIST>\n"^
   1.194  	     tacs2xml (2*i) tacs^
   1.195 -	     "  </TACLIST>\n\
   1.196 -	     \</APPLICABLETACTICS>\n\
   1.197 -	     \@@@@@end@@@@@");
   1.198 +	     "  </TACLIST>\n" ^
   1.199 +	     "</APPLICABLETACTICS>\n" ^
   1.200 +	     "@@@@@end@@@@@");
   1.201  
   1.202  fun getasmsOK2xml (cI:calcID) terms = 
   1.203 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.204 -	     \<GETASSUMPTIONS>\n\
   1.205 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.206 -	     \  <ASMLIST>\n"^
   1.207 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.208 +	     "<GETASSUMPTIONS>\n" ^
   1.209 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.210 +	     "  <ASMLIST>\n"^
   1.211  	     formulae2xml (i+i) terms ^
   1.212 -	     "  </ASMLIST>\n\
   1.213 -	     \</GETASSUMPTIONS>\n\
   1.214 -	     \@@@@@end@@@@@");
   1.215 +	     "  </ASMLIST>\n" ^
   1.216 +	     "</GETASSUMPTIONS>\n" ^
   1.217 +	     "@@@@@end@@@@@");
   1.218  (* getasmsOK2xml 333 [str2term "1+1=2", str2term "1+1+1=3"];
   1.219     *)
   1.220  
   1.221  (*WN0502 @see ME/ctree: type asms: illdesigned, thus not used*)
   1.222  fun getaccuasmsOK2xml cI asms =
   1.223 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.224 -	     \<GETACCUMULATEDASMS>\n\
   1.225 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.226 -	     \  <ASMLIST>\n"^
   1.227 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.228 +	     "<GETACCUMULATEDASMS>\n" ^
   1.229 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.230 +	     "  <ASMLIST>\n"^
   1.231  	     formulae2xml (i+i) asms^
   1.232 -	     "  </ASMLIST>\n\
   1.233 -	     \</GETACCUMULATEDASMS>\n\
   1.234 -	     \@@@@@end@@@@@");
   1.235 +	     "  </ASMLIST>\n" ^
   1.236 +	     "</GETACCUMULATEDASMS>\n" ^
   1.237 +	     "@@@@@end@@@@@");
   1.238  (* getaccuasmsOK2xml 333 [(([1],Res), str2term "1+1=2"),
   1.239  			  (([2],Res), str2term "1+1+1=3")];
   1.240     getaccuasmsOK2xml 333 [str2term "1+1=2", str2term "1+1+1=3"];
   1.241     *)
   1.242  
   1.243  fun getintervalOK (cI:calcID) fs = 
   1.244 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.245 -	     \<GETELEMENTSFROMTO>\n\
   1.246 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.247 -	     \  <FORMHEADS>\n"^	     
   1.248 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.249 +	     "<GETELEMENTSFROMTO>\n" ^
   1.250 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.251 +	     "  <FORMHEADS>\n"^	     
   1.252  	     posterms2xml (2*i) fs^
   1.253 -	     "  </FORMHEADS>\n\	     
   1.254 -	     \</GETELEMENTSFROMTO>\n\
   1.255 -	     \@@@@@end@@@@@");
   1.256 +	     "  </FORMHEADS>\n" ^	     
   1.257 +	     "</GETELEMENTSFROMTO>\n" ^
   1.258 +	     "@@@@@end@@@@@");
   1.259  
   1.260  
   1.261  fun matchpbl2xml (cI:calcID) (model_ok, pI, hdl, pbl, pre) =
   1.262 @@ -186,8 +186,8 @@
   1.263  	     term2xml i hdl ^ "\n" ^
   1.264  	     "  </HEAD>\n" ^
   1.265  	     model2xml i pbl pre ^
   1.266 -	     "</CONTEXTPBL>\n\
   1.267 -	     \@@@@@end@@@@@");
   1.268 +	     "</CONTEXTPBL>\n" ^
   1.269 +	     "@@@@@end@@@@@");
   1.270  
   1.271  fun matchmet2xml (cI:calcID) (model_ok, pI, scr, pbl, pre) =
   1.272      writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.273 @@ -198,145 +198,145 @@
   1.274  			     else "incorrect") ^ " </STATUS>\n" ^
   1.275  	     scr2xml i scr ^
   1.276  	     model2xml i pbl pre ^
   1.277 -	     "</CONTEXTMET>\n\
   1.278 -	     \@@@@@end@@@@@");
   1.279 +	     "</CONTEXTMET>\n" ^
   1.280 +	     "@@@@@end@@@@@");
   1.281  
   1.282  
   1.283  fun tryrefineOK2xml (cI:calcID) (ModSpec modspec) =
   1.284 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.285 -	     \<TRYREFINE>\n\
   1.286 -             \  <CALCID> "^string_of_int cI^" </CALCID>\n"^
   1.287 -	     modspec2xml i modspec^ 
   1.288 -	     "</TRYREFINE>\n\ 
   1.289 -	     \@@@@@end@@@@@"); 
   1.290 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.291 +	     "<TRYREFINE>\n" ^
   1.292 +             "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.293 +	     modspec2xml i modspec ^
   1.294 +	     "</TRYREFINE>\n" ^
   1.295 +	     "@@@@@end@@@@@"); 
   1.296  
   1.297  fun appendformulaOK2xml (cI:calcID) (old:pos') (del:pos') (new:pos') =
   1.298 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.299 -	     \<APPENDFORMULA>\n\
   1.300 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.301 -	     \  <CALCCHANGED>\n" ^
   1.302 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.303 +	     "<APPENDFORMULA>\n" ^
   1.304 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.305 +	     "  <CALCCHANGED>\n" ^
   1.306  	     pos'2xml (2*i) ("UNCHANGED", old) ^ 
   1.307  	     pos'2xml (2*i) ("DELETED", del) ^ 
   1.308  	     pos'2xml (2*i) ("GENERATED", new) ^ 
   1.309 -	     "  </CALCCHANGED>\n\
   1.310 -	     \</APPENDFORMULA>\n\
   1.311 -	     \@@@@@end@@@@@");
   1.312 +	     "  </CALCCHANGED>\n" ^
   1.313 +	     "</APPENDFORMULA>\n" ^
   1.314 +	     "@@@@@end@@@@@");
   1.315  (* appendformulaOK2xml 1 ([2],Frm) ([3],Pbl) ([4],Res);
   1.316     *)
   1.317  fun appendformulaERROR2xml (cI:calcID) msg =
   1.318 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.319 -	     \<CALCMESSAGE> "^ msg ^" </CALCMESSAGE>\n\
   1.320 -	     \@@@@@end@@@@@");
   1.321 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.322 +	     "<CALCMESSAGE> "^ msg ^" </CALCMESSAGE>\n" ^
   1.323 +	     "@@@@@end@@@@@");
   1.324  
   1.325  fun replaceformulaOK2xml (cI:calcID) (old:pos') (del:pos') (new:pos') =
   1.326 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.327 -	     \<REPLACEFORMULA>\n\
   1.328 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.329 -	     \  <CALCCHANGED>\n" ^
   1.330 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.331 +	     "<REPLACEFORMULA>\n" ^
   1.332 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.333 +	     "  <CALCCHANGED>\n" ^
   1.334  	     pos'2xml (2*i) ("UNCHANGED", old) ^ 
   1.335  	     pos'2xml (2*i) ("DELETED", del) ^ 
   1.336  	     pos'2xml (2*i) ("GENERATED", new) ^ 
   1.337 -	     "  </CALCCHANGED>\n\
   1.338 -	     \</REPLACEFORMULA>\n\
   1.339 -	     \@@@@@end@@@@@");
   1.340 +	     "  </CALCCHANGED>\n" ^
   1.341 +	     "</REPLACEFORMULA>\n" ^
   1.342 +	     "@@@@@end@@@@@");
   1.343  fun replaceformulaERROR2xml (cI:calcID) msg =
   1.344 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.345 -	     \<CALCMESSAGE> "^ msg ^" </CALCMESSAGE>\n\
   1.346 -	     \@@@@@end@@@@@");
   1.347 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.348 +	     "<CALCMESSAGE> "^ msg ^" </CALCMESSAGE>\n" ^
   1.349 +	     "@@@@@end@@@@@");
   1.350  
   1.351  fun message2xml (cI:calcID) e = 
   1.352 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.353 -	     \<MESSAGE>\n\
   1.354 -	     \   <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.355 -	     \   <STRING> "^e^" </STRING>\n\
   1.356 -	     \</MESSAGE>\n\
   1.357 -	     \@@@@@end@@@@@");
   1.358 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.359 +	     "<MESSAGE>\n" ^
   1.360 +	     "   <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.361 +	     "   <STRING> "^e^" </STRING>\n" ^
   1.362 +	     "</MESSAGE>\n" ^
   1.363 +	     "@@@@@end@@@@@");
   1.364  
   1.365  fun setnexttactic2xml (*uI:iterID*) (cI:calcID) e = 
   1.366 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.367 -	     \<SETNEXTTACTIC>\n\
   1.368 -	     \   <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.369 -	     \   <MESSAGE> "^e^" </MESSAGE>\n\
   1.370 -	     \</SETNEXTTACTIC>\n\
   1.371 -	     \@@@@@end@@@@@");
   1.372 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.373 +	     "<SETNEXTTACTIC>\n" ^
   1.374 +	     "   <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.375 +	     "   <MESSAGE> "^e^" </MESSAGE>\n" ^
   1.376 +	     "</SETNEXTTACTIC>\n" ^
   1.377 +	     "@@@@@end@@@@@");
   1.378  
   1.379  fun fetchproposedtacticOK2xml (*uI:userID*) (cI:calcID) tac = 
   1.380 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.381 -	     \<NEXTTAC>\n\
   1.382 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n"^
   1.383 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.384 +	     "<NEXTTAC>\n" ^
   1.385 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n"^
   1.386  	     tac2xml i tac^
   1.387  (*	     ^(strs2xml o (map (tac2xml i))) tacs^*)
   1.388 -	     "</NEXTTAC>\n\
   1.389 -	     \@@@@@end@@@@@");
   1.390 +	     "</NEXTTAC>\n" ^
   1.391 +	     "@@@@@end@@@@@");
   1.392  (* fetchproposedtactic2xml 11 22 (Rewrite ("rmult_commute","?m *?n =?n *?m"));
   1.393     *)
   1.394  fun fetchproposedtacticERROR2xml (*uI:userID*) (cI:calcID) e = 
   1.395 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.396 -	     \<NEXTTAC>\n\
   1.397 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.398 -	     \  <ERROR> "^ e ^" </ERROR>\n\
   1.399 -	     \</NEXTTAC>\n\
   1.400 -	     \@@@@@end@@@@@");
   1.401 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.402 +	     "<NEXTTAC>\n" ^
   1.403 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.404 +	     "  <ERROR> "^ e ^" </ERROR>\n" ^
   1.405 +	     "</NEXTTAC>\n" ^
   1.406 +	     "@@@@@end@@@@@");
   1.407  
   1.408  (*. UNCHANGED: the pos' of the active formula autocalculate has been applied at
   1.409      DELETED:   last pos' of the succesional sequence of formulae prob. deleted
   1.410      GENERATED: the pos' of the new active formula
   1.411  .*)
   1.412  fun autocalculateOK2xml (cI:calcID) (old:pos') (del:pos') (new:pos') = 
   1.413 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.414 -	     \<AUTOCALC>\n\
   1.415 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.416 -	     \  <CALCCHANGED>\n" ^
   1.417 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.418 +	     "<AUTOCALC>\n" ^
   1.419 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.420 +	     "  <CALCCHANGED>\n" ^
   1.421  	     pos'2xml (2*i) ("UNCHANGED", old) ^ 
   1.422  	     pos'2xml (2*i) ("DELETED", del) ^ 
   1.423  	     pos'2xml (2*i) ("GENERATED", new) ^ 
   1.424 -	     "  </CALCCHANGED>\n\
   1.425 -	     \</AUTOCALC>\n\
   1.426 -	     \@@@@@end@@@@@");
   1.427 +	     "  </CALCCHANGED>\n" ^
   1.428 +	     "</AUTOCALC>\n" ^
   1.429 +	     "@@@@@end@@@@@");
   1.430  (* autocalculate2xml 11 22 (Rewrite ("rmult_commute","?m *?n =?n *?m"));
   1.431     *)
   1.432  fun autocalculateERROR2xml (cI:calcID) e = 
   1.433 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.434 -	     \<CALCMESSAGE> "^ e ^" </CALCMESSAGE>\n\
   1.435 -	     \@@@@@end@@@@@");
   1.436 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.437 +	     "<CALCMESSAGE> "^ e ^" </CALCMESSAGE>\n" ^
   1.438 +	     "@@@@@end@@@@@");
   1.439  
   1.440  fun interStepsOK (cI:calcID) (*pos'forms*) (old:pos') (del:pos') (new:pos') =
   1.441 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.442 -	     \<INTERSTEPS>\n\
   1.443 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.444 -	     \  <CALCCHANGED>\n" ^
   1.445 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.446 +	     "<INTERSTEPS>\n" ^
   1.447 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.448 +	     "  <CALCCHANGED>\n" ^
   1.449  	     pos'2xml (2*i) ("UNCHANGED", old) ^ 
   1.450  	     pos'2xml (2*i) ("DELETED", del) ^ 
   1.451  	     pos'2xml (2*i) ("GENERATED", new) ^ 
   1.452 -	     "  </CALCCHANGED>\n\
   1.453 -	     \</INTERSTEPS>\n\
   1.454 -	     \@@@@@end@@@@@");
   1.455 +	     "  </CALCCHANGED>\n" ^
   1.456 +	     "</INTERSTEPS>\n" ^
   1.457 +	     "@@@@@end@@@@@");
   1.458  fun interStepsERROR (cI:calcID) e =
   1.459 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.460 -	     \  <CALCMESSAGE> "^ e ^" </CALCMESSAGE>\n\
   1.461 -	     \@@@@@end@@@@@");
   1.462 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.463 +	     "  <CALCMESSAGE> "^ e ^" </CALCMESSAGE>\n" ^
   1.464 +	     "@@@@@end@@@@@");
   1.465  
   1.466  fun modifycalcheadOK2xml (cI:calcID) (chd as (complete,p_,_,_,_,_):ocalhd) =
   1.467 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.468 -	     \<MODIFYCALCHEAD>\n\
   1.469 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n\
   1.470 -	     \  <STATUS> "^(if complete then "complete" 
   1.471 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.472 +	     "<MODIFYCALCHEAD>\n" ^
   1.473 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.474 +	     "  <STATUS> "^(if complete then "complete" 
   1.475  			    else "incomplete")^ "</STATUS>\n"^
   1.476  	     modspec2xml i chd^
   1.477 -	     "</MODIFYCALCHEAD>\n\
   1.478 -	     \@@@@@end@@@@@");
   1.479 +	     "</MODIFYCALCHEAD>\n" ^
   1.480 +	     "@@@@@end@@@@@");
   1.481  
   1.482  (* val (cI, contthy) = (cI, (context_thy (pt,pos) tac));
   1.483     *)
   1.484  fun contextthyOK2xml cI contthy = 
   1.485 -    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n\
   1.486 -	     \<CONTEXTTHY>\n\
   1.487 -	     \  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.488 +    writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
   1.489 +	     "<CONTEXTTHY>\n" ^
   1.490 +	     "  <CALCID> "^string_of_int cI^" </CALCID>\n" ^
   1.491  	     contthy2xml i contthy ^
   1.492 -	     "</CONTEXTTHY>\n\
   1.493 -	     \@@@@@end@@@@@");
   1.494 +	     "</CONTEXTTHY>\n" ^
   1.495 +	     "@@@@@end@@@@@");
   1.496  
   1.497  (*
   1.498  fun contextthyNO2xml guh = 
   1.499      writeln (datatypes.contextthyNO2xml 0 guh);
   1.500 -*)
   1.501 \ No newline at end of file
   1.502 +*)