adiwg-mdtranslator 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a5a0a4dc73f22a0ce7486fe6be73754cc93743
-  data.tar.gz: 7c4c4d97eb981e0d6612ce4dc439b356eb0fe0cc
+  metadata.gz: c76bab7a13d123b87ccc5b186b838330dd5dcd08
+  data.tar.gz: 83e0218e6a5ea373d2b9283ca61d72a32a840dd5
 SHA512:
-  metadata.gz: 5d224f7a98809a3738ca574b64662f466ba023f33a81fced281d72c06c2df0f3059a08daddbf7dfe9352e9ec4c56f89874644419c860a9eaa42fd4c6c6fd2f85
-  data.tar.gz: 533e4af92c507a80d47d89669a68d9d7a9ca829c790047b65c66bfbf968e57506889b980932975b277f813d244e3f4e2caf2f6318e8bd43331c75fbb2ae43d26
+  metadata.gz: 666c6243ff33753bd0d73f29097d707464d5cf0ffe04f2ac4c7b64a9dde97e5c523d22755a5a79aa04d17f960c034104bff16e2761e965540144edcc763072e4
+  data.tar.gz: 5b88078e37e97f0f6ed0327e6c71be0f90fbf0a56c3c777e99b0b337ee0a5d83a4e1c988bead13d0f599b257aef32be0f2035450b3d5253f97819255a828d2d0

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_entity.rb

@@ -22,7 +22,11 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
 
                   # entity attribute 5.1.1 (enttype) - definition and description set
+                  # also search for (enttyp); Metavist and USGS fgdc validator use 'enttyp'
                   xEntity = xDetail.xpath('./enttype')
+                  if xEntity.empty?
+                     xEntity = xDetail.xpath('./enttyp')
+                  end
                   unless xEntity.empty?
 
                      hEntity = intMetadataClass.newEntity

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialDomain.rb

@@ -61,6 +61,7 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   hExtent = intMetadataClass.newExtent
                   hGeoExtent = intMetadataClass.newGeographicExtent
+                  hExtent[:geographicExtents] << hGeoExtent
 
                   # spatial domain 1.5.1 (bounding) - bounding box
                   xBbox = xDomain.xpath('./bounding')
@@ -127,27 +128,27 @@ module ADIWG
 
                         # make geoJson FeatureCollection from polygon
                         hGeometry = {
-                           type: 'Polygon',
-                           coordinates: polygon
+                           'type' => 'Polygon',
+                           'coordinates' => polygon
                         }
                         hFeature = {
-                           type: 'Feature',
-                           geometry: hGeometry,
-                           properties: {
-                              description: 'FGDC bounding polygon'
+                           'type' => 'Feature',
+                           'geometry' => hGeometry,
+                           'properties' => {
+                              'description' => 'FGDC bounding polygon'
                            }
                         }
                         hCollection = {
-                           type: 'FeatureCollection',
-                           features: [hFeature]
+                           'type' => 'FeatureCollection',
+                           'features' => [hFeature]
                         }
-                        geoJson = hCollection.to_json
+                        geoJson = hCollection
 
                         # make internal geometries from polygon
                         hIntGeo = intMetadataClass.newGeometryObject
                         hIntGeo[:type] = 'Polygon'
                         hIntGeo[:coordinates] = polygon
-                        hIntGeo[:nativeGeoJson] = hGeometry.to_json
+                        hIntGeo[:nativeGeoJson] = hGeometry
 
                         hIntProps = intMetadataClass.newGeometryProperties
                         hIntProps[:description] = 'FGDC bounding polygon'
@@ -155,18 +156,17 @@ module ADIWG
                         hIntFeature = intMetadataClass.newGeometryFeature
                         hIntFeature[:type] = 'Feature'
                         hIntFeature[:geometryObject] = hIntGeo
-                        hIntFeature[:nativeGeoJson] = hFeature.to_json
+                        hIntFeature[:nativeGeoJson] = hFeature
                         hIntFeature[:properties] = hIntProps
 
                         hIntCollect = intMetadataClass.newFeatureCollection
                         hIntCollect[:type] = 'FeatureCollection'
                         hIntCollect[:features] << hIntFeature
-                        hIntCollect[:nativeGeoJson] = hCollection.to_json
+                        hIntCollect[:nativeGeoJson] = hCollection
 
                         hGeoExtent[:geographicElements] << hIntCollect
-                        hGeoExtent[:nativeGeoJson] = geoJson
+                        hGeoExtent[:nativeGeoJson] << geoJson
 
-                        hExtent[:geographicExtents] << hGeoExtent
                         hExtent[:description] = 'FGDC spatial domain'
 
                      end

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

@@ -2,7 +2,8 @@
 # Reader - ScienceBase JSON to internal data structure
 
 # History:
-#   Stan Smith 2016-06-21 original script
+#  Stan Smith 2017-09-13 remove fail restriction on contactType
+#  Stan Smith 2016-06-21 original script
 
 require 'uuidtools'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
@@ -65,20 +66,21 @@ module ADIWG
 
                         hContact[:contactId] = UUIDTools::UUID.random_create.to_s
 
-                        # contact - contactType (required) [ person | organization ]
+                        # contact - contactType [ person | organization ]
                         if hSbContact.has_key?('contactType')
-                           if %w(person organization).include?(hSbContact['contactType'])
+                           if hSbContact['contactType'].nil? || hSbContact['contactType'] == ''
+                              hResponseObj[:readerExecutionMessages] << 'Contact contactType is missing'
+                              hContact[:isOrganization] = false
+                           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
                            end
-                        end
-                        if hSbContact['contactType'].nil? || hSbContact['contactType'] == ''
+                        else
                            hResponseObj[:readerExecutionMessages] << 'Contact contactType is missing'
-                           hResponseObj[:readerExecutionPass] = false
-                           return nil
+                           hContact[:isOrganization] = false
                         end
 
                         # contact - name (required)

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,7 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.3.1 2017-09-13 fixed fgdc reader: removed conversion of hash to json
 # 2.3.0 2017-09-11 add fgdc 1998 CSDGM reader
 # 2.2.0 2017-08-31 refactor for schema changes to Lineage and Funding
 # 2.1.2 2017-08-24 remove schema version from sbJson
@@ -25,7 +26,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.3.0"
+      VERSION = "2.3.1"
    end
 end
 

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

@@ -48,7 +48,11 @@ module ADIWG
                   unless hAllocation[:sourceId].nil?
                      hContact = Html_Document.getContact(hAllocation[:sourceId])
                      @html.em('Source Contact: ')
-                     @html.a(hContact[:contactId], 'href' => '#CID_'+hContact[:contactId])
+                     if hContact.empty?
+                        @html.text!("Contact #{hAllocation[:sourceId]} not found!")
+                     else
+                        @html.a(hContact[:contactId], 'href' => '#CID_'+hContact[:contactId])
+                     end
                      @html.br
                   end
 
@@ -56,7 +60,11 @@ module ADIWG
                   unless hAllocation[:recipientId].nil?
                      hContact = Html_Document.getContact(hAllocation[:recipientId])
                      @html.em('Recipient Contact: ')
-                     @html.a(hContact[:contactId], 'href' => '#CID_'+hContact[:contactId])
+                     if hContact.empty?
+                        @html.text!("Contact #{hAllocation[:recipientId]} not found!")
+                     else
+                        @html.a(hContact[:contactId], 'href' => '#CID_'+hContact[:contactId])
+                     end
                      @html.br
                   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler