adiwg-mdtranslator 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa279b686cbbf45cc0066e9aef52a6c72604444
-  data.tar.gz: a88be00a70a91aae1cfb0d77ac333b758731c5e7
+  metadata.gz: 424da312bdcfc7617f563857a6e8767ebb3b3c4c
+  data.tar.gz: f35fdf24c6a34dd418bab443b39d4050a748cdbc
 SHA512:
-  metadata.gz: e755033a24e274d7af87523e5209a65d8b9b046a9e4967be02d407657475c8983c45fa1fb97260f9422ea39530f8e10e7f5456ff4afc4183800006ba813af0ff
-  data.tar.gz: a23c434be20d0309294c36133f2bcb2099883198c46c3fde5701361dfba854798ba156dbc2a5cb9916b7ae3aa213d58fb84126fbb88a70634698043c2132cdfc
+  metadata.gz: 4fb9075e39f5f0406ca5196353a7dd75a19735b0a72870f0d7a7814a3361a0390feec8080a6fa6fbf458fb7d46dd382f816e42db3fe955d1462e2248b0d51b38
+  data.tar.gz: 8db4fd7f94bac35cf98473c353dde6513e9dfc56347ca71218bf719d5919e28c533a47e532620d19ae52305c71c424a18e6d9055f1b8eb520cad16e016c24aad

data/adiwg-mdtranslator.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
    spec.test_files = spec.files.grep(%r{^(tc|test|spec|features)/})
    spec.require_paths = ["lib"]
 
-   spec.required_ruby_version = '>= 2.1'
+   spec.required_ruby_version = '>= 2.2'
 
    spec.add_development_dependency "bundler", "~> 1"
    spec.add_development_dependency "rake", "~> 10"
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
    spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.2"
-   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.1"
+   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.3"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"
    spec.add_runtime_dependency "coderay", "~> 1.1"

data/lib/adiwg/mdtranslator/readers/fgcd/version.rb

@@ -0,0 +1,14 @@
+# adiwg mdTranslator / readers / fgdc
+
+# version 1 history
+# 1.0.0 2017-07-11 version 1 FGDC CSDGM
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+            VERSION = "1.0.0"
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_browseCategory.rb

@@ -5,7 +5,7 @@
 #   Stan Smith 2016-06-22 original script
 
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
-require 'adiwg/mdtranslator/writers/sbJson/sections/sbJson_codelists'
+require_relative 'module_codelists'
 
 module ADIWG
    module Mdtranslator
@@ -14,8 +14,6 @@ module ADIWG
 
             module BrowseCategory
 
-               @Namespace = ADIWG::Mdtranslator::Writers::SbJson
-
                def self.unpack(hSbJson, hResourceInfo, hResponseObj)
 
                   # instance classes needed in script
@@ -24,7 +22,7 @@ module ADIWG
                   if hSbJson.has_key?('browseCategories')
                      hSbJson['browseCategories'].each do |category|
                         hResType = intMetadataClass.newResourceType
-                        scope = @Namespace::Codelists.codelist_iso_to_sb('iso_sb_scope', :sbCode => category)
+                        scope = Codelists.codelist_sb2adiwg('scope_sb2adiwg', category)
                         if scope.nil?
                            hResType[:type] = 'dataset'
                            hResType[:name] = category

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_codelists.rb

@@ -0,0 +1,196 @@
+# sbJson 1.0 reader
+
+# History:
+#  Stan Smith 2017-08-03 refactored - separated forward and reverse translations
+#  Stan Smith 2017-05-26 original script
+
+require 'adiwg-mdcodes'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module SbJson
+
+            module Codelists
+
+               @role_sb2adiwg = [
+                  {sb: 'administrator', adiwg: 'administrator'},
+                  {sb: 'Associate Project Chief', adiwg: nil},
+                  {sb: 'Author', adiwg: 'author'},
+                  {sb: 'client', adiwg: 'client'},
+                  {sb: 'Co-Investigator', adiwg: 'coPrincipalInvestigator'},
+                  {sb: 'Contact', adiwg: 'pointOfContact'},
+                  {sb: 'Cooperator/Partner', adiwg: 'collaborator'},
+                  {sb: 'Custodian', adiwg: 'custodian'},
+                  {sb: 'Data Owner', adiwg: 'owner'},
+                  {sb: 'Data Provider', adiwg: nil},
+                  {sb: 'Distributor', adiwg: 'distributor'},
+                  {sb: 'Editor', adiwg: 'editor'},
+                  {sb: 'funder', adiwg: 'funder'},
+                  {sb: 'Funding Agency', adiwg: nil},
+                  {sb: 'Lead Organization', adiwg: nil},
+                  {sb: 'logistics', adiwg: 'logistics'},
+                  {sb: 'Material Request Contact', adiwg: nil},
+                  {sb: 'mediator', adiwg: 'mediator'},
+                  {sb: 'Metadata Contact', adiwg: nil},
+                  {sb: 'Originator', adiwg: 'originator'},
+                  {sb: 'Participant', adiwg: nil},
+                  {sb: 'Photographer', adiwg: nil},
+                  {sb: 'Point of Contact', adiwg: 'pointOfContact'},
+                  {sb: 'Principal Investigator', adiwg: 'principalInvestigator'},
+                  {sb: 'Process Contact', adiwg: nil},
+                  {sb: 'Processor', adiwg: 'processor'},
+                  {sb: 'Project Chief', adiwg: nil},
+                  {sb: 'Project Team', adiwg: nil},
+                  {sb: 'publisher', adiwg: 'publisher'},
+                  {sb: 'Referred By', adiwg: nil},
+                  {sb: 'Report Prepared By', adiwg: nil},
+                  {sb: 'Resource Provider', adiwg: 'resourceProvider'},
+                  {sb: 'SoftwareEngineer', adiwg: nil},
+                  {sb: 'sponsor', adiwg: 'sponsor'},
+                  {sb: 'stakeholder', adiwg: 'stakeholder'},
+                  {sb: 'Subtask Leader', adiwg: nil},
+                  {sb: 'Supporter', adiwg: nil},
+                  {sb: 'Task Leader', adiwg: nil},
+                  {sb: 'Transmitted', adiwg: nil},
+                  {sb: 'User', adiwg: 'use'},
+                  {sb: 'USGS Mission Area', adiwg: nil},
+                  {sb: 'USGS Program', adiwg: nil},
+               ]
+
+               @onlineFunction_sb2adiwg = [
+                  {sb: 'arcgis', adiwg: nil},
+                  {sb: 'browseImage', adiwg: 'browseGraphic'},
+                  {sb: 'browsing', adiwg: 'browsing'},
+                  {sb: 'citation', adiwg: nil},
+                  {sb: 'configFile', adiwg: nil},
+                  {sb: 'download',adiwg: 'download' },
+                  {sb: 'emailService', adiwg: 'emailService'},
+                  {sb: 'fileAccess', adiwg: 'fileAccess'},
+                  {sb: 'kml', adiwg: nil},
+                  {sb: 'mapapp', adiwg: nil},
+                  {sb: 'method', adiwg: nil},
+                  {sb: 'oai-pmh', adiwg: nil},
+                  {sb: 'offlineAccess', adiwg: 'offlineAccess'},
+                  {sb: 'order', adiwg: 'order'},
+                  {sb: 'originalMetadata', adiwg: 'completeMetadata'},
+                  {sb: 'pdf', adiwg: nil},
+                  {sb: 'publicationReferenceSource', adiwg: nil},
+                  {sb: 'repo', adiwg: nil},
+                  {sb: 'search', adiwg: 'search'},
+                  {sb: 'serviceCapabilitiesUrl', adiwg: nil},
+                  {sb: 'serviceFeatureInfoUrl', adiwg: nil},
+                  {sb: 'serviceLegendUrl', adiwg: nil},
+                  {sb: 'serviceLink', adiwg: nil},
+                  {sb: 'serviceMapUrl', adiwg: nil},
+                  {sb: 'serviceWfsBackingUrl', adiwg: nil},
+                  {sb: 'sitemap', adiwg: nil},
+                  {sb: 'sourceCode', adiwg: nil},
+                  {sb: 'txt', adiwg: nil},
+                  {sb: 'upload', adiwg: 'upload'},
+                  {sb: 'WAF', adiwg: nil},
+                  {sb: 'webapp', adiwg: 'webApplication'},
+                  {sb: 'webLink', adiwg: 'information'},
+                  {sb: 'xls', adiwg: nil},
+                  {sb: 'zip', adiwg: nil}
+               ]
+
+               @scope_sb2adiwg = [
+                  {sb: 'Collection', adiwg: 'collection'},
+                  {sb: 'Data', adiwg: 'dataset'},
+                  {sb: 'Data Release - In Progress', adiwg: nil},
+                  {sb: 'Image', adiwg: 'photographicImage'},
+                  {sb: 'Map', adiwg: 'map'},
+                  {sb: 'Physical Item', adiwg: 'sample'},
+                  {sb: 'Project', adiwg: 'project'},
+                  {sb: 'Publication', adiwg: 'publication'},
+                  {sb: 'Software', adiwg: 'software'},
+                  {sb: 'Web Site', adiwg: 'website'}
+               ]
+
+               @date_sb2adiwg = [
+                  {sb: 'Acquisition', adiwg: 'acquisition'},
+                  {sb: 'adopted', adiwg: 'adopted'},
+                  {sb: 'AssessmentDate', adiwg: 'assessment'},
+                  {sb: 'Award', adiwg: 'award'},
+                  {sb: 'beginPosition', adiwg: nil},
+                  {sb: 'Collected', adiwg: 'collected'},
+                  {sb: 'creation', adiwg: 'creation'},
+                  {sb: 'deprecated', adiwg: 'deprecated'},
+                  {sb: 'distribution', adiwg: 'distribution'},
+                  {sb: 'Due', adiwg: 'due'},
+                  {sb: 'End', adiwg: 'end'},
+                  {sb: 'endPosition', adiwg: nil},
+                  {sb: 'firstProcessed', adiwg: nil},
+                  {sb: 'info', adiwg: nil},
+                  {sb: 'inForce', adiwg: 'inForce'},
+                  {sb: 'lastProcessed', adiwg: nil},
+                  {sb: 'lastRevision', adiwg: 'lastRevision'},
+                  {sb: 'lastUpdate', adiwg: 'lastUpdate'},
+                  {sb: 'nextUpdate', adiwg: 'nextUpdate'},
+                  {sb: 'Publication', adiwg: 'publication'},
+                  {sb: 'Received', adiwg: 'received'},
+                  {sb: 'Release', adiwg: 'released'},
+                  {sb: 'Reported', adiwg: 'reported'},
+                  {sb: 'Repository Created', adiwg: nil},
+                  {sb: 'Repository Updated', adiwg: nil},
+                  {sb: 'revision', adiwg: 'revision'},
+                  {sb: 'Start', adiwg: 'start'},
+                  {sb: 'suspended', adiwg: 'suspended'},
+                  {sb: 'Transmitted', adiwg: 'transmitted'},
+                  {sb: 'unavailable', adiwg: 'unavailable'},
+                  {sb: 'validityBegins', adiwg: 'validityBegins'},
+                  {sb: 'validityExpires', adiwg: 'validityExpires'}
+               ]
+
+               @progress_sb2adiwg = [
+                  {sb: 'Active', adiwg: 'onGoing'},
+                  {sb: 'Approved', adiwg: 'accepted'},
+                  {sb: 'Completed', adiwg: 'completed'},
+                  {sb: 'In Progress', adiwg: 'onGoing'},
+                  {sb: 'Proposed', adiwg: 'proposed'}
+               ]
+
+               @association_sb2adiwg = [
+                  {sb: 'alternate', adiwg: 'alternate', reverse: 'alternate'},
+                  {sb: 'constituentOf', adiwg: 'isComposedOf', reverse: 'constituent'},
+                  {sb: 'copiedFrom', adiwg: nil, reverse: 'copiedInto'},
+                  {sb: 'derivativeOf', adiwg: 'derivativeProduct', reverse: 'derived'},
+                  {sb: 'precededBy', adiwg: nil, reverse: 'succeededBy'},
+                  {sb: 'productOf', adiwg: 'parentProject', reverse: 'produced'},
+                  {sb: 'related', adiwg: 'crossReference', reverse: 'related'},
+                  {sb: 'subprojectOf', adiwg: 'subProject', reverse: 'mainprojectOf'}
+               ]
+
+               # translate iso/adiwg code to sb
+               def self.codelist_sb2adiwg(codelist, sbCode)
+                  codeList = instance_variable_get("@#{codelist}")
+                  unless sbCode.nil?
+                     codeList.each do |obj|
+                        if obj[:sb] == sbCode
+                           return obj[:adiwg]
+                        end
+                     end
+                  end
+                  return nil
+               end
+
+               # test if provided code is a valid sb code
+               def self.is_sb_code(codelist, sbCode)
+                  codeList = instance_variable_get("@#{codelist}")
+                  unless sbCode.nil?
+                     codeList.each do |obj|
+                        if obj[:sb] == sbCode
+                           return true
+                        end
+                     end
+                  end
+                  return false
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_date.rb

@@ -5,7 +5,7 @@
 #   Stan Smith 2016-06-25 original script
 
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
-require 'adiwg/mdtranslator/writers/sbJson/sections/sbJson_codelists'
+require_relative 'module_codelists'
 
 module ADIWG
    module Mdtranslator
@@ -14,8 +14,6 @@ module ADIWG
 
             module Date
 
-               @Namespace = ADIWG::Mdtranslator::Writers::SbJson
-
                def self.unpack(hSbJson, hCitation, hResponseObj)
 
                   # instance classes needed in script
@@ -29,8 +27,9 @@ module ADIWG
                            hDate[:date] = aReturn[0]
                            hDate[:dateResolution] = aReturn[1]
                            hDate[:description] = hSbDate['label']
-                           type = @Namespace::Codelists.codelist_iso_to_sb('iso_sb_date', :sbCode => hSbDate['type'])
-                           type = type.nil? ? hSbDate['type'] : type
+                           sbType = hSbDate['type']
+                           adiwgType = Codelists.codelist_sb2adiwg('date_sb2adiwg', sbType)
+                           type = adiwgType.nil? ? sbType : adiwgType
                            hDate[:dateType] = type
                            hCitation[:dates] << hDate
                         end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_extent.rb

@@ -21,7 +21,7 @@ module ADIWG
                      extentAdd = "http://www.sciencebase.gov/catalog/extent/#{extentId}?format=geojson"
                      web_contents = open(extentAdd, :read_timeout => 30) { |f| f.read }
                   rescue => readErr
-                     hResponseObj[:readerExecutionMessages] << 'ScienceBase read failed - see following message(s):\n'
+                     hResponseObj[:readerExecutionMessages] << 'Failed reading ScienceBase extent - see following message(s):\n'
                      hResponseObj[:readerExecutionMessages] << readErr.to_s.slice(0, 300)
                      return {}
                   else
@@ -29,7 +29,7 @@ module ADIWG
                      begin
                         hGeoJson = JSON.parse(web_contents)
                      rescue JSON::JSONError => parseErr
-                        hResponseObj[:readerExecutionMessages] << 'Parsing sbJson failed - see following message(s):\n'
+                        hResponseObj[:readerExecutionMessages] << 'Parsing extent failed - see following message(s):\n'
                         hResponseObj[:readerExecutionMessages] << parseErr.to_s.slice(0, 300)
                         return {}
                      end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_project.rb

@@ -4,7 +4,7 @@
 # History:
 #   Stan Smith 2016-06-27 original script
 
-require 'adiwg/mdtranslator/writers/sbJson/sections/sbJson_codelists'
+require_relative 'module_codelists'
 
 module ADIWG
    module Mdtranslator
@@ -13,15 +13,13 @@ module ADIWG
 
             module Project
 
-               @Namespace = ADIWG::Mdtranslator::Writers::SbJson
-
                def self.unpack(hFacet, hResourceInfo, hResponseObj)
 
                   # project status
                   if hFacet.has_key?('projectStatus')
                      unless hFacet['projectStatus'].nil? || ['projectStatus'] == ''
                         sbStatus = hFacet['projectStatus']
-                        status = @Namespace::Codelists.codelist_iso_to_sb('iso_sb_progress', :sbCode => sbStatus)
+                        status = Codelists.codelist_sb2adiwg('progress_sb2adiwg', sbStatus)
                         status = status.nil? ? sbStatus : status
                         hResourceInfo[:status] << status
                      end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_publication.rb

@@ -5,7 +5,7 @@
 #   Stan Smith 2016-06-25 original script
 
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
-require 'adiwg/mdtranslator/writers/sbJson/sections/sbJson_codelists'
+require_relative 'module_codelists'
 
 module ADIWG
    module Mdtranslator
@@ -16,8 +16,6 @@ module ADIWG
 
                def self.unpack(hFacet, hResourceInfo, hCitation, hResponseObj)
 
-                  @Namespace = ADIWG::Mdtranslator::Writers::SbJson
-
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
 
@@ -26,8 +24,8 @@ module ADIWG
                      unless hFacet['citationType'].nil? || hFacet['citationType'] == ''
                         hResType = intMetadataClass.newResourceType
                         sbType = hFacet['citationType']
-                        type = @Namespace::Codelists.codelist_iso_to_sb('iso_sb_scope', :sbCode => sbType)
-                        type = type.nil? ? sbType : type
+                        adiwgType = Codelists.codelist_sb2adiwg('scope_sb2adiwg', sbType)
+                        type = adiwgType.nil? ? sbType : adiwgType
                         hResType[:type] = type
                         hResType[:name] = sbType
                         hResourceInfo[:resourceTypes] << hResType

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_relatedItem.rb

@@ -0,0 +1,178 @@
+# unpack related items
+# Reader - ScienceBase JSON to internal data structure
+
+# History:
+#   Stan Smith 2016-08-03 original script
+
+require 'json'
+require 'open-uri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_codelists'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module SbJson
+
+            module RelatedItem
+
+               def self.unpack(hSbJson, hMetadata, hResponseObj)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  # relationship direction of related items depends on the main record id
+                  sbId = nil
+                  if hSbJson.has_key?('id')
+                     sbId = hSbJson['id']
+                  end
+                  if sbId.nil? || sbId == ''
+                     hResponseObj[:readerExecutionMessages] << 'ScienceBase id missing'
+                     return hMetadata
+                  end
+
+                  # get the link to the related items array
+                  hRelatedItems = hSbJson['relatedItems']
+                  itemsLink = nil
+                  if hRelatedItems.has_key?('link')
+                     hLink = hRelatedItems['link']
+                     unless hLink.empty?
+                        itemsLink = hLink['url']
+                     end
+                  end
+                  return hMetadata if itemsLink.nil?
+
+                  # fetch the related items array in json format
+                  itemsLink = itemsLink + '&format=json'
+                  begin
+                     web_contents = open(itemsLink, :read_timeout => 30) { |f| f.read }
+                  rescue => readErr
+                     hResponseObj[:readerExecutionMessages] << "Failed reading ScienceBase relatedItems #{itemsLink} - see following message(s):\n"
+                     hResponseObj[:readerExecutionMessages] << readErr.to_s.slice(0, 300)
+                     return hMetadata
+                  else
+                     # parse related items array
+                     aItems = []
+                     begin
+                        aItems = JSON.parse(web_contents)
+                     rescue JSON::JSONError => parseErr
+                        hResponseObj[:readerExecutionMessages] << 'Parsing related links failed - see following message(s):\n'
+                        hResponseObj[:readerExecutionMessages] << parseErr.to_s.slice(0, 300)
+                        return hMetadata
+                     end
+
+                     # process each returned related item as a separate associated resource
+                     aItems.each do |hItem|
+                        unless hItem.empty?
+
+                           # determine relationship direction
+                           forward = nil
+                           if hItem.has_key?('itemId')
+                              forward = true if sbId == hItem['itemId']
+                           end
+                           if hItem.has_key?('relatedItemId')
+                              forward = false if sbId == hItem['relatedItemId']
+                           end
+                           if forward.nil?
+                              hResponseObj[:readerExecutionMessages] << 'Main ScienceBase id was not referenced in related item'
+                              return hMetadata
+                           end
+
+                           # fetch resourceTypes from related item
+                           if forward
+                              resourceId = hItem['relatedItemId']
+                           else
+                              resourceId = hItem['itemId']
+                           end
+                           resourceLink = "https://www.sciencebase.gov/catalog/item/#{resourceId}?format=json"
+                           begin
+                              web_contents = open(resourceLink, :read_timeout => 30) { |f| f.read }
+                           rescue => readErr
+                              hResponseObj[:readerExecutionMessages] << "Failed reading ScienceBase relatedItem #{resourceId} - see following message(s)"
+                              hResponseObj[:readerExecutionMessages] << readErr.to_s.slice(0, 300)
+                              hResponseObj[:readerExecutionMessages] << 'Either the item does not exist or the item is secured and requires authentication to access.'
+                              break
+                           else
+                              # parse related item
+                              begin
+                                 hRelatedItem = JSON.parse(web_contents)
+                              rescue JSON::JSONError => parseErr
+                                 hResponseObj[:readerExecutionMessages] << 'Parsing related item failed - see following message(s):\n'
+                                 hResponseObj[:readerExecutionMessages] << parseErr.to_s.slice(0, 300)
+                                 break
+                              end
+
+                              # create mew associated resource
+                              hResource = intMetadataClass.newAssociatedResource
+
+                              if hRelatedItem.has_key?('browseCategories')
+                                 aBrowse = hRelatedItem['browseCategories']
+                                 aBrowse.each do |category|
+                                    resourceType = Codelists.codelist_sb2adiwg('scope_sb2adiwg', category)
+                                    resourceType = resourceType.nil? ? category : resourceType
+                                    hResource[:resourceTypes] << resourceType
+                                 end
+                              else
+                                 hResponseObj[:readerExecutionMessages] << "Related item #{resourceId} did not have browseCategories"
+                              end
+
+                              # fill in associated resource citation
+                              hCitation = intMetadataClass.newCitation
+                              citationTitle = nil
+                              if hItem.has_key?('relatedItemTitle')
+                                 citationTitle = hItem['relatedItemTitle'] if forward
+                              end
+                              if hItem.has_key?('title')
+                                 citationTitle = hItem['title'] unless forward
+                              end
+                              hCitation[:title] = citationTitle
+
+                              # create an identifier for each related item id
+                              if hItem.has_key?('id')
+                                 hIdentifier = intMetadataClass.newIdentifier
+                                 hIdentifier[:identifier] = hItem['id']
+                                 hIdentifier[:namespace] = 'gov.sciencebase.catalog'
+                                 hIdentifier[:description] = 'id'
+                                 hCitation[:identifiers] << hIdentifier
+                              end
+                              if hItem.has_key?('itemId')
+                                 hIdentifier = intMetadataClass.newIdentifier
+                                 hIdentifier[:identifier] = hItem['itemId']
+                                 hIdentifier[:namespace] = 'gov.sciencebase.catalog'
+                                 hIdentifier[:description] = 'itemId'
+                                 hCitation[:identifiers] << hIdentifier
+                              end
+                              if hItem.has_key?('relatedItemId')
+                                 hIdentifier = intMetadataClass.newIdentifier
+                                 hIdentifier[:identifier] = hItem['relatedItemId']
+                                 hIdentifier[:namespace] = 'gov.sciencebase.catalog'
+                                 hIdentifier[:description] = 'relatedItemId'
+                                 hCitation[:identifiers] << hIdentifier
+                              end
+                              if hItem.has_key?('itemLinkTypeId')
+                                 hIdentifier = intMetadataClass.newIdentifier
+                                 hIdentifier[:identifier] = hItem['itemLinkTypeId']
+                                 hIdentifier[:namespace] = 'gov.sciencebase.catalog'
+                                 hIdentifier[:description] = 'itemLinkTypeId'
+                                 hCitation[:identifiers] << hIdentifier
+                              end
+
+                              hResource[:resourceCitation] = hCitation
+                              hMetadata[:associatedResources] << hResource
+
+                           end
+
+                        end
+                     end
+
+                     return hMetadata
+                  end
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_sbJson.rb

@@ -27,6 +27,7 @@ require_relative 'module_budget'
 require_relative 'module_publication'
 require_relative 'module_project'
 require_relative 'module_extent'
+require_relative 'module_relatedItem'
 
 module ADIWG
    module Mdtranslator
@@ -146,6 +147,11 @@ module ADIWG
                      end
                   end
 
+                  # related items
+                  if hSbJson.has_key?('relatedItems')
+                     RelatedItem.unpack(hSbJson, hMetadata, hResponseObj)
+                  end
+
                   hResourceInfo[:citation] = hCitation
                   hMetadata[:metadataInfo] = hMetadataInfo
                   hMetadata[:resourceInfo] = hResourceInfo

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_tag.rb

@@ -14,8 +14,6 @@ module ADIWG
 
             module Tag
 
-               @Namespace = ADIWG::Mdtranslator::Writers::SbJson
-
                def self.unpack(hSbJson, hResourceInfo, hResponseObj)
 
                   # instance classes needed in script

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,7 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.1.0 2017-08-10 revisions to sbJson reader
 # 2.0.0 2017-06-28 added sbJson reader
 # 2.0.0rc13 2017-06-16 apply changes to sbJson writer after fourth review session
 # 2.0.0rc12 2017-06-14 apply changes to sbJson writer after third review session
@@ -21,7 +22,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.0.0"
+      VERSION = "2.1.0"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_browseCategory.rb

@@ -22,7 +22,7 @@ module ADIWG
 
                   aTypes.each do |hType|
                      type = hType[:type]
-                     sbType = Codelists.codelist_iso_to_sb('iso_sb_scope', :isoCode => type)
+                     sbType = Codelists.codelist_adiwg2sb('scope_adiwg2sb', type)
                      aCategories << sbType unless sbType.nil?
                   end
 

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_citation.rb

@@ -44,7 +44,7 @@ module ADIWG
                      hContact = ADIWG::Mdtranslator::Writers::SbJson.get_contact_by_index(hIndex[:index])
                      unless hContact.empty?
                         unless hContact[:name].nil?
-                           sbRole = Codelists.codelist_iso_to_sb('iso_sb_role', :isoCode => hIndex[:role])
+                           sbRole = Codelists.codelist_adiwg2sb('role_adiwg2sb', hIndex[:role])
                            sbRole = sbRole.nil? ? hIndex[:role] : sbRole
                            citation += hContact[:name] + '(' + sbRole + '), '
                         end
@@ -54,7 +54,7 @@ module ADIWG
                   # dates
                   hCitation[:dates].each do |hDate|
                      dateStr = AdiwgDateTimeFun.stringDateFromDateObject(hDate)
-                     dateType = Codelists.codelist_iso_to_sb('iso_sb_date', :isoCode => hDate[:dateType])
+                     dateType = Codelists.codelist_adiwg2sb('date_adiwg2sb', hDate[:dateType])
                      unless dateType.nil?
                         citation += dateStr + '(' + dateType + '), '
                      end