adiwg-mdtranslator 2.8.0 → 2.9.0

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

@@ -121,6 +121,7 @@ module ADIWG
                   end
 
                   # entity attribute 5.1.2.7 (attrvai) - attribute value accuracy information
+                  # -> not mapped
 
                   # entity attribute 5.1.2.7.1 (attrva) - attribute value accuracy
                   # -> not mapped

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

@@ -16,6 +16,30 @@ module ADIWG
 
             module Contact
 
+               def self.add_phone(hContact, number, type)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  # test if phone number already exists for this contact
+                  hPhone = intMetadataClass.newPhone
+                  newPhone = true
+                  hContact[:phones].each do |hOld|
+                     if hOld[:phoneNumber] == number
+                        newPhone = false
+                        hPhone = hOld
+                     end
+                  end
+                  if newPhone
+                     hContact[:phones] << hPhone
+                  end
+                  hPhone[:phoneNumber] = number
+                  unless hPhone[:phoneServiceTypes].include?(type)
+                     hPhone[:phoneServiceTypes] << type
+                  end
+
+               end
+
                def self.unpack(xContact, hResponseObj)
 
                   # instance classes needed in script
@@ -63,10 +87,16 @@ module ADIWG
                         hContact = Fgdc.get_contact_by_id(personId) if contactType == 'person'
                         hContact = Fgdc.get_contact_by_id(orgId) if contactType == 'organization'
 
+                        # CAUTION: the contact being processed may have been added previously.
+                        # check that addresses, phones, emails, org members, hours of service
+                        # were not previous defined for this contact.
+
                         # contact - member of organization
                         if contactType == 'person'
                            unless orgId.nil?
-                              hContact[:memberOfOrgs] << orgId
+                              unless hContact.include?(orgId)
+                                 hContact[:memberOfOrgs] << orgId
+                              end
                            end
                         end
 
@@ -111,7 +141,27 @@ module ADIWG
                               country = xAddress.xpath('./country').text
                               hAddress[:country] = country unless country.empty?
 
-                              hContact[:addresses] << hAddress
+                              # test if new address before adding to contact
+                              saveAddress = true
+                              hContact[:addresses].each do |hOld|
+                                 isSame = true
+                                 isSame = false unless hAddress[:deliveryPoints].length == hOld[:deliveryPoints].length
+                                 if hAddress[:deliveryPoints].length == hOld[:deliveryPoints].length
+                                    (1..hAddress[:deliveryPoints].length).each do |x|
+                                       isSame = false unless hAddress[:deliveryPoints][x] == hOld[:deliveryPoints][x]
+                                    end
+                                 end
+                                 isSame = false unless hAddress[:city] == hOld[:city]
+                                 isSame = false unless hAddress[:adminArea] == hOld[:adminArea]
+                                 isSame = false unless hAddress[:postalCode] == hOld[:postalCode]
+                                 isSame = false unless hAddress[:country] == hOld[:country]
+                                 if isSame
+                                    saveAddress = false
+                                    break
+                                 end
+                              end
+
+                              hContact[:addresses] << hAddress if saveAddress
 
                            end
                         end
@@ -122,10 +172,7 @@ module ADIWG
                            axVoice.each do |xPhone|
                               phone = xPhone.text
                               unless phone.empty?
-                                 hPhone = intMetadataClass.newPhone
-                                 hPhone[:phoneNumber] = phone
-                                 hPhone[:phoneServiceTypes] << 'voice'
-                                 hContact[:phones] << hPhone
+                                 add_phone(hContact, phone, 'voice')
                               end
                            end
                         end
@@ -136,10 +183,7 @@ module ADIWG
                            axTDD.each do |xPhone|
                               phone = xPhone.text
                               unless phone.empty?
-                                 hPhone = intMetadataClass.newPhone
-                                 hPhone[:phoneNumber] = phone
-                                 hPhone[:phoneServiceTypes] << 'tty'
-                                 hContact[:phones] << hPhone
+                                 add_phone(hContact, phone, 'tty')
                               end
                            end
                         end
@@ -150,10 +194,7 @@ module ADIWG
                            axFax.each do |xPhone|
                               phone = xPhone.text
                               unless phone.empty?
-                                 hPhone = intMetadataClass.newPhone
-                                 hPhone[:phoneNumber] = phone
-                                 hPhone[:phoneServiceTypes] << 'facsimile'
-                                 hContact[:phones] << hPhone
+                                 add_phone(hContact, phone, 'facsimile')
                               end
                            end
                         end
@@ -164,14 +205,20 @@ module ADIWG
                            axEmail.each do |xEmail|
                               email = xEmail.text
                               unless email.empty?
-                                 hContact[:eMailList] << email
+                                 unless hContact[:eMailList].include?(email)
+                                    hContact[:eMailList] << email
+                                 end
                               end
                            end
                         end
 
                         # contact 10.9 (hours) - hours of service
                         hours = xContactInfo.xpath('./hours').text
-                        hContact[:hoursOfService] << hours unless hours.empty?
+                        unless hours.empty?
+                           unless hContact[:hoursOfService].include?(hours)
+                              hContact[:hoursOfService] << hours
+                           end
+                        end
 
                         # contact 10.10 (cntinst) - contact instructions
                         instruct = xContactInfo.xpath('./cntinst').text

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

@@ -18,7 +18,7 @@ module ADIWG
 
             module Distribution
 
-               def self.unpack(xDistribution, hResourceInfo, hResponseObj)
+               def self.unpack(xDistribution, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -44,15 +44,10 @@ module ADIWG
                   end
 
                   # distribution 6.3 (distliab) - distribution liability
-                  # -> resourceInfo.constraints.legal.otherConstraint
-                  constraint = xDistribution.xpath('./distliab').text
-                  unless constraint.empty?
-                     hConstraint = intMetadataClass.newConstraint
-                     hConstraint[:type] = 'legal'
-                     hLegal = intMetadataClass.newLegalConstraint
-                     hLegal[:otherCons] << constraint
-                     hConstraint[:legalConstraint] = hLegal
-                     hResourceInfo[:constraints] << hConstraint
+                  # -> distribution.liabilityStatement
+                  liability = xDistribution.xpath('./distliab').text
+                  unless liability.empty?
+                     hDistribution[:liabilityStatement] = liability
                   end
 
                   # distribution 6.4 (stdorder) - standard order process []
@@ -73,14 +68,10 @@ module ADIWG
                   end
 
                   # distribution 6.6 (techpreq) - technical prerequisites
-                  # -> distribution.description {+=}
+                  # -> distribution.technicalPrerequisite
                   techPre = xDistribution.xpath('./techpreq').text
                   unless techPre.empty?
-                     if hDistribution[:description].nil?
-                        hDistribution[:description] = techPre
-                     else
-                        hDistribution[:description] += '\n\n Technical Prerequisites: ' + techPre
-                     end
+                     hDistribution[:technicalPrerequisite] = techPre
                   end
 
                   # distribution 6.7 (availabl) - available time period {time period}

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

@@ -22,7 +22,7 @@ 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'
+                  # also search for (enttype); Metavist and USGS fgdc validator use 'enttyp'
                   xEntity = xDetail.xpath('./enttype')
                   if xEntity.empty?
                      xEntity = xDetail.xpath('./enttyp')

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

@@ -21,6 +21,7 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   hEntity = intMetadataClass.newEntity
                   hEntity[:entityId] = UUIDTools::UUID.random_create.to_s
+                  hEntity[:entityName] = 'Entity Overview'
                   hEntity[:entityCode] = 'overview'
 
                   # entity attribute 5.2.1 (eaover) - entity attribute overview

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

@@ -2,6 +2,7 @@
 # unpack fgdc entity enumerated domain
 
 # History:
+#  Stan Smith 2018-01-25 add support for enumerated domain value definition source
 #  Stan Smith 2017-09-06 original script
 
 require 'uuidtools'
@@ -47,7 +48,12 @@ module ADIWG
                         end
 
                         # entity attribute 5.1.2.4.1.3 (edomvds) - enumerated domain value definition source
-                        # -> not mapped
+                        source = xValue.xpath('./edomvds').text
+                        unless source.empty?
+                           hCitation = intMetadataClass.newCitation
+                           hCitation[:title] = source
+                           hItem[:itemReference] = hCitation
+                        end
 
                         hDomain[:domainItems] << hItem
 

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

@@ -87,7 +87,7 @@ module ADIWG
                   axDistribution = xMetadata.xpath('./distinfo')
                   unless axDistribution.empty?
                      axDistribution.each do |xDistribution|
-                        hDistribution = Distribution.unpack(xDistribution, hResourceInfo, hResponseObj)
+                        hDistribution = Distribution.unpack(xDistribution, hResponseObj)
                         unless hDistribution.nil?
                            hMetadata[:distributorInfo] << hDistribution
                         end
@@ -97,7 +97,7 @@ module ADIWG
                   # metadata (metainfo 7) - metadata reference (required)
                   xMetaInfo = xMetadata.xpath('./metainfo')
                   unless xMetaInfo.empty?
-                     hMetadataInfo = MetadataInformation.unpack(xMetaInfo, hResourceInfo, hResponseObj)
+                     hMetadataInfo = MetadataInformation.unpack(xMetaInfo, hResponseObj)
                      unless hMetadataInfo.nil?
                         hMetadata[:metadataInfo] = hMetadataInfo
                      end

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

@@ -121,7 +121,10 @@ module ADIWG
                   # identification information bio (taxonomy) - taxonomic information
                   xTaxonomy = xIdInfo.xpath('./taxonomy')
                   unless xTaxonomy.empty?
-                     Taxonomy.unpack(xTaxonomy, hResourceInfo, hResponseObj)
+                     hTaxonomy = Taxonomy.unpack(xTaxonomy, hResourceInfo, hResponseObj)
+                     unless hTaxonomy.nil?
+                        hResourceInfo[:taxonomy] = hTaxonomy
+                     end
                   end
 
                   # identification information 1.7 (accconst) - access constraints

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

@@ -2,6 +2,7 @@
 # unpack fgdc metadata information
 
 # History:
+#  Stan Smith 2018-01-27 move constraints to metadataConstraints
 #  Stan Smith 2017-08-15 original script
 
 require 'nokogiri'
@@ -16,7 +17,7 @@ module ADIWG
 
             module MetadataInformation
 
-               def self.unpack(xMetaInfo, hResourceInfo, hResponseObj)
+               def self.unpack(xMetaInfo, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -92,7 +93,7 @@ module ADIWG
                      hConstraint = intMetadataClass.newConstraint
                      hConstraint[:type] = 'legal'
                      hConstraint[:legalConstraint] = hLegal
-                     hResourceInfo[:constraints] << hConstraint
+                     hMetadataInfo[:metadataConstraints] << hConstraint
                   end
 
                   # metadata information 7.10 (metsi) - metadata security information
@@ -127,7 +128,7 @@ module ADIWG
                         hConstraint = intMetadataClass.newConstraint
                         hConstraint[:type] = 'security'
                         hConstraint[:securityConstraint] = hSecurity
-                        hResourceInfo[:constraints] << hConstraint
+                        hMetadataInfo[:metadataConstraints] << hConstraint
                      end
 
                   end

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

@@ -21,25 +21,29 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   hFormat = intMetadataClass.newResourceFormat
                   hSpecification = intMetadataClass.newCitation
+                  hIdentifier = intMetadataClass.newIdentifier
+                  hSpecification[:identifiers] << hIdentifier
                   hFormat[:formatSpecification] = hSpecification
                   hTransfer[:distributionFormats] << hFormat
 
                   # distribution 6.4.2.1.1 (formname) - format name
-                  # -> distribution.distributor.transferOption.distributionFormat.formatSpecification.title
-                  title = xTranInfo.xpath('./formname').text
-                  unless title.empty?
-                     hSpecification[:title] = title
+                  # -> transferOption.distributionFormat.formatSpecification.title
+                  # -> transferOption.distributionFormat.formatSpecification.identifier[].identifier
+                  formName = xTranInfo.xpath('./formname').text
+                  unless formName.empty?
+                     hSpecification[:title] = formName
+                     hSpecification[:identifiers][0][:identifier] = formName
                   end
 
                   # distribution 6.4.2.1.2 (formvern) - format version number
-                  # -> distribution.distributor.transferOption.distributionFormat.formatSpecification.edition
+                  # -> transferOption.distributionFormat.formatSpecification.edition
                   version = xTranInfo.xpath('./formvern').text
                   unless version.empty?
                      hSpecification[:edition] = version
                   end
 
                   # distribution 6.4.2.1.3 (formverd) - format version date
-                  # -> distribution.distributor.transferOption.distributionFormat.formatSpecification.date(version)
+                  # -> transferOption.distributionFormat.formatSpecification.date(version)
                   date = xTranInfo.xpath('./formverd').text
                   unless date.empty?
                      hDate = Date.unpack(date, '', 'revision', hResponseObj)
@@ -49,31 +53,31 @@ module ADIWG
                   end
 
                   # distribution 6.4.2.1.4 (formspec) - format specification
-                  # -> distribution.distributor.transferOption.distributionFormat.formatSpecification.otherCitationDetails
+                  # -> transferOption.distributionFormat.formatSpecification.title
                   specification = xTranInfo.xpath('./formspec').text
                   unless specification.empty?
-                     hSpecification[:otherDetails] << specification
+                     hSpecification[:title] = specification
                   end
 
                   # distribution bio (asciistr) - ASCII file specification
                   # -> not mapped; cannot reliably merge with entity-attribute definition
 
                   # distribution 6.4.2.1.5 (formcont) - format information content
-                  # -> distribution.distributor.transferOption.distributionFormat.formatSpecification.otherCitationDetails
+                  # -> transferOption.distributionFormat.formatSpecification.otherCitationDetails
                   specification = xTranInfo.xpath('./formcont').text
                   unless specification.empty?
                      hSpecification[:otherDetails] << specification
                   end
 
                   # distribution 6.4.2.1.6 (filedec) - file decompression technique
-                  # -> distribution.distributor.transferOption.distributionFormat.compressionMethod
+                  # -> transferOption.distributionFormat.compressionMethod
                   compress = xTranInfo.xpath('./filedec').text
                   unless compress.empty?
                      hFormat[:compressionMethod] = compress
                   end
 
                   # distribution 6.4.2.1.7 (transize) - file transfer size in MB
-                  # -> distribution.distributor.transferOption.transferSize
+                  # -> transferOption.transferSize
                   size = xTranInfo.xpath('./transize').text
                   unless size.empty?
                      hTransfer[:transferSize] = size.to_i

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_constraint.rb

@@ -13,151 +13,151 @@ require_relative 'module_legalConstraint'
 require_relative 'module_securityConstraint'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
-
-                module Constraint
-
-                    def self.unpack(hConstraint, responseObj)
-
-
-                        # return nil object if input is empty
-                        if hConstraint.empty?
-                            responseObj[:readerExecutionMessages] << 'Constraint object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module Constraint
+
+               def self.unpack(hConstraint, responseObj)
+
+
+                  # return nil object if input is empty
+                  if hConstraint.empty?
+                     responseObj[:readerExecutionMessages] << 'Constraint object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intConstraint = intMetadataClass.newConstraint
+
+                  # constraint - type (required)
+                  type = nil
+                  if hConstraint.has_key?('type')
+                     if hConstraint['type'] != ''
+                        type = hConstraint['type']
+                        if %w{ use legal security }.one? {|word| word == type}
+                           intConstraint[:type] = hConstraint['type']
+                        else
+                           responseObj[:readerExecutionMessages] << 'Constraint type must be use, legal, or security'
+                           responseObj[:readerExecutionPass] = false
+                           return nil
                         end
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intConstraint = intMetadataClass.newConstraint
-
-                        # constraint - type (required)
-                        type = nil
-                        if hConstraint.has_key?('type')
-                            if hConstraint['type'] != ''
-                                type = hConstraint['type']
-                                if %w{ use legal security }.one? { |word| word == type }
-                                    intConstraint[:type] = hConstraint['type']
-                                else
-                                    responseObj[:readerExecutionMessages] << 'Constraint type must be use, legal, or security'
-                                    responseObj[:readerExecutionPass] = false
-                                    return nil
-                                end
-                            end
+                     end
+                  end
+                  if intConstraint[:type].nil? || intConstraint[:type] == ''
+                     responseObj[:readerExecutionMessages] << 'Constraint type declaration is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # constraint - use limitation [] (required if type='use')
+                  if hConstraint.has_key?('useLimitation')
+                     hConstraint['useLimitation'].each do |item|
+                        if item != ''
+                           intConstraint[:useLimitation] << item
                         end
-                        if intConstraint[:type].nil? || intConstraint[:type] == ''
-                            responseObj[:readerExecutionMessages] << 'Constraint type declaration is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
+                     end
+                  end
+
+                  # constraint - scope
+                  if hConstraint.has_key?('scope')
+                     hObject = hConstraint['scope']
+                     unless hObject.empty?
+                        hReturn = Scope.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intConstraint[:scope] = hReturn
                         end
-
-                        # constraint - use limitation [] (required if type='use')
-                        if hConstraint.has_key?('useLimitation')
-                            hConstraint['useLimitation'].each do |item|
-                                if item != ''
-                                    intConstraint[:useLimitation] << item
-                                end
-                            end
+                     end
+                  end
+
+                  # constraint - graphic [graphic]
+                  if hConstraint.has_key?('graphic')
+                     aGraphic = hConstraint['graphic']
+                     aGraphic.each do |item|
+                        hGraphic = Graphic.unpack(item, responseObj)
+                        unless hGraphic.nil?
+                           intConstraint[:graphic] << hGraphic
                         end
-
-                        # constraint - scope
-                        if hConstraint.has_key?('scope')
-                            hObject = hConstraint['scope']
-                            unless hObject.empty?
-                                hReturn = Scope.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intConstraint[:scope] = hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # constraint - reference [citation]
+                  if hConstraint.has_key?('reference')
+                     aReference = hConstraint['reference']
+                     aReference.each do |item|
+                        hReference = Citation.unpack(item, responseObj)
+                        unless hReference.nil?
+                           intConstraint[:reference] << hReference
                         end
-
-                        # constraint - graphic [graphic]
-                        if hConstraint.has_key?('graphic')
-                            aGraphic = hConstraint['graphic']
-                            aGraphic.each do |item|
-                                hGraphic = Graphic.unpack(item, responseObj)
-                                unless hGraphic.nil?
-                                    intConstraint[:graphic] << hGraphic
-                                end
-                            end
+                     end
+                  end
+
+                  # constraint - releasability
+                  if hConstraint.has_key?('releasability')
+                     hObject = hConstraint['releasability']
+                     unless hObject.empty?
+                        hReturn = Releasability.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intConstraint[:releasability] = hReturn
                         end
-
-                        # constraint - reference [citation]
-                        if hConstraint.has_key?('reference')
-                            aReference = hConstraint['reference']
-                            aReference.each do |item|
-                                hReference = Citation.unpack(item, responseObj)
-                                unless hReference.nil?
-                                    intConstraint[:reference] << hReference
-                                end
-                            end
+                     end
+                  end
+
+                  # constraint - responsible party []
+                  if hConstraint.has_key?('responsibleParty')
+                     aRParty = hConstraint['responsibleParty']
+                     aRParty.each do |item|
+                        hParty = ResponsibleParty.unpack(item, responseObj)
+                        unless hParty.nil?
+                           intConstraint[:responsibleParty] << hParty
                         end
-
-                        # constraint - releasability
-                        if hConstraint.has_key?('releasability')
-                            hObject = hConstraint['releasability']
-                            unless hObject.empty?
-                                hReturn = Releasability.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intConstraint[:releasability] = hReturn
-                                end
-                            end
-                        end
-
-                        # constraint - responsible party []
-                        if hConstraint.has_key?('responsibleParty')
-                            aRParty = hConstraint['responsibleParty']
-                            aRParty.each do |item|
-                                hParty = ResponsibleParty.unpack(item, responseObj)
-                                unless hParty.nil?
-                                    intConstraint[:responsibleParty] << hParty
-                                end
-                            end
-                        end
-
-                        if type == 'legal'
-                            if hConstraint.has_key?('legal')
-                                hObject = hConstraint['legal']
-                                unless hObject.empty?
-                                    hReturn = LegalConstraint.unpack(hObject, responseObj)
-                                    unless hReturn.nil?
-                                        intConstraint[:legalConstraint] = hReturn
-                                    end
-                                end
-                            end
-                            if intConstraint[:legalConstraint].empty?
-                                responseObj[:readerExecutionMessages] << 'Legal Constraint object is missing or empty'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
+                     end
+                  end
+
+                  if type == 'legal'
+                     if hConstraint.has_key?('legal')
+                        hObject = hConstraint['legal']
+                        unless hObject.empty?
+                           hReturn = LegalConstraint.unpack(hObject, responseObj)
+                           unless hReturn.nil?
+                              intConstraint[:legalConstraint] = hReturn
+                           end
                         end
-
-                        if type == 'security'
-                            if hConstraint.has_key?('security')
-                                hObject = hConstraint['security']
-                                unless hObject.empty?
-                                    hReturn = SecurityConstraint.unpack(hObject, responseObj)
-                                    unless hReturn.nil?
-                                        intConstraint[:securityConstraint] = hReturn
-                                    end
-                                end
-                            end
-                            if intConstraint[:securityConstraint].empty?
-                                responseObj[:readerExecutionMessages] << 'Security Constraint object is missing or empty'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
+                     end
+                     if intConstraint[:legalConstraint].empty?
+                        responseObj[:readerExecutionMessages] << 'Legal Constraint object is missing or empty'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                  end
+
+                  if type == 'security'
+                     if hConstraint.has_key?('security')
+                        hObject = hConstraint['security']
+                        unless hObject.empty?
+                           hReturn = SecurityConstraint.unpack(hObject, responseObj)
+                           unless hReturn.nil?
+                              intConstraint[:securityConstraint] = hReturn
+                           end
                         end
+                     end
+                     if intConstraint[:securityConstraint].empty?
+                        responseObj[:readerExecutionMessages] << 'Security Constraint object is missing or empty'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                  end
 
-                        return intConstraint
+                  return intConstraint
 
-                    end
-
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end