argos-ruby 1.0.0 → 1.0.1

data/bin/argos-ruby

@@ -87,9 +87,13 @@ Dir[glob].select {|f|
 
   case param[:action]
     when "source"
+     
       result << Argos.source(argos).merge(glob: glob, bundle: bundle)
+      
     when "parse"
+      
       arr = argos.parse(filename)
+      
       unless param[:dest].nil?
         jsonfile = "#{param[:dest].gsub(/\$/, "")}/#{argos.source}.json"
         File.open(jsonfile, "w") { |file| file.write(arr.to_json) }

data/lib/argos/diag.rb

@@ -17,7 +17,7 @@ module Argos
   
     LOCATION_CLASS = ["3", "2", "1", "0", "A", "B", "Z"]
 
-    attr_accessor :log, :filename, :programs
+    attr_accessor :log, :filename, :programs, :multiplicates
 
     attr_reader :filename, :filter, :filtername, :sha1, :valid, :filesize
   
@@ -142,7 +142,14 @@ module Argos
       else
         log.info "Parsed #{self.size} Argos DIAG segments sha1:#{sha1} #{filename}"
       end
-        
+  
+      @multiplicates = group_by { |e| e }.select { |k, v| v.size > 1 }.map(&:first)
+      if multiplicates.any?
+        log.warn "Multiplicates (source sha1 #{sha1} #{filename}): #{multiplicates.to_json}"
+        self.uniq!
+        log.info "Unique DIAG messages: #{self.size} sha1: #{sha1} #{filename}"
+      end
+    
       self
     end
   

data/lib/argos/ds.rb

@@ -19,7 +19,7 @@ module Argos
 
     attr_writer :log, :filename
 
-    attr_reader :filename, :filter, :filtername, :valid, :filesize, :sha1, :messages
+    attr_reader :filename, :filter, :filtername, :valid, :filesize, :sha1, :messages, :multiplicates
 
     START_REGEX = /^\d{5} \d{5,6} +\d+ +\d+/
 
@@ -146,6 +146,14 @@ module Argos
       unfold.each do |d|
         self << d
       end
+
+      @multiplicates = group_by { |e| e }.select { |k, v| v.size > 1 }.map(&:first)
+      if multiplicates.any?
+        log.warn "Multiplicates (source sha1 #{sha1} #{filename}): #{multiplicates.to_json}"
+        self.uniq!
+        log.info "Unique DS messages: #{self.size} sha1: #{sha1} #{filename}"
+      end
+      
       self
     end
   

data/lib/argos.rb

@@ -16,7 +16,7 @@ require_relative "argos/diag"
 # 
 # For information about Argos, see: http://www.argos-system.org
 module Argos
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
   # Detect Argos type ("ds" or "diag" or nil)
   #
   # @param filename [String] Argos (DS or DIAG) file
@@ -101,7 +101,10 @@ module Argos
     end
     
 
-    { id: argos.source,
+    source = {
+      id: argos.source,
+      technology: "argos",
+      collection: "tracking",
       type: argos.type,
       programs: argos.programs,
       platforms: argos.platforms,
@@ -117,8 +120,13 @@ module Argos
       filesize: argos.filesize,
       messages: argos.messages.size,
       filter: argos.filtername.nil? ? argos.filter : argos.filtername,
-      size: argos.size,
+      size: argos.size
     }
+    if argos.multiplicates.any?
+      source[:multiplicates] = argos.multiplicates.map {|a| a[:id]}
+    end
+    source
+    
   end
 
 
@@ -137,6 +145,5 @@ module Argos
   def programs
     map {|a| a[:program]}.uniq.sort
   end
-
-
+  
 end

data/spec/argos/_diag/dup.diag

@@ -0,0 +1,12 @@
+074776 Date : 21.08.12 13:49:05  LC : Z  IQ : 00
+      Lat1 : ???????  Lon1 : ????????  Lat2 : ???????  Lon2 : ????????
+      Nb mes : 001  Nb mes>-120dB : 000  Best level : -128 dB
+      Pass duration : ???s  NOPC :  ?
+      Calcul freq : 401 631510.3 Hz   Altitude :    0 m
+              01           52           00           83
+074776 Date : 21.08.12 13:49:05  LC : Z  IQ : 00
+      Lat1 : ???????  Lon1 : ????????  Lat2 : ???????  Lon2 : ????????
+      Nb mes : 001  Nb mes>-120dB : 000  Best level : -128 dB
+      Pass duration : ???s  NOPC :  ?
+      Calcul freq : 401 631510.3 Hz   Altitude :    0 m
+              01           52           00           83 

data/spec/argos/_ds/dup.ds

@@ -0,0 +1,8 @@
+09660 10783   4  3 K 3 1999-12-24 16:52:54  79.826   22.326  0.000 401649689    
+      1999-12-24 16:50:29  1         76           00           00               
+      1999-12-24 16:54:21  4         76           00           00               
+      1999-12-24 16:55:19  1         76           00           32
+09660 10783   4  3 K 3 1999-12-24 16:52:54  79.826   22.326  0.000 401649689    
+      1999-12-24 16:50:29  1         76           00           00               
+      1999-12-24 16:54:21  4         76           00           00               
+      1999-12-24 16:55:19  1         76           00           32     

data/spec/argos/diag_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper.rb'
 module Argos
 
   describe Diag do
-  
-    VALID_DIAG = File.expand_path(File.dirname(__FILE__)+"/_diag/990660_A.DIA")
+      
+    VALID_DIAG = diagfile("990660_A.DIA")
   
     describe "#type" do
       it do
@@ -24,6 +24,10 @@ module Argos
         @diag.filter =  lambda{|a| true}
         @diag.parse(VALID_DIAG).should be_kind_of Diag
       end
+      
+      it "should return unique elements" do
+        @diag.parse(diagfile("dup.diag")).size.should == 1
+      end
   
       describe "#size" do
         it "should == number messages" do

data/spec/argos/ds_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper.rb'
 
 module Argos
+  
 
   describe Ds do
-  
-    VALID_DS = File.expand_path(File.dirname(__FILE__)+"/_ds/990660_A.DAT")
+    
+    VALID_DS = dsfile("990660_A.DAT")
 
     before (:each) do
       @ds = Ds.new
@@ -37,6 +38,34 @@ module Argos
         @ds.filter = lambda {|ds|true}
         @ds.parse(VALID_DS).should be_kind_of Ds
       end
+      
+      it "should return unique elements" do
+        @ds.parse(dsfile("dup.ds")).size.should == 3 # file contains 6
+      end
+      
+                  
+      it "should store multiplicates" do
+        @ds.parse(dsfile("dup.ds")).multiplicates.map {|m| m.keys }.should==3.times.map{[:program,
+         :platform,
+         :lines,
+         :sensors,
+         :satellite,
+         :lc,
+         :positioned,
+         :latitude,
+         :longitude,
+         :altitude,
+         :headers,
+         :measured,
+         :identical,
+         :sensor_data,
+         :technology,
+         :type,
+         :filename,
+         :source,
+         :parser,
+         :id]}
+      end
 
       it "should sort ascending on positioned, measured" do
         positions = @ds.select {|ds|
@@ -95,7 +124,7 @@ module Argos
     context "warn" do
 
       before(:each) do
-        @file = File.expand_path(File.dirname(__FILE__)+"/_ds/sensor_mismatch_ds.txt")
+        @file = dsfile("sensor_mismatch_ds.txt")
       end
 
       it "sensors-count-mismatch" do

data/spec/spec_helper.rb

@@ -11,4 +11,11 @@ RSpec.configure do |config|
   config.formatter =  :documentation #:progress,  :html, :textmate
 end
 
+def dsfile(filename)
+  File.expand_path(File.dirname(__FILE__)+"/argos/_ds/#{filename}")
+end
+
+def diagfile(filename)
+  File.expand_path(File.dirname(__FILE__)+"/argos/_diag/#{filename}")
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,8 +47,10 @@ files:
 - lib/argos/ds.rb
 - lib/argos/exception.rb
 - spec/argos/_diag/990660_A.DIA
+- spec/argos/_diag/dup.diag
 - spec/argos/_diag/valid_2009-03-02_DB_DIAG.txt
 - spec/argos/_ds/990660_A.DAT
+- spec/argos/_ds/dup.ds
 - spec/argos/_ds/sensor_mismatch_ds.txt
 - spec/argos/diag_spec.rb
 - spec/argos/ds_spec.rb