Improved debug mode, enabled file submission

58e2dba1 · André Starosta · ad3bb02b · 58e2dba1 · 58e2dba1 · 58e2dba1
Commit 58e2dba1 authored 8 years ago by André Starosta
--- a/scripts/colecoes.rb
+++ b/scripts/colecoes.rb
@@ -89,6 +89,7 @@ def coleRec file, id
      description = getDescription(meta)
      if(id != 0)
          $hit += 1
+          p "Criando colecao: #{name}"
          coll = $client.communities.create_collection(
          Dspace::Collection.new(
              {
@@ -116,39 +117,6 @@ def coleRec file, id
      coleRec(file,id)
    end

-  #   if(target[0] == "ITEM")
-  #     meta = file + "/" + file.split('/')[-1] +".metadata"
-  #     metarray = getItemMeta(meta)
-  #     title = metarray[0]
-  #     metarray.delete_at(0)
-  #     author = metarray[0]
-  #     metarray.delete_at(0)
-  #     description = metarray[-1]
-  #     metarray.delete_at(-1)
-  #     keywords = metarray
-  #     item_metadata = Dspace::Item.new(
-  #       'metadata' => [
-  #         {'key' => "dc.title", 'value' => title},
-  #         {'key' => "dc.creator",'value' => author},
-  #         {'key' => "dc.description", 'value' => description}
-  #
-  #       ]
-  #     )
-  #     if(id != 0)
-  #     item = $client.collections.create_item(item_metadata, id: id)
-  #     filename = file.split('/')[-1]
-  #     itemFile = File.new(file + "/" + filename[5..-1] + ".pdf")
-  #     itemID = parseItem(name)
-  #     if(itemID != 0)
-  #     $client.items.add_bitstream(
-  #       itemFile,
-  #       id: itemID,
-  #       name: name,
-  #       description: description
-  #     )
-  #     endI18n.available_locales = [:en]
-  #   end
-  # end
 end

  }
@@ -160,7 +128,11 @@ require 'dspace'
 require "i18n"
 I18n.available_locales = [:en]

+if(ARGV[0] == "debug")
+$client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest', logger: Logger.new(STDOUT))
+else
  $client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest')
+end
 if !$client.is_running?
  raise 'Can\'t connect to DSpace API.'
 end

--- a/scripts/comunidades.rb
+++ b/scripts/comunidades.rb
@@ -50,6 +50,7 @@ def recSubColl target,id

    puts name
    puts description
+    p "Criando sub-comunidade: #{name}"
  $client.communities.create_subcommunity(
      Dspace::Community.new(
      {
@@ -75,7 +76,11 @@ $LOAD_PATH.unshift('/home/starosta/c3sl/dspace-scripts/dspace-rest-client/lib')

 #################################### A U T E N T I C A C A O ######################################
 require 'dspace'
+if(ARGV[0] == "debug")
 $client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest', logger: Logger.new(STDOUT))
+else
+  $client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest')
+end
 if !$client.is_running?
  raise 'Can\'t connect to DSpace API.'
 end
@@ -107,6 +112,7 @@ d.each{ |file|
    j += 1
  }
  if(parseCommunity(name) == 0)
+    p "Criando comunidade base: #{name}"
  community = $client.communities.create(
    Dspace::Community.new(
      {

--- a/scripts/drc-sample-script.rb
+++ b/scripts/drc-sample-script.rb
@@ -106,7 +106,7 @@ item_metadata = Dspace::Item.new(
 )

 item = client.collections.create_item(item_metadata, id: collection.id)
-file = File.new('/home/starosta/c3sl/dspace-scripts/scripts/logo-c3sl.png', 'r')
+file = File.new('/home/starosta/c3sl/dspace-scripts/scripts/itens.rb', 'r')
 p"aaaa"
 p item


--- a/scripts/flush.ruby
+++ b/scripts/flush.ruby
@@ -8,7 +8,21 @@ end

 client.login 'admin@seppirdev.com', 'adminadmin'

-puts "Deletando todas as comunidades"
+puts "Deletando todas os elementos"
 client.communities.all.each do |community|
-    client.communities.delete(id: community.id)
+  puts "-> #{community.name}"
+
+  client.communities.collections(:id => community.id).each do |collection|
+    puts "\t->#{collection.name}"
+
+    client.collections.items(:id => collection.id, limit: 10, offset: 0, expand: "metadata").each do |item|
+      puts "\t\t->#{item.name}"
+      client.collections.items.delete(item)
+
+      # client.items.bitstreams(:id => item.id).each do |bitstream|
+        # puts "Deletando o bitstream: #{bitstream.name}"
+        # client.items.bitstreams.delete(bitstream)
+      # end
+    end
+  end
 end
--- a/scripts/itens.rb
+++ b/scripts/itens.rb
@@ -137,19 +137,20 @@ def createItem file,id
    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")
-  #     itemFile = File.new(file,'r')
-  #     $client.items.add_bitstream(
-  #     itemFile,
-  #     id:itemID,
-  #     name:file.split('/')[-1].gsub('_',' '),
-  #     description:" "
-  #     )
-  #   end
-  # }
+   g = Dir[file + "/*"].sort
+   g.each{|file|
+     if(file.split('.')[-1]=="pdf")
+       itemFile = File.new(file,'r')
+       p "\t\t\tCriando bitstream #{file.split('/')[-1]}"
+
+       $client.items.add_bitstream(
+       itemFile,
+       id:item.id,
+       name:file.split('/')[-1].gsub('_',' '),
+       description:" "
+       )
+     end
+   }
 end
 ###################################################################################################
 $LOAD_PATH.unshift('/home/starosta/c3sl/dspace-scripts/dspace-rest-client/lib')
@@ -158,7 +159,12 @@ require 'dspace'
 require "i18n"
 I18n.available_locales = [:en]

+if(ARGV[0] == "debug")
 $client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest', logger: Logger.new(STDOUT))
+else
+  $client = Dspace::Client.new(dspace_api: 'https://seppirdev.c3sl.ufpr.br:8443/rest')
+end
+
 if !$client.is_running?
  raise 'Can\'t connect to DSpace API.'
 end

--- a/scripts/out.html
+++ b/scripts/out.html
-<html><head><title>Apache Tomcat/7.0.56 (Debian) - Error report</title><style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A {color : black;}A.name {color : black;}HR {color : #525D76;}--></style> </head><body><h1>HTTP Status 500 - org.codehaus.jackson.map.exc.UnrecognizedPropertyException: Unrecognized field &quot;parentCommunitList&quot; (Class org.dspace.rest.common.Collection), not marked as ignorable</h1><HR size=\"1\" noshade=\"noshade\"><p><b>type</b> Exception report</p><p><b>message</b> <u>org.codehaus.jackson.map.exc.UnrecognizedPropertyException: Unrecognized field &quot;parentCommunitList&quot; (Class org.dspace.rest.common.Collection), not marked as ignorable</u></p><p><b>description</b> <u>The server encountered an internal error that prevented it from fulfilling this request.</u></p><p><b>exception</b> <pre>javax.servlet.ServletException: org.codehaus.jackson.map.exc.UnrecognizedPropertyException: Unrecognized field &quot;parentCommunitList&quot; (Class org.dspace.rest.common.Collection), not marked as ignorable\n at [Source: org.apache.catalina.connector.CoyoteInputStream@4e5bea8d; line: 1, column: 160] (through reference chain: org.dspace.rest.common.Collection[&quot;parentCommunitList&quot;])\n\tcom.sun.jersey.spi.container.servlet.WebComponent.service(WebComponent.java:420)\n\tcom.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:558)\n\tcom.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:733)\n\tjavax.servlet.http.HttpServlet.service(HttpServlet.java:727)\n</pre></p><p><b>root cause</b> <pre>org.codehaus.jackson.map.exc.UnrecognizedPropertyException: Unrecognized field &quot;parentCommunitList&quot; (Class org.dspace.rest.common.Collection), not marked as ignorable\n at [Source: org.apache.catalina.connector.CoyoteInputStream@4e5bea8d; line: 1, column: 160] (through reference chain: org.dspace.rest.common.Collection[&quot;parentCommunitList&quot;])\n\torg.codehaus.jackson.map.exc.UnrecognizedPropertyException.from(UnrecognizedPropertyException.java:53)\n\torg.codehaus.jackson.map.deser.StdDeserializationContext.unknownFieldException(StdDeserializationContext.java:267)\n\torg.codehaus.jackson.map.deser.std.StdDeserializer.reportUnknownProperty(StdDeserializer.java:649)\n\torg.codehaus.jackson.map.deser.std.StdDeserializer.handleUnknownProperty(StdDeserializer.java:635)\n\torg.codehaus.jackson.map.deser.BeanDeserializer.handleUnknownProperty(BeanDeserializer.java:1355)\n\torg.codehaus.jackson.map.deser.BeanDeserializer.deserializeFromObject(BeanDeserializer.java:717)\n\torg.codehaus.jackson.map.deser.BeanDeserializer.deserialize(BeanDeserializer.java:580)\n\torg.codehaus.jackson.map.ObjectMapper._readValue(ObjectMapper.java:2695)\n\torg.codehaus.jackson.map.ObjectMapper.readValue(ObjectMapper.java:1308)\n\torg.codehaus.jackson.jaxrs.JacksonJsonProvider.readFrom(JacksonJsonProvider.java:419)\n\tcom.sun.jersey.json.impl.provider.entity.JacksonProviderProxy.readFrom(JacksonProviderProxy.java:139)\n\tcom.sun.jersey.spi.container.ContainerRequest.getEntity(ContainerRequest.java:490)\n\tcom.sun.jersey.server.impl.model.method.dispatch.EntityParamDispatchProvider$EntityInjectable.getValue(EntityParamDispatchProvider.java:123)\n\tcom.sun.jersey.server.impl.inject.InjectableValuesProvider.getInjectableValues(InjectableValuesProvider.java:86)\n\tcom.sun.jersey.server.impl.model.method.dispatch.AbstractResourceMethodDispatchProvider$EntityParamInInvoker.getParams(AbstractResourceMethodDispatchProvider.java:153)\n\tcom.sun.jersey.server.impl.model.method.dispatch.AbstractResourceMethodDispatchProvider$TypeOutInvoker._dispatch(AbstractResourceMethodDispatchProvider.java:183)\n\tcom.sun.jersey.server.impl.model.method.dispatch.ResourceJavaMethodDispatcher.dispatch(ResourceJavaMethodDispatcher.java:75)\n\tcom.sun.jersey.server.impl.uri.rules.HttpMethodRule.accept(HttpMethodRule.java:302)\n\tcom.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)\n\tcom.sun.jersey.server.impl.uri.rules.ResourceClassRule.accept(ResourceClassRule.java:108)\n\tcom.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)\n\tcom.sun.jersey.server.impl.uri.rules.RootResourceClassesRule.accept(RootResourceClassesRule.java:84)\n\tcom.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1542)\n\tcom.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1473)\n\tcom.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1419)\n\tcom.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1409)\n\tcom.sun.jersey.spi.container.servlet.WebComponent.service(WebComponent.java:409)\n\tcom.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:558)\n\tcom.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:733)\n\tjavax.servlet.http.HttpServlet.service(HttpServlet.java:727)\n</pre></p><p><b>note</b> <u>The full stack trace of the root cause is available in the Apache Tomcat/7.0.56 (Debian) logs.</u></p><HR size=\"1\" noshade=\"noshade\"><h3>Apache Tomcat/7.0.56 (Debian)</h3></body></html>
--- a/scripts/out.txr
+++ b/scripts/out.txr
-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"
--- a/scripts/saida.txt
+++ b/scripts/saida.txt