X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fon-line%2Fjavascript%2Fcontrol.js;h=ca62cff5728d5f06fec4bf726171ea676399dd01;hb=1c7fb836e2af4f2f3d18afd0396701f2094265ff;hp=01ee82f2a7782727664ef76f2cc462e69c681f41;hpb=91d0b53ce03e139409f7f210a4128f06d0359567;p=helm.git

diff --git a/helm/on-line/javascript/control.js b/helm/on-line/javascript/control.js
index 01ee82f2a..ca62cff57 100644
--- a/helm/on-line/javascript/control.js
+++ b/helm/on-line/javascript/control.js
@@ -22,11 +22,12 @@ function updateOutput(output,format)
   var topurl = top.topurl;
   var processorURL = top.processorURL;
   var getterURL = top.getterURL;
+  var proofcheckerURL = top.proofcheckerURL;
   var draw_graphURL = top.draw_graphURL;
   var uri_set_queueURL = top.uri_set_queueURL;
   var mode_list = mode.split(",");
   var new_mode = output.options[output.selectedIndex].value;
-  var dest = "?theoryuri=" + theoryuri + "&cicuri=" + cicuri + "&topurl=" + topurl + "&processorURL=" + processorURL + "&getterURL=" + getterURL + "&draw_graphURL=" + draw_graphURL + "&uri_set_queueURL=" + uri_set_queueURL + "&mode=";
+  var dest = "?theoryuri=" + theoryuri + "&cicuri=" + cicuri + "&topurl=" + topurl + "&processorURL=" + processorURL + "&getterURL=" + getterURL + "&proofcheckerURL=" + proofcheckerURL + "&draw_graphURL=" + draw_graphURL + "&uri_set_queueURL=" + uri_set_queueURL + "&mode=";
   
   if (new_mode != mode_list[0]) {
     updateMode(0, new_mode);
@@ -94,6 +95,7 @@ function refreshReload()
       "&theoryuri=" + top.theoryuri +
       "&processorURL=" + top.processorURL +
       "&getterURL=" + top.getterURL +
+      "&proofcheckerURL=" + top.proofcheckerURL +
       "&draw_graphURL=" + top.draw_graphURL +
       "&uri_set_queueURL=" + top.uri_set_queueURL +
       "&UNICODEvsSYMBOL=" + top.UNICODEvsSYMBOL;
@@ -114,7 +116,6 @@ function refreshReload()
 
 function refreshcicHeader(headerURL)
 {
-// Qui e sotto da modificare per usare UWOBO!!!
    top.cicheader.location.search = "?keys=GP&xmluri=" + headerURL + "&param.uri=" + top.cicuri;
    return true;
 }
@@ -127,15 +128,30 @@ function refreshtheoryHeader(headerURL)
 
 function getCICMathMLKeys()
 {
-  //Important note: do not modify this function without modifying makeURL
   return escape("d_c,C1,G,C2,L");
 }
 
+function getTheoryKeys()
+{
+  return escape("T1,T2,L,E");
+}
+
+function getEmbedKeys()
+{
+  return escape("d_c,TC1,HC2,L");
+}
+
+function getCICHTMLKeys()
+{
+  return escape("d_c,C1,HC2,L");
+}
+
 function makeURL(type,uri,cicflags,typesflags)
 {
   var mode = top.mode;
   var processorURL = top.processorURL;
   var getterURL = top.getterURL;
+  var proofcheckerURL = top.proofcheckerURL;
   var draw_graphURL = top.draw_graphURL;
   var uri_set_queueURL = top.uri_set_queueURL;
   var UNICODEvsSYMBOL = top.UNICODEvsSYMBOL;
@@ -163,32 +179,33 @@ function makeURL(type,uri,cicflags,typesflags)
           mode_list[5] + "&patch_dtd=" + mode_list[6];
   } else {
     if (format == "html" && type == "cic") {
-      //Important note: do not modify this function without modifying
-      //getCICMathMLKeys
-      keys = escape("d_c,C1,HC2,L") +
+      keys = getCICHTMLKeys() +
        "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
+       "&param.proofcheckerURL=" + escape(proofcheckerURL) +
        "&param.draw_graphURL=" + escape(draw_graphURL) +
        "&param.uri_set_queueURL=" + escape(uri_set_queueURL) +
        "&param.UNICODEvsSYMBOL=" + escape(UNICODEvsSYMBOL) +
        "&prop.doctype-public="+escape("-//W3C//DTD XHTML 1.0 Transitional//EN")+
        "&prop.encoding=iso-8859-1" +
        "&prop.media-type=text/html" +
+       "&prop.method=html" +
        "&param.doctype-public="+escape("-//W3C//DTD XHTML 1.0 Transitional//EN")+
        "&param.encoding=iso-8859-1" +
        "&param.media-type=text/html" +
-       "&param.keys=" + escape("d_c,C1,HC2,L") +
+       "&param.keys=" + getCICHTMLKeys() +
        "&param.interfaceURL=" + escape(interfaceURL);
     } else if (format == "html" && type == "theory") {
-      keys = escape("T1,T2,L,E")+
+      keys = getTheoryKeys()+
        "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
+       "&param.proofcheckerURL=" + escape(proofcheckerURL) +
        "&param.draw_graphURL=" + escape(draw_graphURL) +
        "&param.uri_set_queueURL=" + escape(uri_set_queueURL) +
        "&param.UNICODEvsSYMBOL=" + escape(UNICODEvsSYMBOL) +
-       "&param.keys=" + escape("d_c,C1,HC2,L") +
-       "&param.thkeys=" + escape("T1,T2,L,E") +
-       "&param.embedkeys=" + escape("d_c,TC1,HC2,L") +
+       "&param.keys=" + getCICHTMLKeys() +
+       "&param.thkeys=" + getTheoryKeys() +
+       "&param.embedkeys=" + getEmbedKeys() +
        "&param.doctype-public="+escape("-//W3C//DTD XHTML 1.0 Transitional//EN")+
        "&param.encoding=iso-8859-1" +
        "&param.thencoding=iso-8859-1" +
@@ -197,15 +214,26 @@ function makeURL(type,uri,cicflags,typesflags)
        "&param.interfaceURL=" + escape(interfaceURL) +
        "&param.thinterfaceURL=" + escape(thinterfaceURL);
     } else if (format == "mml_cont" && type == "cic") {
-      keys = escape("d_c,C1");
+      keys = escape("d_c,C1")+
+       "&param.processorURL=" + escape(processorURL) +
+       "&param.getterURL=" + escape(getterURL) +
+       "&prop.doctype-public="+
+       //"&prop.encoding=" +
+       "&prop.media-type=text/xml" +
+       "&param.doctype-public=" +
+       "&param.encoding=" +
+       "&param.media-type=text/xml";
     } else if (format == "mml_cont" && type == "theory") {
       keys = escape("T1,L,E")+
+       "&param.processorURL=" + escape(processorURL) +
+       "&param.getterURL=" + escape(getterURL) +
        "&param.keys=" + escape("d_c,C1") +
        "&param.thkeys=T1,L,E" +
        "&param.embedkeys=" + escape("d_c,TC1") +
 
        "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
+       "&param.proofcheckerURL=" + escape(proofcheckerURL) +
        "&param.draw_graphURL=" + escape(draw_graphURL) +
        "&param.uri_set_queueURL=" + escape(uri_set_queueURL) +
        "&param.doctype-public=" +
@@ -216,26 +244,28 @@ function makeURL(type,uri,cicflags,typesflags)
        "&param.interfaceURL=" + escape(interfaceURL) +
        "&param.thinterfaceURL=" + escape(thinterfaceURL);
     } else if (format == "mml_pres" && type == "cic") {
-      keys = escape("d_c,C1,G,C2,L")+
+      keys = getCICMathMLKeys()+
        "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
+       "&param.proofcheckerURL=" + escape(proofcheckerURL) +
        "&param.draw_graphURL=" + escape(draw_graphURL) +
        "&param.uri_set_queueURL=" + escape(uri_set_queueURL) +
        "&prop.doctype-public="+
-       "&prop.encoding=" +
+       //"&prop.encoding=" +
        "&prop.media-type=text/xml" +
        "&param.doctype-public=" +
        "&param.encoding=" +
        "&param.media-type=text/xml" +
-       "&param.keys=" + escape("d_c,C1,G,C2,L") +
+       "&param.keys=" + getCICMathMLKeys() +
        "&param.interfaceURL=" + escape(interfaceURL);
     } else if (format == "mml_pres" && type == "theory") {
-      keys = escape("T1,T2,L,E")+
-       "&param.keys=d_c,C1,G,C2,L" +
-       "&param.thkeys=T1,T2,L,E" +
-       "&param.embedkeys=d_c,TC1,G,C2,L" +
+      keys = getTheoryKeys()+
+       "&param.keys=" + getCICMathMLKeys() +
+       "&param.thkeys=" + getTheoryKeys() +
+       "&param.embedkeys=" + escape("d_c,TC1,G,C2,L") +
        "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
+       "&param.proofcheckerURL=" + escape(proofcheckerURL) +
        "&param.draw_graphURL=" + escape(draw_graphURL) +
        "&param.uri_set_queueURL=" + escape(uri_set_queueURL) +
        "&param.doctype-public=" +
@@ -247,11 +277,11 @@ function makeURL(type,uri,cicflags,typesflags)
        "&param.thinterfaceURL=" + escape(thinterfaceURL);
     }
 
-    var naturalLanguage = typesflags;
+    var naturalLanguage = typesflags.toLowerCase();
     if (typesflags != "NO" || type == "theory") {
        naturalLanguage = mode_list[3];
     }
-    var annotations = cicflags;
+    var annotations = cicflags.toLowerCase();
     if (cicflags != "NO" || type == "theory") {
        annotations = mode_list[4];
     }