Module:Wd - Revision history

Uzume: remove unused local "refHash" and narrow lifetime/scope of "valuesArray"

2024-11-20T21:00:06Z

remove unused local "refHash" and narrow lifetime/scope of "valuesArray"

← Previous revision		Revision as of 21:00, 20 November 2024
Line 2,169:		Line 2,169:

	function State:callHook(param, hooks, statement, result)		function State:callHook(param, hooks, statement, result)
	local valuesArray, refHash

	-- call a parameter's hook if it has been defined and if it has not been called before		-- call a parameter's hook if it has been defined and if it has not been called before
	if not result[param] and hooks[param] then		if not result[param] and hooks[param] then
	valuesArray = self[hooks[param]](self, statement, param, result, hooks) -- array with value objects		local valuesArray = self[hooks[param]](self, statement, param, result, hooks) -- array with value objects

	-- add to the result		-- add to the result

Janhrach: Undid revision 1249540315 by Janhrach (talk)

2024-10-05T14:22:38Z

Undid revision 1249540315 by Janhrach (talk)

← Previous revision		Revision as of 14:22, 5 October 2024
Line 103:		Line 103:
	subjectNamedAs = "P1810",		subjectNamedAs = "P1810",
	wikidataProperty = "P1687",		wikidataProperty = "P1687",
	publishedIn = "P1433",		publishedIn = "P1433"
	placeOfPublication = "P291"
	}		}

Janhrach: update – add publication place to aliasesQ

2024-10-05T13:15:17Z

update – add publication place to aliasesQ

← Previous revision		Revision as of 13:15, 5 October 2024
Line 103:		Line 103:
	subjectNamedAs = "P1810",		subjectNamedAs = "P1810",
	wikidataProperty = "P1687",		wikidataProperty = "P1687",
	publishedIn = "P1433"		publishedIn = "P1433",
			placeOfPublication = "P291"
	}		}

Janhrach: Update from sandbox – use proper fallback for labels

2024-09-12T18:29:19Z

Update from sandbox – use proper fallback for labels

← Previous revision		Revision as of 18:29, 12 September 2024
Line 702:		Line 702:
	-- get label		-- get label
	if not label then		if not label then
	label = mw.wikibase.~~getLabelByLang~~(id~~, self.langCode~~) ~~-- XXX: should use fallback labels?~~		label = mw.wikibase.getLabel(id)
	end		end
	end		end

Janhrach: citation error message improvement and related internal tweaks

2024-09-02T16:58:49Z

citation error message improvement and related internal tweaks

← Previous revision		Revision as of 16:58, 2 September 2024
Line 3:		Line 3:
	require("strict")		require("strict")
	local p = {}		local p = {}
	local ~~arg~~ = ...		local module_arg = ...
	local i18n		local i18n
	local i18nPath		local i18nPath
Line 15:		Line 15:
	else		else
	-- current module included by other module, get its title from ...		-- current module included by other module, get its title from ...
	title = ~~arg~~		title = module_arg
	end		end

Line 165:		Line 165:
	end		end

	local function errorText(code, ~~param~~)		local function errorText(code, ...)
	local text = i18n["errors"][code]		local text = i18n["errors"][code]
	if ~~param~~ then text = mw.ustring.~~gsub~~(text, ~~"$1", param~~) end		if arg then text = mw.ustring.format(text, unpack(arg)) end
	return text		return text
	end		end

	local function throwError(errorMessage, ~~param~~)		local function throwError(errorMessage, ...)
	error(errorText(errorMessage, ~~param~~))		error(errorText(errorMessage, unpack(arg)))
	end		end

Line 1,831:		Line 1,831:
	local referenceEmpty = true -- will be set to false if at least one parameter is left unremoved		local referenceEmpty = true -- will be set to false if at least one parameter is left unremoved

	local version = 10 -- increment this each time the below logic is changed to avoid conflict errors		local version = 11 -- increment this each time the below logic is changed to avoid conflict errors

	if not statement.snaks then		if not statement.snaks then
Line 1,927:		Line 1,927:
	-- handle unknown properties in the reference		-- handle unknown properties in the reference
	if not paramName then		if not paramName then
			local error_message = errorText("unknown-property-in-ref", refProperty)
⚫	citeErrors[citeType] = ~~true~~
			assert(error_message) -- Should not be nil
		⚫	citeErrors[citeType] = error_message
	break		break
	end		end
Line 1,941:		Line 1,943:
	processedProperty = self:getReferenceDetails(statement.snaks, refProperty, raw, self.linked, true) -- anyLang = true		processedProperty = self:getReferenceDetails(statement.snaks, refProperty, raw, self.linked, true) -- anyLang = true
	else		else
	-- If multiple values are given, all but the first one are discarted.		-- If multiple values are given, all but the first suitable one are discarted.
	processedProperty = {self:getReferenceDetail(statement.snaks, refProperty, raw, self.linked and (statement.snaks[refProperty][1].datatype ~= 'url'), true)} -- link = true/false, anyLang = true		processedProperty = {self:getReferenceDetail(statement.snaks, refProperty, raw, self.linked and (statement.snaks[refProperty][1].datatype ~= 'url'), true)} -- link = true/false, anyLang = true
	end		end
Line 1,972:		Line 1,974:
	-- handle unknown properties in the reference		-- handle unknown properties in the reference
	if not paramName then		if not paramName then
			-- Skip this additional property, but do not cause an error.
⚫	citeErrors[citeType] = ~~true~~
	break		break
	end		end
Line 2,009:		Line 2,011:
	for _, citeType in ipairs(citeTypes) do		for _, citeType in ipairs(citeTypes) do
	for _, requiredCiteParam in pairs(citeConfig[citeType]["mandatory-params"] or {}) do		for _, requiredCiteParam in pairs(citeConfig[citeType]["mandatory-params"] or {}) do
	if not citeParams[citeType][requiredCiteParam] then		if not citeParams[citeType][requiredCiteParam] then -- The required param is not present.
	citeErrors[citeType] = ~~true~~		if citeErrors[citeType] then -- Do not override the previous error, if it exists.
			break
		⚫	end
			local error_message = errorText("missing-mandatory-param", requiredCiteParam)
			assert(error_message) -- Should not be nil
		⚫	citeErrors[citeType] = error_message
	end		end
⚫	end
⚫	end

	-- handle missing templates in the citeConfig
⚫	for _, citeType in ipairs(citeTypes) do
	if not citeConfig[citeType]["template"] then
	citeErrors[citeType] = true
	end		end
	end		end
Line 2,037:		Line 2,037:
	local templateToUse = citeConfig[citeTypeToUse]["template"]		local templateToUse = citeConfig[citeTypeToUse]["template"]
	local paramsToUse = citeParams[citeTypeToUse]		local paramsToUse = citeParams[citeTypeToUse]

			if not templateToUse or templateToUse == "" then
			throwError("no-such-reference-template", tostring(templateToUse), i18nPath, citeTypeToUse)
		⚫	end

	-- if this module is being substituted then build a regular template call, otherwise expand the template		-- if this module is being substituted then build a regular template call, otherwise expand the template
Line 2,048:		Line 2,052:
	xpcall(		xpcall(
	function () refContent = mw.getCurrentFrame():expandTemplate{title=templateToUse, args=paramsToUse} end,		function () refContent = mw.getCurrentFrame():expandTemplate{title=templateToUse, args=paramsToUse} end,
	function () ~~error~~(~~string.format(i18n["errors"][~~"no-such-reference-template"], templateToUse, i18nPath, citeTypeToUse)) end		function () throwError("no-such-reference-template", templateToUse, i18nPath, citeTypeToUse) end
	)		)
	end		end

	-- If the citation couldn't be displayed using any template, but is not empty (barring ignored propeties), throw an error		-- If the citation couldn't be displayed using any template, but is not empty (barring ignored propeties), throw an error.
	elseif not referenceEmpty then		elseif not referenceEmpty then
	refContent = ~~"<span style=\"color:#dd3333\">" ..~~ errorText("malformed-reference") ~~.. "</span>"~~		refContent = errorText("malformed-reference-header")
		⚫	for _, citeType in ipairs(citeTypes) do
			refContent = refContent .. errorText("template-failure-reason", citeConfig[citeType]["template"], citeErrors[citeType])
			end
			refContent = refContent .. errorText("malformed-reference-footer")
	end		end

Line 2,064:		Line 2,072:
	if not self.rawValue then		if not self.rawValue then
	-- this should become a <ref> tag, so save the reference's hash for later		-- this should become a <ref> tag, so save the reference's hash for later
	ref.refHash = "wikidata-" .. statement.hash .. "-v" .. (tonumber(i18n~~['cite']~~['version']) + version)		ref.refHash = "wikidata-" .. statement.hash .. "-v" .. (tonumber(i18n['version']) + version)
	end		end
	return {ref}		return {ref}

Janhrach: update from sandbox -- more configurability

2024-08-26T09:41:13Z

update from sandbox -- more configurability

Show changes

Janhrach: Update from sandbox: clearer algorithm and better variable names in getReference

2024-08-09T09:49:12Z

Update from sandbox: clearer algorithm and better variable names in getReference

Show changes

Janhrach: Update from sandbox – refs containing Wikimedia import URL, Inferred from or Imported from are ignored as a whole

2024-06-23T09:33:45Z

Update from sandbox – refs containing Wikimedia import URL, Inferred from or Imported from are ignored as a whole

← Previous revision		Revision as of 09:33, 23 June 2024
Line 1,818:		Line 1,818:
	local wikidataPropertiesOfSource -- will contain "Wikidata property" properties of the item in stated in, if any		local wikidataPropertiesOfSource -- will contain "Wikidata property" properties of the item in stated in, if any

	local version = 7 -- increment this each time the below logic is changed to avoid conflict errors		local version = 8 -- increment this each time the below logic is changed to avoid conflict errors

	if statement.snaks then		if statement.snaks then
			-- don't use bot-added references referencing Wikimedia projects or containing "inferred from" (such references are not usable on Wikipedia)
	-- don't include "imported from", which is added by a bot
	if statement.snaks[aliasesP.importedFrom] then		if statement.snaks[aliasesP.importedFrom] or statement.snaks[aliasesP.wikimediaImportURL] or statement.snaks[aliasesP.inferredFrom] then
	statement.snaks~~[aliasesP.importedFrom]~~ = ~~nil~~		statement.snaks = {}
	end

	-- don't include "Wikimedia import URL"
	if statement.snaks[aliasesP.wikimediaImportURL] then
	statement.snaks[aliasesP.wikimediaImportURL] = nil
	-- don't include "retrieved" if no "referenceURL" is present,
	-- as "retrieved" probably belongs to "Wikimedia import URL"
	if statement.snaks[aliasesP.retrieved] and not statement.snaks[aliasesP.referenceURL] then
	statement.snaks[aliasesP.retrieved] = nil
	end
	end

	-- don't include "inferred from", which is added by a bot
	if statement.snaks[aliasesP.inferredFrom] then
	statement.snaks[aliasesP.inferredFrom] = nil
	end		end

Janhrach: Update from sandbox

2024-06-10T19:17:03Z

Update from sandbox

← Previous revision		Revision as of 19:17, 10 June 2024
Line 1,818:		Line 1,818:
	local wikidataPropertiesOfSource -- will contain "Wikidata property" properties of the item in stated in, if any		local wikidataPropertiesOfSource -- will contain "Wikidata property" properties of the item in stated in, if any

	local version = 6 -- increment this each time the below logic is changed to avoid conflict errors		local version = 7 -- increment this each time the below logic is changed to avoid conflict errors

	if statement.snaks then		if statement.snaks then
Line 1,980:		Line 1,980:
	citeQ = split(mw.wikibase.getSitelink(aliasesQ.citeQ) or "", ":")[2] -- split off namespace from front		citeQ = split(mw.wikibase.getSitelink(aliasesQ.citeQ) or "", ":")[2] -- split off namespace from front

	-- (1) use the general template for citing web references if there is a match and if at least ~~both~~ "reference URL" ~~and "title" are~~ present		-- (1) use the general template for citing web references if there is a match and if at least "reference URL" is present
	if citeWeb and not citeMismatch['web'] and citeParams['web'][i18n['cite']['web'][aliasesP.referenceURL~~]] and citeParams['web'][i18n['cite']['web'][aliasesP.title~~]] then		if citeWeb and not citeMismatch['web'] and citeParams['web'][i18n['cite']['web'][aliasesP.referenceURL]] then
	-- we need a processed "stated in" for this template		-- we need a processed "stated in" for this template
	citeParams['web'][i18n['cite']['web'][aliasesP.statedIn]] = self:getReferenceDetail(statement.snaks, aliasesP.statedIn, false, self.linked, true)		citeParams['web'][i18n['cite']['web'][aliasesP.statedIn]] = self:getReferenceDetail(statement.snaks, aliasesP.statedIn, false, self.linked, true)

Janhrach: Update from sandbox, see talk

2024-04-01T08:09:28Z

Update from sandbox, see talk

← Previous revision		Revision as of 08:09, 1 April 2024
Line 1,815:		Line 1,815:
	local numAuthorNameStringParameters = 0		local numAuthorNameStringParameters = 0
	local tempLink		local tempLink
	local additionalRefProperties = {} -- will hold properties of the reference which are not in statement.snaks, namely backup title from "subject named as" and ~~URL~~ from an external ID		local additionalRefProperties = {} -- will hold properties of the reference which are not in statement.snaks, namely backup title from "subject named as" and link from an external ID
	local wikidataPropertiesOfSource -- will contain "Wikidata property" properties of the item in stated in, if any		local wikidataPropertiesOfSource -- will contain "Wikidata property" properties of the item in stated in, if any

	local version = 5 -- increment this each time the below logic is changed to avoid conflict errors		local version = 6 -- increment this each time the below logic is changed to avoid conflict errors

	if statement.snaks then		if statement.snaks then
Line 1,859:		Line 1,859:
	-- "stated in" was given but "reference URL" was not.		-- "stated in" was given but "reference URL" was not.
	-- get "Wikidata property" properties from the item in "stated in"		-- get "Wikidata property" properties from the item in "stated in"
	-- if any of the returned properties of the external-id datatype is in statement.snaks, generate a ~~URL~~ from it and use the ~~URL~~ in the reference		-- if any of the returned properties of the external-id datatype is in statement.snaks, generate a link from it and use the link in the reference

	-- find the "Wikidata property" properties in the item from "stated in"		-- find the "Wikidata property" properties in the item from "stated in"
Line 1,867:		Line 1,867:
	tempLink = self.conf:getValue(statement.snaks[wikidataPropertyOfSource][1], false, true) -- not raw, linked		tempLink = self.conf:getValue(statement.snaks[wikidataPropertyOfSource][1], false, true) -- not raw, linked
	if mw.ustring.match(tempLink, "^%[%Z- %Z+%]$") then -- getValue returned a URL.		if mw.ustring.match(tempLink, "^%[%Z- %Z+%]$") then -- getValue returned a URL.
	additionalRefProperties[aliasesP.referenceURL] = mw.ustring.gsub(tempLink, "^%[(%Z-) %Z+%]$", "%1") -- the ~~URL~~ is in wiki markup, so strip the square brackets and the display text		additionalRefProperties[aliasesP.referenceURL] = mw.ustring.gsub(tempLink, "^%[(%Z-) %Z+%]$", "%1") -- the link is in wiki markup, so strip the square brackets and the display text
	statement.snaks[wikidataPropertyOfSource] = nil		statement.snaks[wikidataPropertyOfSource] = nil
	break		break
Line 1,890:		Line 1,890:
	if i == aliasesP.author or i == aliasesP.authorNameString then		if i == aliasesP.author or i == aliasesP.authorNameString then
	params[i] = self:getReferenceDetails(statement.snaks, i, false, self.linked, true) -- link = true/false, anyLang = true		params[i] = self:getReferenceDetails(statement.snaks, i, false, self.linked, true) -- link = true/false, anyLang = true
			elseif i == aliasesP.statedIn then
			-- Get "stated in" raw, as it is wanted (for Cite Q) even if it doesn't have a local language label.
		⚫	params[aliasesP.statedIn] = {self:getReferenceDetail(statement.snaks, aliasesP.statedIn, true)} -- raw = true
	else		else
	params[i] = {self:getReferenceDetail(statement.snaks, i, false, (self.linked ~~or (i == aliasesP.statedIn))~~ and (statement.snaks[i][1].datatype ~= 'url'), true)} -- link = true/false, anyLang = true		params[i] = {self:getReferenceDetail(statement.snaks, i, false, self.linked and (statement.snaks[i][1].datatype ~= 'url'), true)} -- link = true/false, anyLang = true
	end		end


	if #params[i] == 0 then		if #params[i] == 0 then
	params[i] = nil		params[i] = nil
Line 1,979:		Line 1,982:
	-- (1) use the general template for citing web references if there is a match and if at least both "reference URL" and "title" are present		-- (1) use the general template for citing web references if there is a match and if at least both "reference URL" and "title" are present
	if citeWeb and not citeMismatch['web'] and citeParams['web'][i18n['cite']['web'][aliasesP.referenceURL]] and citeParams['web'][i18n['cite']['web'][aliasesP.title]] then		if citeWeb and not citeMismatch['web'] and citeParams['web'][i18n['cite']['web'][aliasesP.referenceURL]] and citeParams['web'][i18n['cite']['web'][aliasesP.title]] then
		⚫	-- we need a processed "stated in" for this template
			citeParams['web'][i18n['cite']['web'][aliasesP.statedIn]] = self:getReferenceDetail(statement.snaks, aliasesP.statedIn, false, self.linked, true)
	useCite = citeWeb		useCite = citeWeb
	useParams = citeParams['web']		useParams = citeParams['web']
Line 1,984:		Line 1,989:
	-- (2) use the template that expands stated-in references into citations if there is a match and if at least "stated in" is present		-- (2) use the template that expands stated-in references into citations if there is a match and if at least "stated in" is present
	elseif citeQ and not citeMismatch['q'] and citeParams['q'][i18n['cite']['q'][aliasesP.statedIn]] then		elseif citeQ and not citeMismatch['q'] and citeParams['q'][i18n['cite']['q'][aliasesP.statedIn]] then
⚫	-- we need ~~the~~ ~~raw~~ "stated in" ~~Q-identifier~~ for ~~the~~ this template
⚫	~~citeParams['q'][i18n['cite']['q']~~[aliasesP.statedIn]] = self:getReferenceDetail(statement.snaks, aliasesP.statedIn, true) -- raw = true

	useCite = citeQ		useCite = citeQ
	useParams = citeParams['q']		useParams = citeParams['q']