deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-21 06:31:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Updated <UserMultiAttribute>.location.buildingid <String> to allow non-validated building IDs

Browse Source
This commit is contained in:
Ross Scroggs
2024-03-09 07:06:45 -08:00
parent f88a125966
commit be0eff7e14
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GamUpdate.txt
View File

@@ -2,6 +2,11 @@
Merged GAM-Team version
6.71.23
Updated `<UserMultiAttribute>.location.buildingid <String>` to allow non-validated building IDs
by specifying `nv:` at the beginning of `<String>`; e.g., `nv:Building X' sets the building ID to `Building X`.
6.71.12
Added option `showmimetype category <MimeTypeNameList>` to `gam <UserTypeEntity> print|show filecounts|filelist|filetree`

8
src/gam/__init__.py
View File

@@ -34822,13 +34822,15 @@ def _makeBuildingIdNameMap(cd=None):
GM.Globals[GM.MAP_BUILDING_ID_TO_NAME][building['buildingId']] = building['buildingName']
GM.Globals[GM.MAP_BUILDING_NAME_TO_ID][building['buildingName']] = building['buildingId']
def _getBuildingByNameOrId(cd, minLen=1):
def _getBuildingByNameOrId(cd, minLen=1, allowNV=False):
which_building = getString(Cmd.OB_BUILDING_ID, minLen=minLen)
if not which_building or (minLen == 0 and which_building in {'id:', 'uid:'}):
return ''
cg = UID_PATTERN.match(which_building)
if cg:
return cg.group(1)
if allowNV and which_building.startswith('nv:'):
return which_building[3:]
if GM.Globals[GM.MAKE_BUILDING_ID_NAME_MAP]:
_makeBuildingIdNameMap(cd)
# Exact name match, return ID
@@ -34867,7 +34869,7 @@ def _getBuildingByNameOrId(cd, minLen=1):
def _getBuildingNameById(cd, buildingId):
if GM.Globals[GM.MAKE_BUILDING_ID_NAME_MAP]:
_makeBuildingIdNameMap(cd)
return GM.Globals[GM.MAP_BUILDING_ID_TO_NAME].get(buildingId, 'UNKNOWN')
return GM.Globals[GM.MAP_BUILDING_ID_TO_NAME].get(buildingId, buildingId)
# gam update building <BuildIngID> <BuildingAttribute>*
def doUpdateBuilding():
@@ -41354,7 +41356,7 @@ def getUserAttributes(cd, updateCmd, noUid=False):
elif argument == 'area':
entry['area'] = getString(Cmd.OB_STRING)
elif argument in {'building', 'buildingid'}:
entry['buildingId'] = _getBuildingByNameOrId(cd)
entry['buildingId'] = _getBuildingByNameOrId(cd, allowNV=True)
elif argument in {'floor', 'floorname'}:
entry['floorName'] = getString(Cmd.OB_STRING, minLen=0)
elif argument in {'section', 'floorsection'}: