See CHANGELOG tag-1.0-20210114

XSEDE · Jan 14, 2021 · c8418bc · c8418bc
1 parent ea30f55
commit c8418bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+tag-1.0-20210114 JP
+ - Fix RDR Organization load
+
 tag-1.0-20210105 JP
  - Format Description additions as lists
 

diff --git a/bin/route_resource_v3.py b/bin/route_resource_v3.py
@@ -1421,7 +1421,7 @@ def Write_RSP_Packaged_Software(self, content, contype, config):
  #####################################################################
  # Function for loading RDR (Resource Description Repository) data
  # Load RDR's organization data to ResourceV3 tables (local, standard)
- # This function populates self.RDRPROVIDER_URNMAP
+ # This function clears and re-populates self.RDRPROVIDER_URNMAP in each iteration
  #
  def Write_RDR_Providers(self, content, contype, config):
  start_utc = datetime.now(timezone.utc)
@@ -1431,6 +1431,7 @@ def Write_RDR_Providers(self, content, contype, config):
  self.PROCESSING_SECONDS[me] = getattr(self.PROCESSING_SECONDS, me, 0)
  localUrlPrefix = config['SOURCEDEFAULTURL'] + '/xsede-api/provider/rdr/v1/organizations/'
 
+ self.RDRPROVIDER_URNMAP = {} # Clear
  cur = {} # Current items
  new = {} # New items
  # get existing organization data from local table
@@ -1497,8 +1498,6 @@ def Write_RDR_Providers(self, content, contype, config):
  msg = '{} saving resource ID={}: {}'.format(type(e).__name__, myGLOBALURN, e)
  self.logger.error(msg)
  return(False, msg)
-
-
 
  self.logger.debug('{} updated resource ID={}'.format(contype, myGLOBALURN))
  self.STATS.update({me + '.Update'})