Changeset 868 for lang/lua

Timestamp:

10/30/07 10:01:12 (13 months ago)

Author:

mattn

Message:

lang/lua/LuaScraper/luascraper.lua: added result handler.

Files:

• lang/lua/LuaScraper/luascraper.lua (modified) (4 diffs)

lang/lua/LuaScraper/luascraper.lua

@@ -8 +8 @@
 end
 -- not supported
-function result(self)
-  self.name = "result"
-  return self
+function result(t)
+  return {name="result",list=t}
 end
 -- return scraper structure
@@ -39 +38 @@
       if (type(v) == "table" and v.name == "process") then
         if (type(v.process.scraper) == "table") then
+          local newres = {}
           for k1,v1 in pairs(ctx.doc:select(v.process.xpath)) do
             local newctx = {top=ctx.top, doc=v1}
-            self.res[#(self.res)+1] = v.process.scraper.scrape(uri, newctx)
+            newres[#(newres)+1] = v.process.scraper.scrape(uri, newctx)
           end
+          self.res[v.process.name] = newres
         else
           local node = ctx.doc:select(v.process.xpath)
@@ -52 +53 @@
               attr = string.sub(attr, 2)
               val = node[1]:attribute(attr)
-                          nname = node[1]:name()
+              nname = node[1]:name()
               if (nname == "img" and attr == "src") or (nname == "a" and attr == "href") then
                   if string.sub(uri, -1) == "/" then
@@ -66 +67 @@
       end
     end
+    for k,v in pairs(self) do
+      if (type(v) == "table" and v.name == "result") then
+        rres = {}
+        if type(v.list) == "table" then
+          for k1,v1 in pairs(v.list) do
+            rres[k1] = self.res[k1]
+          end
+        else
+          rres[v.list] = self.res[v.list]
+        end
+        self.res = rres
+      end
+    end
     return self.res
   end