diff --git a/modpol/orgs/orgs.lua b/modpol/orgs/orgs.lua index dfb4171..507210b 100644 --- a/modpol/orgs/orgs.lua +++ b/modpol/orgs/orgs.lua @@ -91,7 +91,7 @@ end function modpol.orgs.init_instance() local error_msg if modpol.orgs.array[1] then - modpol.ocutil.log('Error: instance has already been initialized') + modpol.ocutil.log('Error in orgs.init_instance -> instance has already been initialized') return false end @@ -126,14 +126,14 @@ function modpol.orgs:record(msg, entry_type) if type(msg) == 'string' and not(modpol.ocutil.str_empty(msg)) then entry.action_msg = msg else - modpol.ocutil.log('Error: msg must be a non empty string') + modpol.ocutil.log('Error in ' .. self.name .. ':record -> msg must be a non empty string') return false end if type(entry_type) == 'string' and not(modpol.ocutil.str_empty(entry_type)) then entry.entry_type = entry_type else - modpol.ocutil.log('Error: entry_type must be a non empty string') + modpol.ocutil.log('Error in ' .. self.name .. ':record -> entry_type must be a non empty string') print(msg, entry_type) return false end @@ -151,17 +151,17 @@ end -- ex: instance:add_org('town hall') function modpol.orgs:add_org(name) if self.id == nil then - modpol.ocutil.log('Error: add_org can only be called by another org') + modpol.ocutil.log('Error in ' .. self.name .. ':add_org -> add_org can only be called by another org') return false end if modpol.ocutil.str_empty(name) then - modpol.ocutil.log('Error: org name is required') + modpol.ocutil.log('Error in ' .. self.name .. ':add_org -> org name is required') return false end if modpol.orgs.get_org(name) then - modpol.ocutil.log('Error: org name is already being used') + modpol.ocutil.log('Error in ' .. self.name .. ':add_org -> org name is already being used') return false end @@ -192,7 +192,7 @@ end -- note: "reason" param was removed, can be added back function modpol.orgs:delete() if self.id == 1 then - modpol.ocutil.log('Error: cannot delete instance') + modpol.ocutil.log('Error in ' .. self.name .. ':delete -> cannot delete instance') return false end @@ -335,7 +335,7 @@ function modpol.orgs:make_request(request) local num_params = modpol.orgs.request_params[request.type] if num_params == nil then - modpol.ocutil.log("Error: request type is invalid") + modpol.ocutil.log('Error in ' .. self.name .. ':make_request -> request type is invalid') return false end @@ -345,14 +345,14 @@ function modpol.orgs:make_request(request) end if num_params ~= 0 then - modpol.ocutil.log("Error: request has invalid number of parameters") + modpol.ocutil.log('Error in ' .. self.name .. ':make_request -> request has invalid number of parameters') return false end -- checking to see if identical request already exists for k, v in ipairs(self.requests) do if self.comp_req(request, v) == true then - modpol.ocutil.log("Error: request has already been made") + modpol.ocutil.log('Error in ' .. self.name .. ':make_request -> request has already been made') return false end end @@ -361,7 +361,7 @@ function modpol.orgs:make_request(request) local requested_policy = self.policies[request.type] if requested_policy then if requested_policy.must_be_member and not self:has_member(request.user) then - modpol.ocutil.log("Error: user must be org member to make this request") + modpol.ocutil.log('Error in ' .. self.name .. ':make_request -> user must be org member to make this request') return false end end