From cd98f383b7021ec795bedce668e6ce838ff2efd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Starosta?= <afas15@inf.ufpr.br> Date: Wed, 11 Jan 2017 09:30:36 -0200 Subject: [PATCH] Start using ruby-2.2 --- scripts/drc-sample-script.rb | 17 +++++++++++------ scripts/itens.rb | 23 ++++++++++++++++++----- scripts/out.txr | 10 ++++++++++ 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 scripts/out.txr diff --git a/scripts/drc-sample-script.rb b/scripts/drc-sample-script.rb index 8757078..b460358 100644 --- a/scripts/drc-sample-script.rb +++ b/scripts/drc-sample-script.rb @@ -11,6 +11,7 @@ create_item=true # ============================================================================ # # Create Dspace Client client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest') +# , logger: Logger.new(STDOUT) if !client.is_running? raise 'Can\'t connect to DSpace API.' end @@ -105,15 +106,19 @@ item_metadata = Dspace::Item.new( ) item = client.collections.create_item(item_metadata, id: collection.id) -file = File.new('logo-c3sl.png', 'r') +file = File.new('/home/starosta/c3sl/dspace-scripts/scripts/logo-c3sl.png', 'r') +p"aaaa" +p item + +p "Item.id >> #{item.id}" client.items.add_bitstream( - file, - id: item.id, - name: "logo-c3sl.png", - description: "Description for this awesome bitstream", - bundle_name:"???" + file , + id: item.id , + name: 'logo-c3sl', + description: 'Description for this awesome bitstream' ) +p "aqui 2" puts "Created item!\n#{item.inspect}\n" # Get ITEM's METADATA diff --git a/scripts/itens.rb b/scripts/itens.rb index 071b885..58f4a22 100644 --- a/scripts/itens.rb +++ b/scripts/itens.rb @@ -35,7 +35,6 @@ def parseItem searchItem $client.communities.all.each do |community| $client.communities.collections(:id => community.id).each do |collection| $client.collections.items(:id => collection.id, limit: 10, offset: 0, expand: "metadata").each do |item| - puts "name: #{item.name}" if(searchItem == item.name) return(item.id) end @@ -128,9 +127,17 @@ def createItem file,id {'key' => "dc.description", 'value' => description} ] ) - p id - item = $client.collections.create_item(item_metadata, id: id) - itemID = parseItem(title) + # p id + if(id == 0) + p "Item-miss #{title} file: #{file}" + $itemmiss += 1 + $missedCols << file + else + p "Criando item #{title}" + item = $client.collections.create_item(item_metadata, id: id) + end + + # itemID = parseItem(title) # g = Dir[file + "/*"].sort # g.each{|file| # if(file.split('.')[-1]=="pdf") @@ -158,6 +165,8 @@ end $client.login 'admin@seppirdev.com', 'adminadmin' #################################### C O L E C O E S ############################################## $metamiss = 0 +$itemmiss = 0 +$missedCols = Array.new root ='/home/starosta/c3sl/dspaceFiles/BANCO-SEPPIR-20160624/' d = Dir[root + "*"].sort d.each{|file| @@ -168,4 +177,8 @@ d.each{|file| id = parseCommunity(nameFile) itemFinderRec(file,id) } -puts"Hits: #{$hit} Misses: #{$metamiss}" +puts"Item-Miss: #{$itemmiss} Misses: #{$metamiss}" +puts "Missed cols" +$missedCols.each{|col| + p col +} diff --git a/scripts/out.txr b/scripts/out.txr new file mode 100644 index 0000000..3788d41 --- /dev/null +++ b/scripts/out.txr @@ -0,0 +1,10 @@ +Created community! +#<Dspace::Community:0x0055e1c47f79b0 @id="4e55a6c4-7a4b-4708-9df1-16f76304b0cc", @name="Community Created by dspace-rest-client", @handle="123456789/21017", @type="community", @link="/rest/communities/4e55a6c4-7a4b-4708-9df1-16f76304b0cc", @copyright_text="", @introductory_text="introductoryText for this awesome community!", @short_description="shortDescription for this awesome community!", @sidebar_text="sidebarText for this awesome community!", @count_items=0, @expand=["parentCommunity", "collections", "subCommunities", "logo", "all"], @sub_communities=[], @collections=[]> +Community successfully updated! +Created collection! +#<Dspace::Collection:0x0055e1c560f278 @id="5f45aa5e-612a-46a5-8689-9291b568ae1d", @name="Collection Created by dspace-rest-client", @handle="123456789/21018", @type="collection", @link="/rest/collections/5f45aa5e-612a-46a5-8689-9291b568ae1d", @license=nil, @copyright_text="", @introductory_text="introductoryText for this awesome collection!", @short_description="shortDescription for this awesome collection!", @sidebar_text="sidebarText for this awesome collection!", @number_items=0, @expand=["parentCommunityList", "parentCommunity", "items", "license", "logo", "all"], @parent_community_list=[], @items=[]> +Collection successfully updated! +"---------------------------------------------------------" +#<Dspace::Client:0x0055e1c55ea1a8 @access_token="JSESSIONID=C2C72DA6960132B90927A819EC9BEDF4; Path=/rest/; Secure; HttpOnly", @dspace_api="https://seppirdev.c3sl.ufpr.br:8443/rest", @logger=nil, @resources={:status=>#<Dspace::Resources::StatusResource:0x0055e1c4be3b50 @connection=#<Faraday::Connection:0x0055e1c55e9c30 @parallel_manager=nil, @headers={"Content-Type"=>"application/json", "Accept"=>"application/json", "User-Agent"=>"dspace-rest-client 3.0.0", "Cookie"=>""}, @params={}, @options=#<Faraday::RequestOptions (empty)>, @ssl=#<Faraday::SSLOptions (empty)>, @default_parallel_manager=nil, @builder=#<Faraday::RackBuilder:0x0055e1c55e98c0 @handlers=[Faraday::Request::Multipart, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttpPersistent], @app=#<Faraday::Request::Multipart:0x0055e1c4c57820 @app=#<Faraday::Request::UrlEncoded:0x0055e1c4c57910 @app=#<Faraday::Adapter::NetHttpPersistent:0x0055e1c4c579d8 @app=#<Proc:0x0055e1c4c57be0@/home/starosta/.rvm/gems/ruby-2.3.0/gems/faraday-0.9.2/lib/faraday/rack_builder.rb:152 (lambda)>>>>>, @url_prefix=#<URI::HTTPS https://seppirdev.c3sl.ufpr.br:8443/rest>, @proxy=nil>, @scope=nil>, :authentication=>#<Dspace::Resources::AuthenticationResource:0x0055e1c4c0a520 @connection=#<Faraday::Connection:0x0055e1c4c10ec0 @parallel_manager=nil, @headers={"Content-Type"=>"application/json", "Accept"=>"application/json", "User-Agent"=>"dspace-rest-client 3.0.0", "Cookie"=>""}, @params={}, @options=#<Faraday::RequestOptions (empty)>, @ssl=#<Faraday::SSLOptions (empty)>, @default_parallel_manager=nil, @builder=#<Faraday::RackBuilder:0x0055e1c4c10560 @handlers=[Faraday::Request::Multipart, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttpPersistent], @app=#<Faraday::Request::Multipart:0x0055e1c4bf2c68 @app=#<Faraday::Request::UrlEncoded:0x0055e1c4bf2df8 @app=#<Faraday::Adapter::NetHttpPersistent:0x0055e1c4bf2f38 @app=#<Proc:0x0055e1c4bf3140@/home/starosta/.rvm/gems/ruby-2.3.0/gems/faraday-0.9.2/lib/faraday/rack_builder.rb:152 (lambda)>>>>>, @url_prefix=#<URI::HTTPS https://seppirdev.c3sl.ufpr.br:8443/rest>, @proxy=nil>, @scope=nil>, :communities=>#<Dspace::Resources::CommunityResource:0x0055e1c5625500 @connection=#<Faraday::Connection:0x0055e1c56267e8 @parallel_manager=nil, @headers={"Content-Type"=>"application/json", "Accept"=>"application/json", "User-Agent"=>"dspace-rest-client 3.0.0", "Cookie"=>"JSESSIONID=C2C72DA6960132B90927A819EC9BEDF4; Path=/rest/; Secure; HttpOnly"}, @params={}, @options=#<Faraday::RequestOptions (empty)>, @ssl=#<Faraday::SSLOptions (empty)>, @default_parallel_manager=nil, @builder=#<Faraday::RackBuilder:0x0055e1c5626298 @handlers=[Faraday::Request::Multipart, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttpPersistent], @app=#<Faraday::Request::Multipart:0x0055e1c561f498 @app=#<Faraday::Request::UrlEncoded:0x0055e1c561f6c8 @app=#<Faraday::Adapter::NetHttpPersistent:0x0055e1c561f8a8 @app=#<Proc:0x0055e1c561fb00@/home/starosta/.rvm/gems/ruby-2.3.0/gems/faraday-0.9.2/lib/faraday/rack_builder.rb:152 (lambda)>>>>>, @url_prefix=#<URI::HTTPS https://seppirdev.c3sl.ufpr.br:8443/rest>, @proxy=nil>, @scope=nil>, :collections=>#<Dspace::Resources::CollectionResource:0x0055e1c55ec7c8 @connection=#<Faraday::Connection:0x0055e1c55ee208 @parallel_manager=nil, @headers={"Content-Type"=>"application/json", "Accept"=>"application/json", "User-Agent"=>"dspace-rest-client 3.0.0", "Cookie"=>"JSESSIONID=C2C72DA6960132B90927A819EC9BEDF4; Path=/rest/; Secure; HttpOnly"}, @params={}, @options=#<Faraday::RequestOptions (empty)>, @ssl=#<Faraday::SSLOptions (empty)>, @default_parallel_manager=nil, @builder=#<Faraday::RackBuilder:0x0055e1c55edcb8 @handlers=[Faraday::Request::Multipart, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttpPersistent], @app=#<Faraday::Request::Multipart:0x0055e1c55ea770 @app=#<Faraday::Request::UrlEncoded:0x0055e1c55ea950 @app=#<Faraday::Adapter::NetHttpPersistent:0x0055e1c55ea9c8 @app=#<Proc:0x0055e1c55eaae0@/home/starosta/.rvm/gems/ruby-2.3.0/gems/faraday-0.9.2/lib/faraday/rack_builder.rb:152 (lambda)>>>>>, @url_prefix=#<URI::HTTPS https://seppirdev.c3sl.ufpr.br:8443/rest>, @proxy=nil>, @scope=nil>}> +"---------------------------------------------------------" +"Item.id >> 87fe5d71-4596-446e-b949-2cc7b80bd177" -- GitLab