Changeset 2ae8ad2 in tol

Timestamp:

May 26, 2011, 10:40:18 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2fa0fec

Parents:

fb0ede0

Message:

Fixes #1207
Refs #927

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

Location:

tol/stdlib

Files:

• TolConfigManager/default.tol (modified) (1 diff)
• general/grammars/_text.tol (modified) (2 diffs)
• general/system/CurlApi/CurlFunctions.tol (modified) (1 diff)

tol/stdlib/TolConfigManager/default.tol

@@ -67 +67 @@
     "order to download contents from remote URL's. Valid methods are tcl:uri "
     "and sys:wget";
-    Text UrlDownloader = "tcl:uri"
+    Text UrlDownloader = "tcl:curl";
+    Text _.autodoc.member.CurlApiCfg = "Configuración por defecto de CurlApi";
+    NameBlock CurlApiCfg =
+    [[
+      Text _.autodoc.member.verbose = "When True display a lot of verbose "
+      "information about its operations. Very useful for protocol debugging "
+      "and understanding.";
+      Real verbose = 0;
+      Text _.autodoc.member.connecttimeout = "Set the maximum time in seconds "
+      "that you allow the connection to the server to take. This only limits "
+      "the connection phase, once it has connected, this option is of no more "
+      "use. This is an optional argument, it defaults to 0 which means no "
+      "timeout.";
+      Real connecttimeout = 5;
+      Text _.autodoc.member.timeout = "Set the maximum time in seconds that "
+      "you allow the transfer operation to take. Do note that normally, name "
+      "lookups may take a considerable time and that limiting the operation "
+      "to less than a few minutes risks aborting perfectly normal operations. "
+      "This is an optional argument, it defaults to 0 which means no timeout.";
+      Real timeout = 0
+    ]]
   ]];
   Text _.autodoc.member.Upgrading = "Automated check and upgrade of "

tol/stdlib/general/grammars/_text.tol

@@ -1209 +1209 @@
 
 //////////////////////////////////////////////////////////////////////////////
-Text GetUrlContents.tcl.curl(Text url)
-//////////////////////////////////////////////////////////////////////////////
-{
-  WriteLn("[GetUrlContents.tcl.cur] Sorry, not implemented method.","E");
-  ""
+Text GetUrlContents.tcl.curl(Text url_)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Write("[GetUrlContents.tcl.curl] Downloading from \""+url_+"\" ... ");
+  Set result1 = CurlApi::GetUrl( [[ Text url = url_ ]] );
+  If( result1::failStatus, 
+  {
+    WriteLn("FAIL");
+    WriteLn( "[GetUrlContents.tcl.curl] error: "<<result1::details,"W");
+    ""
+  }, 
+  {
+    WriteLn("OK");
+    result1::bodyData
+  })
 };
 
@@ -1236 +1246 @@
   Case(
   method=="tcl:uri",  GetUrlContents.tcl.uri (url),
-//method=="tcl:curl", GetUrlContents.tcl.curl(url),
+  method=="tcl:curl", GetUrlContents.tcl.curl(url),
   method=="sys:wget", GetUrlContents.sys.wget(url),
   1==1, {

tol/stdlib/general/system/CurlApi/CurlFunctions.tol

@@ -68 +68 @@
   //Text file = getOptArg::file;
   Text file = getOptArg( args, "file", "" );
-  Real verbose = getOptArg( args, "verbose", 0 );
-  Real connecttimeout = getOptArg( args, "connecttimeout", 5 );
-  // un paquete no debe tardar mas de 60 segundos en bajar
-  Real timeout = getOptArg( args, "timeout", 60 );
+  Real verbose = getOptArg( args, "verbose", TolConfigManager::Config::ExternalTools::CurlApiCfg::verbose );
+  Real connecttimeout = getOptArg( args, "connecttimeout", TolConfigManager::Config::ExternalTools::CurlApiCfg::connecttimeout );
+  Real timeout = getOptArg( args, "timeout", TolConfigManager::Config::ExternalTools::CurlApiCfg::timeout );
   // otros argumentos opcionales seran tratados mas adelante
   Set cmd = [[ "::TolCurl::getUrl", url,