Changeset b56c94e in tol

Timestamp:

Jul 1, 2010, 4:44:28 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

7312814

Parents:

3e37515

Message:

refs #927:

• Curl renamed to CurlApi
• Get renamed to GetUrl
• GetUrl now return a Set with the following elements:
  • Rail failStatus : 0 if not fail otherwise contain the error code
  • Text explain: this item only appear if failStatus != 0 and contains the error description
  • if failStatus == 0 then the following items are returned:
    • Real fileTime
    • Real totalTime
    • Real connectTime
    • Real sizeDownload
    • Real speedDownload

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

Location:

tol/stdlib/general/system

Files:

• Curl/TolCurl.tcl (deleted)
• CurlApi/CurlApi.tol (moved) (moved from tol/stdlib/general/system/Curl/Curl.tol) (1 diff)
• CurlApi/CurlFunctions.tol (moved) (moved from tol/stdlib/general/system/Curl/CurlFunctions.tol) (2 diffs)
• CurlApi/TolCurl.tcl (added)
• _init_system.tol (modified) (1 diff)

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

@@ -6 +6 @@
 
 //////////////////////////////////////////////////////////////////////////////
-NameBlock Curl = [[
+NameBlock CurlApi = [[
 //////////////////////////////////////////////////////////////////////////////
 Text _.autodoc.brief = "Curl API";

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

@@ -17 +17 @@
 };
 
-Real Get( NameBlock args )
+Set GetUrl( NameBlock args )
 {
   // Esta inicializacion deberia desaparecer
@@ -25 +25 @@
   Text file = args::file;
   // otros argumentos opcionales seran tratados mas adelante
-  Set cmd = [[ "::TolCurl::Get", url, file ]];
+  Real verbose = getOptArg( args, "verbose", 0 );
+  Set cmd = [[ "::TolCurl::getUrl", url, file ]];
   Set tclResult = Tcl_EvalEx( cmd );
   Real status = tclResult["status"];
-  Real If( status, {
-      Real curlStatus = TextToReal( tclResult["result"] );
-      If( curlStatus, {
-          Set curlErrorMsg =
-            Tcl_EvalEx( [[ "::curl::easystrerror", tclResult["result"] ]] );
-          Error( "Curl::Get: " + curlErrorMsg["result"] );
-          Real 0
-        }, 1 /* Get OK */ )
+  Set If( status, {
+      Set curlResult = {
+        Eval( tclResult["result"] )
+      }
     }, {
-      Error( "Curl::Get: " + tclResult["result"] );
-      Real 0 /* Tcl Code is wrong!!! */
+      Error( "Curl::Get: " + tclResult[ "result" ] );
+      Set Copy( Empty ) /* Tcl Code is wrong!!! */
     } )
 };

tol/stdlib/general/system/_init_system.tol

@@ -10 +10 @@
 Set Include("cmsg/_init_cmsg.tol");
 
-Set Include("Curl/Curl.tol");
+Set Include("CurlApi/CurlApi.tol");
 Set Include("PackArchive/PackArchive.tol");