Changeset 5408466 in tol

Timestamp:

May 17, 2011, 8:16:58 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3b217af

Parents:

fa5f9a1

Message:

Refs #1207

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3551 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/general/grammars/_text.tol (modified) (1 diff)

tol/stdlib/general/grammars/_text.tol

@@ -1172 +1172 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  WriteLn("[GetUrlContents.tcl.uri]Downloading from \""+url+"\" ...");
-  Text tcl_helper = "
-package require uri
-
-proc ::get_url_contens { url } {
-
-  array set uri_info [ uri::split $url ]
-  if { $uri_info(scheme) eq \"http\" } {
-    set url_content [ uri::geturl $url ]
-    set ${url_content}(body)
-  } elseif { $uri_info(scheme) eq \"ftp\" } {
-    uri::geturl $url
-  }
-}";
-  
+  Write("[GetUrlContents.tcl.uri] Downloading from \""+url+"\" ... ");
+  Text tcl_helper = 
+    "package require uri\n"+
+    "\n"+
+    "proc ::get_url_contens { url } {\n"+
+    "\n"+
+    "  array set uri_info [ uri::split $url ]\n"+
+    "  if { $uri_info(scheme) eq \"http\" } {\n"+
+    "    set url_content [ uri::geturl $url ]\n"+
+    "    set ${url_content}(body)\n"+
+    "  } elseif { $uri_info(scheme) eq \"ftp\" } {\n"+
+    "    uri::geturl $url\n"+
+    "  }\n"+
+    "}";  
   Set result0 = Tcl_Eval(tcl_helper);
-  Text If(result0["status"], Text {
-      
-      Set result = Tcl_Eval("::get_url_contens " + url);
-      Text If(result["status"], Text result["result"],
-        {
-          WriteLn(result["result"], "W");
-          Text ""
-        })
+  Text If(result0["status"],  
+  {
+    Set result = Tcl_Eval("::get_url_contens " + url);
+    Text If(result["status"], 
+    {
+      WriteLn("OK");
+      Text result["result"]
     },
     {
-      WriteLn(result0["result"], "W");
+      WriteLn("FAIL");
+      WriteLn(result["result"], "W");
       Text ""
     })
+  },
+  {
+    WriteLn("FAIL");
+    WriteLn(result0["result"], "W");
+    Text ""
+  })
 };