ddr-models 1.11.8 → 1.12.0

data/spec/factories/test_model_factories.rb

@@ -14,14 +14,9 @@ class TestChild < TestModel
   belongs_to :parent, property: :is_part_of, class_name: 'TestParent'
 end
 
-class TestContentMetadata < TestParent
-  include Ddr::Models::HasContentMetadata
-end
-
 class TestModelOmnibus < TestModel
   include Ddr::Models::Governable
   include Ddr::Models::HasContent
-  include Ddr::Models::HasContentMetadata
   include Ddr::Models::HasAttachments
   has_many :children, property: :is_part_of, class_name: 'TestChild'
   belongs_to :parent, property: :is_part_of, class_name: 'TestParent'
@@ -68,58 +63,6 @@ FactoryGirl.define do
       after(:create) { |c| c.fixity_check! }
     end
   end
-  
-  factory :test_content_metadata do
-    title [ "DulHydra Test Content Metadata Object" ]
-    sequence(:identifier) { |n| [ "testcontentmetadata%05d" % n ] }
-    
-    factory :test_content_metadata_has_children do
-      ignore do
-        child_count 3
-      end
-      after(:create) do |parent, evaluator|
-        FactoryGirl.create_list(:test_child, evaluator.child_count, :parent => parent)
-        child_pids = []
-        parent.children.each do |child|
-          child_pids << child.pid
-        end
-        parent.contentMetadata.content = <<-EOS
-          <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
-            <fileSec>
-              <fileGrp ID="GRP01" USE="Master Image">
-                <file ID="FILE001">
-                  <FLocat xlink:href="#{child_pids[2]}/content" LOCTYPE="URL"/>
-                </file>
-                <file ID="FILE002">
-                  <FLocat xlink:href="#{child_pids[0]}/content" LOCTYPE="URL"/>
-                </file>
-              </fileGrp>
-              <fileGrp ID="GRP00" USE="Composite PDF">
-                <file ID="FILE000">
-                  <FLocat xlink:href="#{child_pids[1]}/content" LOCTYPE="URL"/>
-                </file>
-              </fileGrp>
-            </fileSec>
-            <structMap>
-              <div ID="DIV01" TYPE="image" LABEL="Images">
-                <div ORDER="1">
-                  <fptr FILEID="FILE001"/>
-                </div>
-                <div ORDER="2">
-                  <fptr FILEID="FILE002"/>
-                </div>
-              </div>
-              <div ID="DIV00" TYPE="pdf" LABEL="PDF">
-                <fptr FILEID="FILE000"/>
-              </div>
-            </structMap>
-          </mets>
-        EOS
-        parent.contentMetadata.mimeType = "application/xml"
-        parent.save!
-      end
-    end
-  end
 
   factory :test_model_omnibus do
     title [ "DulHydra Test Omnibus Object" ]

data/spec/models/collection_spec.rb

@@ -20,11 +20,6 @@ RSpec.describe Collection, :type => :model do
       expect(collection.defaultRights.license.description.first).to eq("License Description")
       expect(collection.defaultRights.license.url.first).to eq("http://library.duke.edu")
     end
-    it "should index the terms" do
-      expect(collection.to_solr[Ddr::IndexFields::DEFAULT_LICENSE_TITLE]).to eq("License Title")
-      expect(collection.to_solr[Ddr::IndexFields::DEFAULT_LICENSE_DESCRIPTION]).to eq("License Description")
-      expect(collection.to_solr[Ddr::IndexFields::DEFAULT_LICENSE_URL]).to eq("http://library.duke.edu")
-    end
   end
 
   describe "#components_from_solr" do

data/spec/models/descriptive_metadata_datastream_spec.rb

@@ -25,19 +25,19 @@ module Ddr
       context "terminology" do
         subject { described_class.term_names }
         it "should have a term for each term name in the RDF::DC vocab" do
-          expect(subject).to include(*Ddr::Metadata::Vocabulary.term_names(RDF::DC))
+          expect(subject).to include(*Ddr::Vocab::Vocabulary.term_names(RDF::DC))
         end
         it "should have a term for each term name in the DukeTerms vocab" do
-          expect(subject).to include(*Ddr::Metadata::Vocabulary.term_names(Ddr::Metadata::DukeTerms))
+          expect(subject).to include(*Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms))
         end
       end
       context "properties" do
         subject { described_class.properties.map { |prop| prop[1].predicate } }
         it "should include all the RDF::DC predicates" do
-          expect(subject).to include(*Ddr::Metadata::Vocabulary.property_terms(RDF::DC))
+          expect(subject).to include(*Ddr::Vocab::Vocabulary.property_terms(RDF::DC))
         end
         it "should include all the DukeTerms predicates" do
-          expect(subject).to include(*Ddr::Metadata::Vocabulary.property_terms(Ddr::Metadata::DukeTerms))
+          expect(subject).to include(*Ddr::Vocab::Vocabulary.property_terms(Ddr::Vocab::DukeTerms))
         end
       end
       context "raw content" do
@@ -77,6 +77,22 @@ module Ddr
           expect(ds.resource).to be_isomorphic_with(RDF::Reader.for(:ntriples).new(content))
         end
       end
+      context "using the set_values and add_value methods" do
+        let(:ds) { described_class.new(nil, 'descMetadata') }
+        before { ds.type = "Photograph" }
+        context "#set_values" do
+          it "should set the values of the term to those supplied" do
+            ds.set_values :type, [ "Image", "Still Image" ]
+            expect(ds.type).to eq([ "Image", "Still Image" ])
+          end
+        end
+        context "#add_value" do
+          it "should add the supplied value to those of the term" do
+            ds.add_value :type, "Image"
+            expect(ds.type).to eq([ "Photograph", "Image" ])
+          end
+        end
+      end
       context "solrization" do
         let(:ds) { described_class.new(nil, 'descMetadata') }
         subject { ds.to_solr }

data/spec/models/events_spec.rb

@@ -60,5 +60,13 @@ module Ddr
         expect(subject.display_type).to eq "Validation"
       end
     end
+
+    RSpec.describe DeletionEvent, type: :model, events: true do
+      it_behaves_like "an event"
+      it_behaves_like "a preservation-related event"
+      it "should have a display type" do
+        expect(subject.display_type).to eq "Deletion"
+      end
+    end
   end
 end

data/spec/models/has_struct_metadata_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Ddr
+  module Models
+    RSpec.describe HasStructMetadata, type: :model do
+
+      context "component" do
+        describe "component creation" do
+          let(:item) { Item.new }
+          let(:comp) { Component.new(identifier: [ "id001" ]) }
+          before do
+            allow(comp).to receive(:parent).and_return(item)
+            allow(comp).to receive(:has_content?).and_return(true)
+            allow(comp).to receive(:content_type).and_return("image/tiff")
+            allow(item).to receive(:children_by_file_use).and_return({})
+          end
+          it "should assign default values for unassigned attributes" do
+            comp.save
+            expect(comp.file_use).to_not be_nil
+            expect(comp.order).to_not be_nil
+            expect(comp.file_group).to_not be_nil
+          end
+          it "should not overwrite assigned attributes" do
+            comp.update_attributes(file_use: 'foo', order: 3, file_group: 'special')
+            expect(comp.file_use).to eq('foo')
+            expect(comp.order).to eq(3)
+            expect(comp.file_group).to eq('special')
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/models/item_spec.rb

@@ -2,7 +2,19 @@ require 'spec_helper'
 
 RSpec.describe Item, :type => :model do
   it_behaves_like "a DDR model"
-  it_behaves_like "an object that has content metadata"
   it_behaves_like "it has an association", :belongs_to, :parent, :is_member_of_collection, "Collection"
   it_behaves_like "it has an association", :has_many, :children, :is_part_of, "Component"
+
+  context "has structured children" do
+    let!(:item) { Item.create }
+    let!(:comp1) { Component.create(parent: item, file_use: 'master', order: 2) }
+    let!(:comp2) { Component.create(parent: item, file_use: 'reference', order: 1) }
+    let!(:comp3) { Component.create(parent: item, file_use: 'master', order: 1) }
+    it "should group and order the children" do
+      results = item.children_by_file_use
+      expect(results['master']).to eq([ comp3, comp1 ])
+      expect(results['reference']).to eq([ comp2 ])
+    end
+  end
+  
 end

data/spec/support/shared_examples_for_ddr_models.rb

@@ -1,8 +1,18 @@
 RSpec.shared_examples "a DDR model" do
+
   it_behaves_like "a describable object"
   it_behaves_like "a governable object"
-  it_behaves_like "a licensable object"
   it_behaves_like "an access controllable object"
   it_behaves_like "an object that has properties"
   it_behaves_like "an object that has a display title"
+
+  describe "events" do
+    describe "on deletion with #destroy" do
+      before { subject.save(validate: false) }
+      it "should create a deletion event" do
+        expect { subject.destroy }.to change { Ddr::Events::DeletionEvent.for_object(subject).count }.from(0).to(1)
+      end
+    end
+  end
+
 end

data/spec/support/shared_examples_for_describables.rb

@@ -15,11 +15,11 @@ RSpec.shared_examples "a describable object" do
     end
     describe "arguments" do
       it "with fixed results" do
-        expect(object.desc_metadata_terms(:dcterms)).to eq(Ddr::Metadata::Vocabulary.term_names(RDF::DC11) + (Ddr::Metadata::Vocabulary.term_names(RDF::DC) - Ddr::Metadata::Vocabulary.term_names(RDF::DC11)))
-        expect(object.desc_metadata_terms(:dcterms)).to match_array Ddr::Metadata::Vocabulary.term_names(RDF::DC)
-        expect(object.desc_metadata_terms(:duke)).to eq Ddr::Metadata::Vocabulary.term_names(Ddr::Metadata::DukeTerms)
-        expect(object.desc_metadata_terms(:dcterms_elements11)).to eq Ddr::Metadata::Vocabulary.term_names(RDF::DC11)
-        expect(object.desc_metadata_terms(:defined_attributes)).to match_array Ddr::Metadata::Vocabulary.term_names(RDF::DC11)
+        expect(object.desc_metadata_terms(:dcterms)).to eq(Ddr::Vocab::Vocabulary.term_names(RDF::DC11) + (Ddr::Vocab::Vocabulary.term_names(RDF::DC) - Ddr::Vocab::Vocabulary.term_names(RDF::DC11)))
+        expect(object.desc_metadata_terms(:dcterms)).to match_array Ddr::Vocab::Vocabulary.term_names(RDF::DC)
+        expect(object.desc_metadata_terms(:duke)).to eq Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
+        expect(object.desc_metadata_terms(:dcterms_elements11)).to eq Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
+        expect(object.desc_metadata_terms(:defined_attributes)).to match_array Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
       end
       context "with variable results" do
         before do

data/spec/support/shared_examples_for_events.rb

@@ -31,27 +31,12 @@ end
 
 RSpec.shared_examples "an event" do
   describe "validation" do
-    context "of pid" do
-      it "should require presence" do
-        expect(subject).not_to be_valid
-        expect(subject.errors[:pid]).to include "can't be blank"
-      end
-      context "when the object exists" do
-        before { subject.pid = ActiveFedora::Base.create.pid }
-        it "should be valid" do
-          expect(subject).to be_valid
-        end
-      end
-      context "when the object doesn't exist" do
-        before { subject.pid = "test:123" }
-        it "should not be valid" do
-          expect(subject).not_to be_valid
-          expect(subject.errors).to have_key :pid
-        end
-      end
+    it "should require a PID" do
+      expect(subject).not_to be_valid
+      expect(subject.errors[:pid]).to include "can't be blank"
     end
     it "should require an event_date_time" do
-      subject.event_date_time = nil # reset b/c set to default after init
+      allow(subject).to receive(:event_date_time) { nil } # b/c set to default after init
       expect(subject).not_to be_valid
       expect(subject.errors[:event_date_time]).to include "can't be blank"
     end
@@ -135,27 +120,6 @@ RSpec.shared_examples "an event" do
     end
   end
 
-  describe "object existence" do
-    it "should be false if pid is nil" do
-      expect(subject.object_exists?).to be_falsey
-    end
-    it "should be false if pid not found in repository" do
-      subject.pid = "test:123"
-      expect(subject.object_exists?).to be_falsey
-    end
-    it "should be true if object exists in repository" do
-      allow(ActiveFedora::Base).to receive(:find).with("test:123") { mock_object }
-      subject.pid = "test:123"
-      expect(subject.object_exists?).to be_truthy
-    end
-    it "should be true if object instance variable is set" do
-      obj = mock_object(pid: "test:123")
-      allow(obj).to receive(:new_record?) { false }
-      subject.object = obj
-      expect(subject.object_exists?).to be_truthy
-    end
-  end
-
   describe "event_date_time string representation" do
     subject { described_class.new(event_date_time: Time.utc(2014, 6, 4, 11, 7, 35)) }
     it "should conform to the specified format" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.11.8
+  version: 1.12.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -323,19 +323,19 @@ files:
 - lib/ddr/auth/superuser.rb
 - lib/ddr/auth/user.rb
 - lib/ddr/datastreams.rb
-- lib/ddr/datastreams/admin_metadata_datastream.rb
-- lib/ddr/datastreams/content_metadata_datastream.rb
+- lib/ddr/datastreams/administrative_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
-- lib/ddr/datastreams/preservation_metadata_datastream.rb
+- lib/ddr/datastreams/metadata_datastream.rb
 - lib/ddr/datastreams/properties_datastream.rb
+- lib/ddr/datastreams/structural_metadata_datastream.rb
 - lib/ddr/events.rb
 - lib/ddr/events/creation_event.rb
+- lib/ddr/events/deletion_event.rb
 - lib/ddr/events/event.rb
 - lib/ddr/events/fixity_check_event.rb
 - lib/ddr/events/ingestion_event.rb
 - lib/ddr/events/preservation_event_behavior.rb
-- lib/ddr/events/preservation_event_type.rb
 - lib/ddr/events/reindex_object_after_save.rb
 - lib/ddr/events/update_event.rb
 - lib/ddr/events/validation_event.rb
@@ -347,11 +347,7 @@ files:
 - lib/ddr/managers/role_manager.rb
 - lib/ddr/managers/workflow_manager.rb
 - lib/ddr/metadata.rb
-- lib/ddr/metadata/duke_terms.rb
 - lib/ddr/metadata/premis_event.rb
-- lib/ddr/metadata/rdf_vocabulary_parser.rb
-- lib/ddr/metadata/sources/duketerms.rdf.xml
-- lib/ddr/metadata/vocabulary.rb
 - lib/ddr/models.rb
 - lib/ddr/models/access_controllable.rb
 - lib/ddr/models/base.rb
@@ -366,8 +362,8 @@ files:
 - lib/ddr/models/has_attachments.rb
 - lib/ddr/models/has_children.rb
 - lib/ddr/models/has_content.rb
-- lib/ddr/models/has_content_metadata.rb
 - lib/ddr/models/has_properties.rb
+- lib/ddr/models/has_struct_metadata.rb
 - lib/ddr/models/has_thumbnail.rb
 - lib/ddr/models/indexing.rb
 - lib/ddr/models/licensable.rb
@@ -377,7 +373,11 @@ files:
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
 - lib/ddr/vocab/asset.rb
+- lib/ddr/vocab/duke_terms.rb
+- lib/ddr/vocab/rdf_vocabulary_parser.rb
 - lib/ddr/vocab/roles.rb
+- lib/ddr/vocab/sources/duketerms.rdf.xml
+- lib/ddr/vocab/vocabulary.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
 - spec/dummy/README.rdoc
@@ -428,7 +428,6 @@ files:
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
-- spec/fixtures/contentMetadata.xml
 - spec/fixtures/image1.tiff
 - spec/fixtures/image2.tiff
 - spec/fixtures/image3.tiff
@@ -446,27 +445,23 @@ files:
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
+- spec/models/has_struct_metadata_spec.rb
 - spec/models/item_spec.rb
-- spec/models/solr_document_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb
 - spec/models/user_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/services/group_service_spec.rb
-- spec/services/remote_group_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_access_controllables.rb
 - spec/support/shared_examples_for_associations.rb
 - spec/support/shared_examples_for_ddr_models.rb
 - spec/support/shared_examples_for_describables.rb
-- spec/support/shared_examples_for_event_loggables.rb
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
-- spec/support/shared_examples_for_has_content_metadata.rb
 - spec/support/shared_examples_for_has_properties.rb
 - spec/support/shared_examples_for_indexing.rb
-- spec/support/shared_examples_for_licensable.rb
 homepage: https://github.com/duke-libraries/ddr-models
 licenses:
 - BSD-3-Clause
@@ -543,7 +538,6 @@ test_files:
 - spec/factories/target_factories.rb
 - spec/factories/test_model_factories.rb
 - spec/factories/user_factories.rb
-- spec/fixtures/contentMetadata.xml
 - spec/fixtures/image1.tiff
 - spec/fixtures/image2.tiff
 - spec/fixtures/image3.tiff
@@ -561,24 +555,20 @@ test_files:
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
+- spec/models/has_struct_metadata_spec.rb
 - spec/models/item_spec.rb
-- spec/models/solr_document_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb
 - spec/models/user_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/services/group_service_spec.rb
-- spec/services/remote_group_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_access_controllables.rb
 - spec/support/shared_examples_for_associations.rb
 - spec/support/shared_examples_for_ddr_models.rb
 - spec/support/shared_examples_for_describables.rb
-- spec/support/shared_examples_for_event_loggables.rb
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
-- spec/support/shared_examples_for_has_content_metadata.rb
 - spec/support/shared_examples_for_has_properties.rb
 - spec/support/shared_examples_for_indexing.rb
-- spec/support/shared_examples_for_licensable.rb

data/lib/ddr/datastreams/content_metadata_datastream.rb

@@ -1,147 +0,0 @@
-module Ddr
-  module Datastreams
-    class ContentMetadataDatastream < ActiveFedora::Datastream
-    
-      def parse
-        parsed = []
-        cm = Nokogiri::XML(self.content)
-        fileSec_nodes = cm.xpath("//xmlns:fileSec")
-        structMap_nodes = cm.xpath("//xmlns:structMap").sort{ |x,y| sort_nodes(x, y) }
-        structMap_nodes.each do |structMap_node|
-          structMap_hash = {}
-          div_nodes = structMap_node.xpath("xmlns:div").sort{ |x,y| sort_nodes(x,y) }
-          div_array = []
-          div_nodes.each do |div_node|
-            div_array << parse_div(fileSec_nodes, div_node)
-          end
-          structMap_hash["div"] = div_array
-          parsed << structMap_hash
-        end
-        return parsed
-      end
-      
-      def to_solr(solr_doc=Hash.new)
-        solr_doc = super(solr_doc)
-        if self.content
-          solr_doc.merge!({Ddr::IndexFields::CONTENT_METADATA_PARSED => parse.to_json})
-        end
-        solr_doc
-      end    
-      
-      def first_pid
-        find_first_pid(parse.first)
-      end
-      
-      private
-      
-      def find_first_pid(structure)
-        case
-        when structure.has_key?("div")
-          find_first_pid(structure["div"].first)
-        when structure.has_key?("pids")
-          structure["pids"].first["pid"]
-        end
-      end
-      
-      def walk_structure_to_pid(structure)
-        if structure.has_key("div")
-          walk_structure_div(structure["div"])
-        else 
-        end
-        
-      end
-      
-      def parse_div(fileSec_nodes, div_node)
-        div_hash = {}
-        div_hash["label"] = div_node["LABEL"] unless div_node["LABEL"].nil?
-        div_hash["orderlabel"] = div_node["ORDERLABEL"] unless div_node["ORDERLABEL"].nil?
-        div_hash["type"] = div_node["TYPE"] unless div_node["TYPE"].nil?
-        div_subnodes = div_node.xpath("xmlns:div").sort{ |x,y| sort_nodes(x, y) }
-        if div_subnodes.empty?
-          fptr_nodes = div_node.xpath("xmlns:fptr")
-          fptr_array = []
-          fptr_nodes.each do |fptr_node|
-            fptr_hash = {}
-            if !fptr_node["FILEID"].nil?
-              pid = get_pid(fileSec_nodes, fptr_node["FILEID"])
-              file_use = get_use(fileSec_nodes, fptr_node["FILEID"])
-              fptr_hash["pid"] = pid unless pid.nil?
-              fptr_hash["use"] = file_use unless file_use.nil?
-            end
-            fptr_array << fptr_hash
-          end
-          div_hash["pids"] = fptr_array
-        else
-          div_array = []
-          div_subnodes.each do |div_subnode|
-            div_array << parse_div(fileSec_nodes, div_subnode)
-          end
-          div_hash["div"] = div_array
-        end
-        return div_hash
-      end
-      
-      def get_use(fileSec_nodes, file_id)
-        file_nodes = fileSec_nodes.xpath("//xmlns:file[@ID='#{file_id}']")
-        file_node =
-          case file_nodes.size
-          when 1
-            file_nodes.first
-          when 0
-            raise "Matching file node not found"
-          else
-            raise "Multiple matching file nodes found"
-          end
-        return find_use(file_node)
-      end
-      
-      def find_use(node)
-        file_use = nil
-        if node["USE"].nil?
-          file_use = find_use(node.parent) unless node.name.eql?("fileGrp")
-        else
-          file_use = node["USE"]
-        end
-        return file_use
-      end
-      
-      def get_pid(fileSec_nodes, file_id)
-        file_nodes = fileSec_nodes.xpath("//xmlns:file[@ID='#{file_id}']")
-        file_node =
-          case file_nodes.size
-          when 1
-            file_nodes.first
-          when 0
-            raise "Matching file node not found"
-          else
-            raise "Multiple matching file nodes found"
-          end
-        fLocat_nodes = file_node.xpath("xmlns:FLocat")
-        fLocat_node =
-          case fLocat_nodes.size
-          when 1
-            fLocat_nodes.first
-          when 0
-            raise "FLocat node not found"
-          else
-            raise "Multiple FLocat nodes found"
-          end
-        href = fLocat_node["xlink:href"]
-        pid = href.split('/')[0]
-      end
-      
-      def sort_nodes(node_1, node_2)
-        if node_1["ORDER"].nil? && node_2["ORDER"].nil?
-          return 0
-        elsif node_1["ORDER"].nil?
-          return 1
-        elsif node_2["ORDER"].nil?
-          return -1
-        else
-          return node_1["ORDER"].to_i <=> node_2["ORDER"].to_i
-        end
-      end
-
-    end    
-  end
-end