Software /
code /
prosody
Comparison
util/dataforms.lua @ 5694:7aec065d78a0
Merge 0.9->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 13 Jun 2013 23:21:24 +0100 |
parent | 5693:ef490e9276df |
child | 5776:bd0ff8ae98a8 |
child | 6148:7dcd6f124c93 |
comparison
equal
deleted
inserted
replaced
5683:624b874059bf | 5694:7aec065d78a0 |
---|---|
185 function (field_tag, required) | 185 function (field_tag, required) |
186 local result = {}; | 186 local result = {}; |
187 for value in field_tag:childtags("value") do | 187 for value in field_tag:childtags("value") do |
188 result[#result+1] = value:get_text(); | 188 result[#result+1] = value:get_text(); |
189 end | 189 end |
190 return result, (required and #result == 0 and "Required value missing" or nil); | 190 if #result > 0 then |
191 return result; | |
192 elseif required then | |
193 return nil, "Required value missing"; | |
194 end | |
191 end | 195 end |
192 | 196 |
193 field_readers["text-multi"] = | 197 field_readers["text-multi"] = |
194 function (field_tag, required) | 198 function (field_tag, required) |
195 local data, err = field_readers["list-multi"](field_tag, required); | 199 local data, err = field_readers["list-multi"](field_tag, required); |