Skip to content

updated map keywords, show ? on invalid map sizes and avoid inconsistent size keywords #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated map keywords, show ? on invalid map sizes and avoid inconsistent size keywords #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e852ad9
updated map keywords, show ? on invalid map sizes and avoid inconsist…
springraaar Aug 14, 2024
037b208
Merge branch 'master' of https://github.com/springraaar/upq
springraaar Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/extract_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,10 +597,11 @@ def getVersionSortNumber(version):
result = 0

return result


# copy keywords from previously added files corresponding to different versions of the same item, excluding the map size ones
def addInheritedKeywords(db,fid,nameWithoutVersion):
nameWithoutVersion = nameWithoutVersion.replace("'","\\'")
db.query("INSERT IGNORE INTO file_keyword (SELECT DISTINCT %d,keyword FROM file_keyword fk INNER JOIN file f ON (fk.fid=f.fid) WHERE f.name_without_version='%s')" % (fid,nameWithoutVersion))
db.query("INSERT IGNORE INTO file_keyword (SELECT DISTINCT %d,keyword FROM file_keyword fk INNER JOIN file f ON (fk.fid=f.fid) WHERE f.name_without_version='%s' AND fk.keyword NOT IN ('small','medium','large'))" % (fid,nameWithoutVersion))

def setSizeKeywords(db,fid,width,height):
kw = "small"
Expand Down
Loading