Module:Wd/sandbox - Revision history

Janhrach: bugfix

2025-01-24T19:16:34Z

bugfix

← Previous revision		Revision as of 19:16, 24 January 2025
Line 1,961:		Line 1,961:

	local thisParamPriority = -1		local thisParamPriority = -1
	~~for~~ ~~i_priority,~~ ~~i_property~~ ~~in ipairs(~~citeConfig[citeType]["prioritization"][paramName]~~) do~~		local thisParamPrioritization = citeConfig[citeType]["prioritization"][paramName]
	if ~~i_property == refProperty~~ then		if thisParamPrioritization then
	~~thisParamPriority =~~ i_priority		for i_priority, i_property in ipairs() do
	~~end~~		if i_property == refProperty then
	~~end~~		thisParamPriority = i_priority
			end
			end
			end

	for _, propertyValue in pairs(processedProperty) do		for _, propertyValue in pairs(processedProperty) do

Janhrach: implement thisParamPriority

2025-01-24T19:13:23Z

implement thisParamPriority

← Previous revision		Revision as of 19:13, 24 January 2025
Line 1,897:		Line 1,897:
	-- fill candidateParams		-- fill candidateParams
	for _, citeType in ipairs(citeTypes) do		for _, citeType in ipairs(citeTypes) do
			local candidateParamPriorities = {}
	-- TODO add candidateParamOrigin

	-- TODO ordered addition into candidateParams		-- TODO ordered addition into candidateParams
	for refProperty in pairs(statement.snaks) do		for refProperty in pairs(statement.snaks) do
Line 1,953:		Line 1,954:
	referenceEmpty = false		referenceEmpty = false

	-- add an entry to candidateParams		-- add an entry to candidateParams and candidateParamPriorities
	if not candidateParams[citeType][paramName] then		if not candidateParams[citeType][paramName] then
	candidateParams[citeType][paramName] = {}		candidateParams[citeType][paramName] = {}
			candidateParamPriorities[paramName] = {}
	end		end

			local thisParamPriority = -1
			for i_priority, i_property in ipairs(citeConfig[citeType]["prioritization"][paramName]) do
			if i_property == refProperty then
			thisParamPriority = i_priority
			end
			end

	for _, propertyValue in pairs(processedProperty) do		for _, propertyValue in pairs(processedProperty) do
	table.insert(candidateParams[citeType][paramName], prefix .. propertyValue)		table.insert(candidateParams[citeType][paramName], prefix .. propertyValue)
			table.insert(candidateParamPriorities[paramName], thisParamPriority)
	end		end
	until true		until true

Janhrach: "TODO" notes for me

2024-12-27T15:33:24Z

"TODO" notes for me

← Previous revision		Revision as of 15:33, 27 December 2024
Line 1,880:		Line 1,880:
	end		end

			-- TODO reimplement using prioritization
	-- don't include "subject named as", but use it as the title when "title" is not present but a URL is		-- don't include "subject named as", but use it as the title when "title" is not present but a URL is
	if statement.snaks[aliasesP.subjectNamedAs] then		if statement.snaks[aliasesP.subjectNamedAs] then
Line 1,896:		Line 1,897:
	-- fill candidateParams		-- fill candidateParams
	for _, citeType in ipairs(citeTypes) do		for _, citeType in ipairs(citeTypes) do
			-- TODO add candidateParamOrigin
			-- TODO ordered addition into candidateParams
	for refProperty in pairs(statement.snaks) do		for refProperty in pairs(statement.snaks) do
	if citeErrors[citeType] then		if citeErrors[citeType] then

Janhrach: fixing my mistake

2024-12-27T15:27:22Z

fixing my mistake

@@ Line 1,832: / Line 1,832: @@
 	local referenceEmpty = true  -- will be set to false if at least one parameter is left unremoved
-	local version = 11  -- increment this each time the below logic is changed to avoid conflict errors
+	local version = 12  -- increment this each time the below logic is changed to avoid conflict errors
 	if not statement.snaks then
@@ Line 1,896: / Line 1,896: @@
 	-- fill candidateParams
 	for _, citeType in ipairs(citeTypes) do
-						mappingKey = "external-id"
+				local prefix = ""
-						prefix = self.conf:getLabel(refProperty)
+				if statement.snaks[refProperty][1].datatype == 'external-id' then
-						if prefix ~= "" then
+					prefix = self.conf:getLabel(refProperty)
 					end
+				else
 					referenceEmpty = false
 		end
 	end

Janhrach: control-flow tweaks in the code for filling candidateParams

2024-12-27T15:19:02Z

control-flow tweaks in the code for filling candidateParams

Show changes

Janhrach: rename groupedProcessedProperties to candidateParams

2024-12-27T15:01:28Z

rename groupedProcessedProperties to candidateParams

← Previous revision		Revision as of 15:01, 27 December 2024
Line 1,824:		Line 1,824:
	-- for each citation type, there will be an associative array that associates lists of rendered properties		-- for each citation type, there will be an associative array that associates lists of rendered properties
	-- to citation-template parameters		-- to citation-template parameters
	local ~~groupedProcessedProperties~~ = {}		local candidateParams = {}
	-- like above, but only associates one rendered property to each parameter; if the above variable		-- like above, but only associates one rendered property to each parameter; if the above variable
	-- contains more strings for a parameter, the strings will be assigned to numbered params (e.g. "author1")		-- contains more strings for a parameter, the strings will be assigned to numbered params (e.g. "author1")
Line 1,888:		Line 1,888:
	end		end

	-- initialize ~~groupedProcessedProperties~~ and citeParams		-- initialize candidateParams and citeParams
	for _, citeType in ipairs(citeTypes) do		for _, citeType in ipairs(citeTypes) do
	~~groupedProcessedProperties~~[citeType] = {}		candidateParams[citeType] = {}
	citeParams[citeType] = {}		citeParams[citeType] = {}
	end		end

	-- fill ~~groupedProcessedProperties~~		-- fill candidateParams
	for refProperty in pairs(statement.snaks) do		for refProperty in pairs(statement.snaks) do
	-- add the parameter to each matching type of citation		-- add the parameter to each matching type of citation
Line 1,952:		Line 1,952:
	end		end

	-- add an entry to ~~groupedProcessedProperties~~		-- add an entry to candidateParams
	if not ~~groupedProcessedProperties~~[citeType][paramName] then		if not candidateParams[citeType][paramName] then
	~~groupedProcessedProperties~~[citeType][paramName] = {}		candidateParams[citeType][paramName] = {}
	end		end
	for _, propertyValue in pairs(processedProperty) do		for _, propertyValue in pairs(processedProperty) do
	table.insert(~~groupedProcessedProperties~~[citeType][paramName], prefix .. propertyValue)		table.insert(candidateParams[citeType][paramName], prefix .. propertyValue)
	end		end
	until true		until true
Line 1,984:		Line 1,984:
	referenceEmpty = false		referenceEmpty = false

	if not ~~groupedProcessedProperties~~[citeType][paramName] then		if not candidateParams[citeType][paramName] then
	~~groupedProcessedProperties~~[citeType][paramName] = {}		candidateParams[citeType][paramName] = {}
	end		end
	for _, propertyValue in pairs(additionalProcessedProperties[refProperty]) do		for _, propertyValue in pairs(additionalProcessedProperties[refProperty]) do
	table.insert(~~groupedProcessedProperties~~[citeType][paramName], propertyValue)		table.insert(candidateParams[citeType][paramName], propertyValue)
	end		end
	until true		until true
Line 1,996:		Line 1,996:
	-- fill citeParams		-- fill citeParams
	for _, citeType in ipairs(citeTypes) do		for _, citeType in ipairs(citeTypes) do
	for paramName, paramValues in pairs(~~groupedProcessedProperties~~[citeType]) do		for paramName, paramValues in pairs(candidateParams[citeType]) do
	if #paramValues == 1 or not isValueInTable(paramName, citeConfig[citeType]["numbered-params"] or {}) then		if #paramValues == 1 or not isValueInTable(paramName, citeConfig[citeType]["numbered-params"] or {}) then
	citeParams[citeType][paramName] = paramValues[1]		citeParams[citeType][paramName] = paramValues[1]

Janhrach: add lastUpdate

2024-12-20T20:23:59Z

add lastUpdate

← Previous revision		Revision as of 20:23, 20 December 2024
Line 103:		Line 103:
	subjectNamedAs = "P1810",		subjectNamedAs = "P1810",
	wikidataProperty = "P1687",		wikidataProperty = "P1687",
	publishedIn = "P1433"		publishedIn = "P1433",
			lastUpdate = "P5017"
	}		}

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

2024-11-20T20:57:10Z

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

← Previous revision		Revision as of 20:57, 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 1249538546 by Janhrach (talk)

2024-10-05T14:23:40Z

Undid revision 1249538546 by Janhrach (talk)

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

Janhrach: add placeOfPublication

2024-10-05T13:03:27Z

add placeOfPublication

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