Merge pull request #17 from moteus/master

Change. multi iterator returns response code as data for `done` row

Author: moteus

examples/Lua-cURL/browser.lua renamed to examples/cURLv2/browser.lua

@@ -4,7 +4,7 @@
 -- RCS ID: $Id: browser.lua,v 0.1 2011/03/11 23:55:20 kai Exp $
 -----------------------------------------------------------------------------
 
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 local string = require("string")
 local table = require("table")
 local base = _G

examples/Lua-cURL/file.lua renamed to examples/cURLv2/file.lua

@@ -1,4 +1,4 @@
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 -- open output file
 f = io.open("example_homepage", "w")
@@ -7,9 +7,9 @@ c = cURL.easy_init()
 -- setup url
 c:setopt_url("http://www.example.com/")
 -- perform, invokes callbacks
-c:perform({writefunction = function(str) 
-f:write(str)
- end})
+c:perform{writefunction = function(str)
+f:write(str)
+end}
 
 -- close output file
 f:close()

examples/Lua-cURL/multi.lua renamed to examples/cURLv2/multi.lua

@@ -1,22 +1,22 @@
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 -- setup easy 
-c = cURL.easy_init()
+c1 = cURL.easy_init()
 c2 = cURL.easy_init()
 
 -- setup url
-c:setopt_url("http://www.lua.org/")
+c1:setopt_url("http://www.lua.org/")
 c2:setopt_url("http://luajit.org/")
 
 m = cURL.multi_init()
-m:add_handle(c)
+m:add_handle(c1)
 m:add_handle(c2)
 
 local f1 = io.open("lua.html","a+")
 local f2 = io.open("luajit.html","a+")
 
 for data, type, easy in m:perform() do
 -- if (type == "header") then print(data) end
- if (type == "data" and c == easy) then f1:write(data) end
+ if (type == "data" and c1 == easy) then f1:write(data) end
  if (type == "data" and c2 == easy) then f2:write(data) end
 end

examples/Lua-cURL/post_stream.lua renamed to examples/cURLv2/post_stream.lua

@@ -1,4 +1,4 @@
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 -- returns size and reader
 local function make_stream(ch, n, m)

examples/Lua-cURL/rss.lua renamed to examples/cURLv2/rss.lua

@@ -1,6 +1,6 @@
 -- use LuaExpat and Lua-CuRL together for On-The-Fly XML parsing
 local lxp = require("lxp")
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 tags = {}
 items = {}
@@ -14,12 +14,13 @@ function callback.StartElement(parser, tagname)
  end
 end
 
-function callback.CharacterData(parser, str) 
+function callback.CharacterData(parser, str)
  if (tags[#tags -1] == "item") then
  --we are parsing a item, get rid of trailing whitespace
  items[#items][tags[#tags]] = string.gsub(str, "%s*$", "")
  end
 end
+
 function callback.EndElement(parser, tagname)
  --assuming well formed xml
  tags[#tags] = nil