jrdspace 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e98d25375ebaf280ebf4a89d918d910c75be28
-  data.tar.gz: 987ea00c6c14043e1bc1d2576e15737a2af301d3
+  metadata.gz: d5374a48462982af2dd2b668f131d141b04cdee5
+  data.tar.gz: 7569318017512c64a43db11edcaa0a4cfb0b9008
 SHA512:
-  metadata.gz: 4c48dad0f9769744a7330e8a10a25c9aae1ef997ee0135a3466748a93d09147bb53631b77ed29d96d06d2b1774e225404ab52fadf6561ee52e06471ce60cdf44
-  data.tar.gz: 97d2e3b273be1b1f65697144b62786f376f166a86118ebc0d1a12e763828936c599756b48c2efc0dfd90bc01305ac38cd48d997735d3f41f44fe9d84939aa930
+  metadata.gz: 9c7636089366716a41e9e8d267534561f7edb4ff8efdfaf1e5391f176cab6643bca26e55268a40c9e3e1d33b0ec2515e54f7be9a6922888c00ad3602ff534043
+  data.tar.gz: 9083ad89bf0161c5b61a447f1c2590e4639c16f1bf3179beb541a1c3443d48c3ce36f949746415b5e46ce0b8f968aba6666e80412f0ad2ad232b88a8f7df2759

data/lib/dspace.rb

@@ -8,3 +8,4 @@ require 'dspace/ditem'
 require 'dspace/dbitstream'
 require 'dspace/dbundle'
 require 'dspace/dworkflowitem'
+require 'dspace/dworkspaceitem'

data/lib/dspace/dspace.rb

@@ -11,7 +11,6 @@ module DSpace
   GROUP = 6;
   EPERSON = 7;
 
-
   def self.objTypeStr(type_str_or_int)
     return type_str_or_int.capitalize if type_str_or_int.class == String and Constants.typeText.find_index type_str_or_int.upcase
     begin
@@ -33,11 +32,9 @@ module DSpace
       java_import org.dspace.handle.HandleManager;
       java_import org.dspace.core.Constants
       java_import org.dspace.content.DSpaceObject
-      return true
-    else
-      puts "Already loaded #{@@config.dspace_cfg}"
     end
-    return false
+    puts "DB #{DSpace.context.getDBConnection.toString}"
+    return @@config != nil
   end
 
   def self.context
@@ -83,6 +80,41 @@ module DSpace
     return klass.send :find, id
   end
 
+  def self.fromString(type_id_or_handle)
+    #TODO handle MetadataField string
+    splits = type_id_or_handle.split('.')
+    if (2 == splits.length) then
+      self.find(splits[0].upcase, splits[1])
+    else
+      self.fromHandle(type_id_or_handle)
+    end
+  end
+
+  def self.toString(java_obj)
+    return "nil" unless java_obj
+    klass = java_obj.getClass.getName
+    if (klass == "org.dspace.content.MetadataField") then
+      java_import org.dspace.content.MetadataField
+      java_import org.dspace.content.MetadataSchema
+
+      schema = MetadataSchema.find(DSpace.context, java_obj.schemaID)
+      str = "#{schema.getName}.#{java_obj.element}"
+      str += ".#{java_obj.qualifier}" if java_obj.qualifier
+      str
+    else
+      java_obj.toString
+    end
+  end
+
+  def self.getService(service_name, java_klass)
+    org.dspace.utils.DSpace.new().getServiceManager().getServiceByName(service_name,java_klass)
+  end
+
+  def self.getIndexService()
+    java_import org.dspace.discovery.SolrServiceImpl;
+    self.getService("org.dspace.discovery.IndexingService", SolrServiceImpl)
+  end
+
   def self.findByMetadataValue(fully_qualified_metadata_field, value_or_nil, restrict_to_type)
     java_import org.dspace.content.MetadataSchema
     java_import org.dspace.content.MetadataField
@@ -113,32 +145,6 @@ module DSpace
     return dsos
   end
 
-  def self.fromString(type_id_or_handle)
-    #TODO handle MetadataField string
-    splits = type_id_or_handle.split('.')
-    if (2 == splits.length) then
-      self.find(splits[0].upcase, splits[1])
-    else
-      self.fromHandle(type_id_or_handle)
-    end
-  end
-
-  def self.toString(java_obj)
-    return "nil" unless java_obj
-    klass = java_obj.getClass.getName
-    if (klass == "org.dspace.content.MetadataField") then
-      java_import org.dspace.content.MetadataField
-      java_import org.dspace.content.MetadataSchema
-
-      schema = MetadataSchema.find(DSpace.context, java_obj.schemaID)
-      str = "#{schema.getName}.#{java_obj.element}"
-      str += ".#{java_obj.qualifier}" if java_obj.qualifier
-      str
-    else
-      java_obj.toString
-    end
-  end
-
   def self.kernel
     @@config.kernel;
   end

data/lib/dspace/dworkflowitem.rb

@@ -4,15 +4,23 @@ require 'dspace'
 class DWorkflowItem
   def self.findAll(obj)
     java_import org.dspace.workflow.WorkflowItem
+    if (obj.nil?) then
+      return WorkflowItem.findAll(DSpace.context)
+    end
     if (obj.getType == DSpace::COLLECTION)
       return WorkflowItem.findByCollection(DSpace.context, obj)
-    elsif   (obj.getType == DSpace::COMMUNITY) then
+    elsif (obj.getType == DSpace::COMMUNITY) then
       flows = []
-      obj.getCollections.each do |col|
+      obj.getAllCollections.each do |col|
         flows += findAll(col)
       end
       return flows
+    elsif (obj.getType == DSpace::ITEM) then
+      wi = WorkflowItem.findByItem(DSpace.context, obj)
+      # to be consistent return array with the unqiue wokflow item
+      return [wi] if wi
     end
+    # return empty array if no matching workflow items
     return []
   end
 

data/lib/dspace/dworkspaceitem.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env jruby
+require 'dspace'
+
+class DWorkspaceItem
+  def self.findAll(obj)
+    java_import org.dspace.content.WorkspaceItem
+    if (obj.nil?) then
+      return WorkspaceItem.findAll(DSpace.context)
+    end
+    if (obj.getType == DSpace::COLLECTION)
+      return  WorkspaceItem.findByCollection(DSpace.context, obj)
+    elsif (obj.getType == DSpace::COMMUNITY) then
+      wsis = []
+      obj.getAllCollections.each do |col|
+        wsis += findAll(col)
+      end
+      return wsis
+    elsif (obj.getType == DSpace::ITEM) then
+      wi = WorkspaceItem.findByItem(DSpace.context, obj)
+      # to be consistent return array with the unqiue wokflow item
+      return [wi] if wi
+    end
+    # return empty array if no matching workspace items
+    return []
+  end
+
+end

data/lib/dspace/version.rb

@@ -1,3 +1,3 @@
 module DSpace
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrdspace
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Monika Mevenkamp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar
@@ -90,6 +90,7 @@ files:
 - lib/dspace/dso.rb
 - lib/dspace/dspace.rb
 - lib/dspace/dworkflowitem.rb
+- lib/dspace/dworkspaceitem.rb
 - lib/dspace/version.rb
 homepage: https://github.com/akinom/dspace-jruby
 licenses: