escape/unescape no longer works with '+';

[helm.git] / helm / searchEngine / html / editorpdq.html

diff --git a/helm/searchEngine/html/editorpdq.html b/helm/searchEngine/html/editorpdq.html
index 21e803906077a8244a0f342428dbb85c1cd24fad..4e82f8faa77aca8f652ffe7174c0e503eb8593b2 100644 (file)
--- a/helm/searchEngine/html/editorpdq.html
+++ b/helm/searchEngine/html/editorpdq.html
@@ -21,7 +21,7 @@ function nuovapdqsa()
        if (confirm("Are you sure you want to change expression?"))
                {
                top.terminecic="";
-               document.invio.expression.value="";document.invio.aliaslist.value=unescape(top.listaliases);
+               document.invio.expression.value="";document.invio.aliaslist.value=decodeURIComponent(top.listaliases);
                top.ricordaliaslist=1;
                window.open(top.topurl+top.action+"pdq.html","cw");
                window.open(top.topurl+top.action+"editorpdq.html","sw");
@@ -30,14 +30,14 @@ function nuovapdqsa()
 function invia()
        {
        if (document.invio.expression.value!="")
-               {top.terminecic=escape(document.invio.expression.value);
+               {top.terminecic=encodeURIComponent(document.invio.expression.value);
     top.listaliases="";
                for (i=0;i<top.aliasglob.length;i++)
                        {
-                       top.listaliases=top.listaliases+escape(top.aliasglob[i]+" ");
+                       top.listaliases=top.listaliases+encodeURIComponent(top.aliasglob[i]+" ");
                        }
                //alert(top.listaliases);
-    window.open(top.ask_uwobo(top.topurl+"/"+top.current_query+"?term="+escape(document.invio.expression.value)+"&aliases="+top.listaliases),"cw");
+    window.open(top.ask_uwobo(top.topurl+"/"+top.current_query+"?term="+encodeURIComponent(document.invio.expression.value)+"&aliases="+top.listaliases),"cw");
         }
                //window.open(top.topurl+top.action+"templateambigpdq2.html","bw")}     
        else {alert("Please complete the query before.")}
@@ -68,7 +68,7 @@ function listalias()
        }
 function editaalias()
        {
-       if (document.invio.expression.value!=""){top.terminecic=escape(document.invio.expression.value)}
+       if (document.invio.expression.value!=""){top.terminecic=encodeURIComponent(document.invio.expression.value)}
        top.window.open(top.topurl+top.action+"aliaslist.html",(top.cw.frames.length==0?"cw":"bw"));
        }
 </SCRIPT>
@@ -85,6 +85,6 @@ function editaalias()
 <input type=button value="Restart" onMouseOver="top.help(-5)" onClick="armageddon()"></input>
 <input type=button value="New expression" onMouseOver="top.help(-7)" onClick="nuovapdqsa()"></input>
 </form>
-<SCRIPT language=Javascript>document.invio.expression.value=unescape(top.terminecic); </script>
+<SCRIPT language=Javascript>document.invio.expression.value=decodeURIComponent(top.terminecic); </script>
 </BODY>
 </HTML>