adiwg-mdtranslator 2.3.2 → 2.3.3

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

@@ -151,26 +151,36 @@ module ADIWG
                   {sb: 'Proposed', adiwg: 'proposed'}
                ]
 
-               @association_sb2adiwg_forward = [
+               # mdJson/mdTranslator view point is always: how the associated resource relates to the main resource
+               # dropped 'copiedFrom', 'copiedInfo' from translation tables
+
+               # scienceBaseId = relatedItemId (forward)
+               # assoc2main = the associated resource is (a) ___ of the main resource
+               # example = the associated resource is 'constituentOf' the main resource
+               # so the adiwg equivalent is 'ifPartOf'
+               @association_sb2adiwg_assoc2main = [
                   {sb: 'alternate', adiwg: 'alternate'},
-                  {sb: 'constituentOf', adiwg: 'isComposedOf'},
-                  {sb: 'copiedFrom', adiwg: 'copiedFrom'},
-                  {sb: 'derivativeOf', adiwg: 'derivativeProduct'},
-                  {sb: 'precededBy', adiwg: 'precededBy'},
+                  {sb: 'constituentOf', adiwg: 'isPartOf'},
+                  {sb: 'derivativeOf', adiwg: 'derivativeResource'},
+                  {sb: 'precededBy', adiwg: 'series'},
                   {sb: 'productOf', adiwg: 'product'},
                   {sb: 'related', adiwg: 'crossReference'},
                   {sb: 'subprojectOf', adiwg: 'subProject'}
                ]
 
-               @association_sb2adiwg_reverse = [
+               # scienceBaseId = itemId (reverse)
+               # main2assoc = the main resource is (a) ___ of the associated resource
+               # example = the main resource is 'constituentOf' the associated resource
+               # reverse the direction for mdJson/mdTranslator which is mono-directional
+               # so the adiwg equivalent is 'isComposedOf'
+               @association_sb2adiwg_main2assoc = [
                   {sb: 'alternate', adiwg: 'alternate'},
-                  {sb: 'constituent', adiwg: 'isComposedOf'},
-                  {sb: 'copiedInto', adiwg: 'copiedFrom'},
-                  {sb: 'derived', adiwg: 'derivativeProduct'},
-                  {sb: 'succeededBy', adiwg: 'precededBy'},
-                  {sb: 'produced', adiwg: 'product'},
+                  {sb: 'constituentOf', adiwg: 'isComposedOf'},
+                  {sb: 'derivativeOf', adiwg: 'source'},
+                  {sb: 'precededBy', adiwg: 'series'},
+                  {sb: 'productOf', adiwg: 'parentProject'},
                   {sb: 'related', adiwg: 'crossReference'},
-                  {sb: 'mainprojectOf', adiwg: 'subProject'}
+                  {sb: 'subprojectOf', adiwg: 'parentProject'}
                ]
 
                # translate iso/adiwg code to sb

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

@@ -87,20 +87,19 @@ module ADIWG
                         hContact[:contactId] = UUIDTools::UUID.random_create.to_s
 
                         # contact - contactType [ person | organization ]
+                        hContact[:isOrganization] = false
                         if hSbContact.has_key?('contactType')
                            if hSbContact['contactType'].nil? || hSbContact['contactType'] == ''
-                              hResponseObj[:readerExecutionMessages] << 'Contact contactType is missing'
-                              hContact[:isOrganization] = false
+                              hResponseObj[:readerExecutionMessages] << 'Contact contactType is empty, default to "person"'
                            elsif %w(person organization).include?(hSbContact['contactType'])
                               hContact[:isOrganization] = true if hSbContact['contactType'] == 'organization'
                            else
-                              hResponseObj[:readerExecutionMessages] << 'Contact contactType must be person or organization'
-                              hResponseObj[:readerExecutionPass] = false
-                              return nil
+                              hResponseObj[:readerExecutionMessages] << "Contact contactType cannot be '#{hSbContact['contactType']}'"
+                              hResponseObj[:readerExecutionMessages] << "Contact contactType set to 'person'"
                            end
                         else
                            hResponseObj[:readerExecutionMessages] << 'Contact contactType is missing'
-                           hContact[:isOrganization] = false
+                           hResponseObj[:readerExecutionMessages] << "Contact contactType set to 'person'"
                         end
 
                         # contact - name (required)
@@ -108,8 +107,7 @@ module ADIWG
                            hContact[:name] = hSbContact['name']
                         end
                         if hSbContact['name'].nil? || hSbContact['name'] == ''
-                           hResponseObj[:readerExecutionMessages] << 'Contact name is missing'
-                           hResponseObj[:readerExecutionPass] = false
+                           hResponseObj[:readerExecutionMessages] << 'Contact name is missing, contact dropped'
                            return nil
                         end
 
@@ -254,7 +252,7 @@ module ADIWG
                         aContacts << hContact
                         aContacts << hContactOrg unless hContactOrg.empty?
 
-                        # add contact to resource citation
+                        # add contact to resourceInfo citation
                         hResponsibility = intMetadataClass.newResponsibility
                         roleType = Codelists.codelist_sb2adiwg('role_sb2adiwg', hContact[:contactType])
                         roleType = hContact[:contactType] if roleType.nil?

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

@@ -37,6 +37,7 @@ module ADIWG
                         'description' => 'Extent extracted from ScienceBase',
                         'geographicExtent' => [
                            {
+                              'description' => 'Geographic Extent imported from USGS ScienceBase',
                               'containsData' => true,
                               'identifier' => {
                                  'identifier' => ''

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

@@ -2,6 +2,7 @@
 # Reader - ScienceBase JSON to internal data structure
 
 # History:
+#  Stan Smith 2017-10-11 revise forward and reverse association definition
 #  Stan Smith 2017-09-14 remove all identifiers except relatedItemId
 #  Stan Smith 2017-08-03 original script
 
@@ -68,23 +69,30 @@ module ADIWG
                         unless hItem.empty?
 
                            # determine relationship direction
+                           # forward: how the associated resource relates to the main resource
+                           # ... in other words - the relationship is defined in terms of the associated resource
+                           # ... example: the associated resource is a 'subProject' of the main resource
+                           # reverse: how the main resource relates to the associated resource
+                           # ... in other words - the relationship is defined in terms of the main resource
+                           # ... example: the main resource is the 'parentProject' of the associated resource
+                           # all mdJson/mdTranslator relationships must be expressed as forward
                            forward = nil
                            if hItem.has_key?('itemId')
-                              forward = true if sbId == hItem['itemId']
+                              forward = false if sbId == hItem['itemId']
                            end
                            if hItem.has_key?('relatedItemId')
-                              forward = false if sbId == hItem['relatedItemId']
+                              forward = true 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
+                           # fetch resourceTypes from related item's record
                            if forward
-                              resourceId = hItem['relatedItemId']
-                           else
                               resourceId = hItem['itemId']
+                           else
+                              resourceId = hItem['relatedItemId']
                            end
                            resourceLink = "https://www.sciencebase.gov/catalog/item/#{resourceId}?format=json"
                            begin
@@ -117,9 +125,9 @@ module ADIWG
                                  unless sbAssocType.nil? || sbAssocType == ''
                                     assocType = nil
                                     if forward
-                                       assocType = Codelists.codelist_sb2adiwg('association_sb2adiwg_forward', sbAssocType)
+                                       assocType = Codelists.codelist_sb2adiwg('association_sb2adiwg_assoc2main', sbAssocType)
                                     else
-                                       assocType = Codelists.codelist_sb2adiwg('association_sb2adiwg_reverse', sbAssocType)
+                                       assocType = Codelists.codelist_sb2adiwg('association_sb2adiwg_main2assoc', sbAssocType)
                                     end
                                     if assocType.nil?
                                        hResource[:associationType] = sbAssocType
@@ -134,12 +142,15 @@ module ADIWG
 
                               # 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
+                              citationTitle = 'associated resource title'
+                              if forward
+                                 if hItem.has_key?('title')
+                                    citationTitle = hItem['title']
+                                 end
+                              else
+                                 if hItem.has_key?('relatedItemTitle')
+                                    citationTitle = hItem['relatedItemTitle']
+                                 end
                               end
                               hCitation[:title] = citationTitle
 

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

@@ -31,9 +31,8 @@ module ADIWG
                               type = hLink['type']
                            end
                            if type.nil? || type == ''
-                              hResponseObj[:readerExecutionMessages] << 'WebLinks type is missing'
-                              hResponseObj[:readerExecutionPass] = false
-                              return nil
+                              hResponseObj[:readerExecutionMessages] << 'WebLink type is missing, set to "unknown"'
+                              type = 'unknown'
                            end
 
                            # handle non-browse links
@@ -67,8 +66,8 @@ module ADIWG
                                  hOlRes[:olResURI] = hLink['uri']
                               end
                               if hOlRes[:olResURI].nil? || hOlRes[:olResURI] == ''
-                                 hResponseObj[:readerExecutionMessages] << 'WebLinks URI is missing'
-                                 hResponseObj[:readerExecutionPass] = false
+                                 hResponseObj[:readerExecutionMessages] << 'WebLink URI is missing'
+                                 hResponseObj[:readerExecutionMessages] << 'WebLink skipped'
                                  return nil
                               end
                               hCitation[:onlineResources] << hOlRes

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

@@ -31,8 +31,7 @@ module ADIWG
                               type = hLink['type']
                            end
                            if type.nil? || type == ''
-                              hResponseObj[:readerExecutionMessages] << 'WebLinks type is missing'
-                              hResponseObj[:readerExecutionPass] = false
+                              hResponseObj[:readerExecutionMessages] << 'WebLink type is missing'
                               return nil
                            end
 
@@ -62,8 +61,8 @@ module ADIWG
                                  hOlRes[:olResURI] = hLink['uri']
                               end
                               if hOlRes[:olResURI].nil? || hOlRes[:olResURI] == ''
-                                 hResponseObj[:readerExecutionMessages] << 'WebLinks URI is missing'
-                                 hResponseObj[:readerExecutionPass] = false
+                                 hResponseObj[:readerExecutionMessages] << 'WebLink URI is missing'
+                                 hResponseObj[:readerExecutionMessages] << 'WebLink skipped'
                                  return nil
                               end
                               hGraphic[:graphicURI] << hOlRes

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,7 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.3.3 2017-10-03 modify sbJson reader execution fail tests
 # 2.3.2 2017-09-14 add associationType to sbJson relatedItems
 # 2.3.2 2017-09-14 add contacts to resource citation
 # 2.3.1 2017-09-13 fixed fgdc reader: removed conversion of hash to json
@@ -28,7 +29,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.3.2"
+      VERSION = "2.3.3"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/html/sections/html_boundingBox.rb

@@ -19,29 +19,47 @@ module ADIWG
 
                   # bounding box - edges
                   unless hBox[:westLongitude].nil?
-                     @html.em('West Longitude')
+                     @html.em('West Longitude:')
                      @html.text!(hBox[:westLongitude].to_s)
                      @html.br
                   end
 
                   unless hBox[:eastLongitude].nil?
-                     @html.em('East Longitude')
+                     @html.em('East Longitude:')
                      @html.text!(hBox[:eastLongitude].to_s)
                      @html.br
                   end
 
                   unless hBox[:southLatitude].nil?
-                     @html.em('South Latitude')
+                     @html.em('South Latitude:')
                      @html.text!(hBox[:southLatitude].to_s)
                      @html.br
                   end
 
                   unless hBox[:northLatitude].nil?
-                     @html.em('North Latitude')
+                     @html.em('North Latitude:')
                      @html.text!(hBox[:northLatitude].to_s)
                      @html.br
                   end
 
+                  unless hBox[:minimumAltitude].nil?
+                     @html.em('Minimum Altitude:')
+                     @html.text!(hBox[:minimumAltitude].to_s)
+                     @html.br
+                  end
+
+                  unless hBox[:maximumAltitude].nil?
+                     @html.em('Maximum Altitude:')
+                     @html.text!(hBox[:maximumAltitude].to_s)
+                     @html.br
+                  end
+
+                  unless hBox[:unitsOfAltitude].nil?
+                     @html.em('Altitude Units of Measure:')
+                     @html.text!(hBox[:unitsOfAltitude].to_s)
+                     @html.br
+                  end
+
                end # writeHtml
             end # Html_BoundingBox
 

data/lib/adiwg/mdtranslator/writers/html/sections/html_geographicExtent.rb

@@ -33,6 +33,14 @@ module ADIWG
                   @html.text!(hExtent[:containsData].to_s)
                   @html.br
 
+                  # geographic extent - description
+                  unless hExtent[:description].nil?
+                     @html.em('Geographic Description: ')
+                     @html.section(:class => 'block') do
+                        @html.text!(hExtent[:description])
+                     end
+                  end
+
                   # geographic extent - map {div}
                   @html.details do
                      @html.summary('Map', 'class' => 'h5 map-summary')

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_boundingBox.rb

@@ -1,7 +1,8 @@
 # mdJson 2.0 writer - bounding box
 
 # History:
-#   Stan Smith 2017-03-15 original script
+#  Stan Smith 2017-09-08 add altitude to support fgdc
+#  Stan Smith 2017-03-15 original script
 
 require 'jbuilder'
 
@@ -19,6 +20,9 @@ module ADIWG
                      json.eastLongitude hBbox[:eastLongitude]
                      json.southLatitude hBbox[:southLatitude]
                      json.northLatitude hBbox[:northLatitude]
+                     json.minimumAltitude hBbox[:minimumAltitude]
+                     json.maximumAltitude hBbox[:maximumAltitude]
+                     json.unitsOfAltitude hBbox[:unitsOfAltitude]
                   end
 
                end # build

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_geographicExtent.rb

@@ -1,8 +1,9 @@
 # mdJson 2.0 writer - geographic extent
 
 # History:
-#   Stan Smith 2017-03-15 refactored for mdJson/mdTranslator 2.0
-#   Josh Bradley original script
+#  Stan Smith 2017-09-28 add description to support fgdc
+#  Stan Smith 2017-03-15 refactored for mdJson/mdTranslator 2.0
+#  Josh Bradley original script
 
 require 'jbuilder'
 require_relative 'mdJson_identifier'
@@ -18,6 +19,7 @@ module ADIWG
                def self.build(hGeographic)
 
                   Jbuilder.new do |json|
+                     json.description hGeographic[:description]
                      json.containsData hGeographic[:containsData]
                      json.identifier Identifier.build(hGeographic[:identifier]) unless hGeographic[:identifier].empty?
                      json.boundingBox BoundingBox.build(hGeographic[:boundingBox]) unless hGeographic[:boundingBox].empty?

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

@@ -154,6 +154,8 @@ module ADIWG
                   {adiwg: 'withdrawn', sb: nil}
                ]
 
+               # related items are not written back to sbJson
+               # so this table has not been used, review before using
                @association_adiwg2sb = [
                   {adiwg: 'alternate', sb: 'alternate'},
                   {adiwg: 'collectiveTitle', sb: nil},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,9 @@ files:
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialDomain.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialOrganization.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialReference.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_taxonClass.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_taxonSystem.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_taxonomy.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_timeInstant.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_timePeriod.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_transferInfo.rb
@@ -712,7 +715,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata