]> git.nbdom.net Git - nb.git/commitdiff
lib/lua/nb.lua
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Fri, 25 May 2018 01:25:36 +0000 (02:25 +0100)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Fri, 25 May 2018 01:25:36 +0000 (02:25 +0100)
lib/lua/nb.lua

index 7f4c7cc62540892359f297fea51a57bd460c37cc..f434e900cca6f21ac30de73502070a31576069e3 100644 (file)
@@ -209,7 +209,6 @@ function nb:api(url,fmt)
        local res = ngx.location.capture(url)
        local rows = json.decode(res.body)
 
-       if fmt == nil then fmt = '| %s' end
        local fct
 
        -- Function
@@ -217,7 +216,7 @@ function nb:api(url,fmt)
                fct = fmt
 
        -- Table
-       elseif 0
+       elseif false
                or fmt == "table"
                or fmt == "table-th"
                or fmt == "table-td"
@@ -239,11 +238,18 @@ function nb:api(url,fmt)
 
        -- Default
        else
+               if fmt == nil then fmt = ', %s' end
                fct = function(r,i)
+                       local i = 0
                        for k,v in pairs(r) do
-                               ngx.print(string.format(fmt,v))
-                               -- ngx.say(v)
+                               i = i + 1
+                               if i == 1 then
+                                       ngx.print(v)
+                               else
+                                       ngx.print(string.format(fmt,v))
+                               end
                        end
+                       ngx.print('\n')
                end
 
        end