new MathQL syntax

[helm.git] / helm / on-line / javascript / graphLinks.js

diff --git a/helm/on-line/javascript/graphLinks.js b/helm/on-line/javascript/graphLinks.js
index 423d3101f980d12590af959a1a4acf49ab66e007..a01a6f6d642437571e3884e4cd19edf1863fc5d4 100644 (file)
--- a/helm/on-line/javascript/graphLinks.js
+++ b/helm/on-line/javascript/graphLinks.js
@@ -1,4 +1,4 @@
-function mkRDFURI(uri)
+function mkBackwardRDFURI(uri)
 {
    var prefix = "helm:rdf:www.cs.unibo.it/helm/rdf/backward//";
    var re1 = /#xpointer\(1\/(\d+)\/(\d+)\)/;
@@ -23,19 +23,20 @@ function removeXPointer(uri)
 }
 
 
-// (use_rdf_uri==true) if the stylesheet must be applied to the
-// metadata; (use_rdf_uri==false) otherwise
-function mkGraphURL(uri,keys,use_rdf_uri)
+function mkGraphURL(uri,keys)
 {
    var getterURL = unescape(getParam("param.getterURL"));
    var draw_graphURL = unescape(getParam("param.draw_graphURL"));
    var url= setParam(location.href,"keys",keys);
-   var rdfuri = mkRDFURI(uri);
-   url = setParam(url,"xmluri", getterURL + 'getxml%3Furi%3D' +
-    (use_rdf_uri ? rdfuri : removeXPointer(uri)));
+   url = setParam(url,"xmluri", getterURL + 'getempty');
    url = setParam(url,"param.CICURI",escape(uri));
    var uri_set_size = document.uri_set_size.elements[0].value;
    url = setParam(url,"param.uri_set_size",uri_set_size);
+
+   // The generated URL is sometimes too long for I.E.
+   // So it is now better to remove some unuseful pararams from the inner URL
+   url = dropParam(url,"param.processorURL");
+
    url = draw_graphURL + 'draw?url=' + escape(url);
    var url2 = setParam(location.href,"keys","MGL,RT");
    url2 = setParam(url2,"xmluri",escape(url));
@@ -45,13 +46,13 @@ function mkGraphURL(uri,keys,use_rdf_uri)
 
 function mkDepURL(uri)
 {
-   return mkGraphURL(uri,"MDG",0);
+   return mkGraphURL(uri,"MDG");
 }
 
 
 function mkMetaURL(uri)
 {
-   return mkGraphURL(uri,"MMG",1);
+   return mkGraphURL(uri,"MMG");
 }
 
 function mkCICURL(uri)
@@ -68,9 +69,10 @@ function mkCICURL(uri)
 
 function mkMetaTheoryURL(uri)
 {
-   var rdfuri = mkRDFURI(uri);
+   var rdfuri = mkBackwardRDFURI(uri);
    var getterURL = getParam("param.getterURL");
-   var url = setParam(location.href,"keys","meta_theory%2CT1%2CT2%2CL%2CE");
+   var url = setParam(location.href,"keys","meta_theory," + unescape(getTheoryKeys()));
+   url = setParam(url,"param.embedkeys", getEmbedKeys());
    url = setParam(url,"xmluri", getterURL + "getxml%3Furi%3D" + rdfuri);
    return url;
 }