jrdspace 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa1fb47a7098459a99b29f6f043530efae3e98b
-  data.tar.gz: 7afadbfc113d0daa4c71aa07f10f6191719ab218
+  metadata.gz: e905bc1c648ee25ef40364bc83128e20146ece47
+  data.tar.gz: d224d5b02e4492213249dce5c6870559241c39c6
 SHA512:
-  metadata.gz: b462451ced624f34ffff803b6a456912d6c707a4b0a3d4c63dfdb3dcd12459aa294461790f8e8764d109f1e23b488f4d419950f88e885c040999279ecf4bcadd
-  data.tar.gz: 532d9de9fbcbb9264053becf42d900ac82718c3bda4f7882b9b6e6705b1bcbebb225945094737bd79aa3003736876d293c2618deaf8f692093a62fb4ffe69b3b
+  metadata.gz: 23a7b8d2700b59671035fa9e795f68d376776ab319f28800bad41c488aa01d8d8d037caca114958d34470ce81e5a69152486889d23c90b53e9536ed420603473
+  data.tar.gz: ce1bf0b6064d0197f70582216158e95d335558264c495798eb0afa53f804f2c2c33799f0848f91a64e3cad5a4cd168e1cd31f39082a8d19f6f95b9deefe4fbcd

data/README.md

@@ -30,6 +30,11 @@ Install the gem:
 bundle install
 ```
 
+Please note that I am still updating this gem ferquently as I discover bugs. So please keep do update frequently with 
+```
+bundle update
+```
+
 ##  Usage 
 
 To use in scripts simply include the following 

data/bin/idspace

@@ -4,6 +4,7 @@ require "bundler/setup"
 require "dspace"
 
 require "irb"
+require 'irb/completion'
 
 puts "DSpace.load   - to connect to dspave installation"
 puts "DSpace.help   - for basic help info"

data/lib/dspace.rb

@@ -6,4 +6,5 @@ require 'dspace/dcollection'
 require 'dspace/dcommunity'
 require 'dspace/ditem'
 require 'dspace/dbitstream'
-
+require 'dspace/dbundle'
+require 'dspace/dworkflowitem'

data/lib/dspace/dbitstream.rb

@@ -1,9 +1,14 @@
 class DBitstream
-include DSO
+  include DSO
 
   def self.all()
     java_import org.dspace.content.Bitstream;
     return Bitstream.findAll(DSpace.context)
   end
 
+  def self.find(id)
+    java_import org.dspace.content.Bitstream;
+    return Bitstream.find(DSpace.context, id)
+  end
+
 end

data/lib/dspace/dbundle.rb

@@ -1,4 +1,8 @@
 class DBundle
-include DSO
+  include DSO
 
+  def self.find(id)
+    java_import org.dspace.content.Bundle;
+    return Bundle.find(DSpace.context, id)
+  end
 end

data/lib/dspace/dcollection.rb

@@ -6,6 +6,12 @@ class DCollection
     return Collection.findAll(DSpace.context)
   end
 
+  def self.find(id)
+    java_import org.dspace.content.Collection;
+    return Collection.find(DSpace.context, id)
+  end
+
+
   def self.findAll(name)
     java_import org.dspace.content.Collection;
     self.all.select do |c|

data/lib/dspace/dcommunity.rb

@@ -6,6 +6,11 @@ class DCommunity
     return Community.findAll(DSpace.context)
   end
 
+  def self.find(id)
+    java_import org.dspace.content.Community;
+    return Community.find(DSpace.context, id)
+  end
+
   def self.findAll(name)
     java_import org.dspace.content.Community;
     self.all.select do |c|

data/lib/dspace/dgroup.rb

@@ -34,24 +34,20 @@ class DGroup
 
   def members
     list = [];
-    @dso.getMembers.each do |m|
+    @obj.getMembers.each do |m|
       list << m;
     end
-    @dso.getMemberGroups.each do |m|
+    @obj.getMemberGroups.each do |m|
       list << m;
     end
     return list;
   end
 
-  def addMember(addGrouNameOrNetid)
-    add = DGroup.find(addGrouNameOrNetid)
-    if (add.nil?) then
-        add = DEPerson.find(addGrouNameOrNetid);
-    end 
-    raise "no such netid or group #{addGrouNameOrNetid}" if add.nil?
-    @dso.addMember(add);
-    @dso.update
-    return @dso;
+  def addMember(group_or_eperson)
+    raise "must give non nil group_or_eperson" if group_or_eperson.nil?
+    @obj.addMember(group_or_eperson);
+    @obj.update
+    return @obj;
   end
 
   def report

data/lib/dspace/ditem.rb

@@ -16,6 +16,12 @@ class DItem
     return list
   end
 
+  def self.find(id)
+    java_import org.dspace.content.Item;
+    id = id.to_i if id.class == String
+    return Item.find(DSpace.context, id)
+  end
+
   def self.inside(restrict_to_dso)
     java_import org.dspace.storage.rdbms.DatabaseManager
     java_import org.dspace.storage.rdbms.TableRow

data/lib/dspace/dso.rb

@@ -53,5 +53,22 @@ module DSO
     end
   end
 
+  def getMetaDataValues()
+    java_import org.dspace.content.MetadataSchema
+    java_import org.dspace.content.MetadataField
+    java_import org.dspace.storage.rdbms.DatabaseManager
+    java_import org.dspace.storage.rdbms.TableRow
+
+    sql = "SELECT MV.metadata_field_id,  MV.text_value FROM METADATAVALUE MV " +
+            " WHERE RESOURCE_TYPE_ID = #{@obj.getType} AND RESOURCE_ID = #{@obj.getID}"
+    tri = DatabaseManager.queryTable(DSpace.context, "MetadataValue",   sql)
+    mvs = [];
+    while (iter = tri.next())
+      field =  MetadataField.find(DSpace.context, iter.getIntColumn("metadata_field_id"))
+      mvs <<  [ DSpace.toString(field), iter.getStringColumn("text_value") ]
+    end
+    tri.close
+    return mvs
+  end
 end
 

data/lib/dspace/dspace.rb

@@ -2,29 +2,18 @@ module DSpace
   ROOT = File.expand_path('../..', __FILE__)
   @@config = nil;
 
-  BITSTREAM = 0;
-  BUNDLE = 1;
-  ITEM = 2;
-  COLLECTION = 3;
-  COMMUNITY = 4;
-  SITE = 5;
-  GROUP = 6;
-  EPERSON = 7;
-
-  def self.objTypeId(type_str_or_int)
-    obj_typ = Constants.typeText.find_index type_str_or_int
-    if  obj_typ.nil? then
-      obj_typ = Integer(type_str_or_int)
-      raise "no such object typ #{type_str_or_int}" unless Constants.typeText[obj_typ]
+  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
+      id = Integer(type_str_or_int)
+    rescue
+      raise "no such object type #{type_str_or_int}"
     end
-    return obj_typ;
+    return Constants.typeText[id].capitalize
   end
 
-  def self.objTypeStr(type_str_or_int)
-    return type_str_or_int  if Constants.typeText.find_index type_str_or_int
-    obj_typ_id = Integer(type_str_or_int)
-    raise "no such object type #{type_str_or_int}" unless Constants.typeText[obj_typ_id]
-    return Constants.typeText[obj_typ_id];
+  def self.objTypeId(type_str_or_int)
+    obj_typ = Constants.typeText.find_index objTypeStr(type_str_or_int).upcase
   end
 
   def self.load(dspace_dir = nil)
@@ -47,6 +36,12 @@ module DSpace
     return @@config.context
   end
 
+  def self.context_renew
+    raise "must call load to initialize" if @@config.nil?
+    raise "should never happen" if @@config.context.nil?
+    return @@config.context_renew
+  end
+
   def self.login(netid)
     self.context.setCurrentUser(DEPerson.find(netid))
     return nil
@@ -58,19 +53,10 @@ module DSpace
 
   def self.create(dso)
     raise "dso must not be nil" if dso.nil?
-    klass =  Object.const_get  "D" + dso.class.name.gsub(/.*::/,'')
+    klass = Object.const_get "D" + dso.class.name.gsub(/.*::/, '')
     klass.send :new, dso
   end
 
-  def self.fromString(type_id_or_handle)
-    splits = type_id_or_handle.split('.')
-    if (2 == splits.length) then
-      self.find(splits[0], splits[1])
-    else
-      self.fromHandle(type_id_or_handle)
-    end
-  end
-
   def self.fromHandle(handle)
     return HandleManager.resolve_to_object(DSpace.context, handle);
   end
@@ -78,51 +64,76 @@ module DSpace
   def self.find(type_str_or_int, identifier)
     type_str = DSpace.objTypeStr(type_str_or_int)
     type_id = DSpace.objTypeId(type_str)
-    int_id = identifier.to_i
-    obj = DSpaceObject.find(DSpace.context, type_id, int_id)
-    if obj.nil? and klass.methods.include? :find
-      klass = Object.const_get "D" + type_str.capitalize
-      obj = klass.send :find, identifier
+    klass = Object.const_get "D" + type_str
+    begin
+      id = Integer(identifier)
+    rescue
+      id = identifier
     end
-    return obj
+    return klass.send :find, id
   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
-      java_import org.dspace.storage.rdbms.DatabaseManager
-      java_import org.dspace.storage.rdbms.TableRow
-
-      (schema, element, qualifier) = fully_qualified_metadata_field.split('.')
-      schm = MetadataSchema.find(DSpace.context, schema)
-      raise "no such metadata schema: #{schema}" if schm.nil?
-      field = MetadataField.find_by_element(DSpace.context, schm.getSchemaID, element, qualifier)
-      raise "no such metadata field #{fully_qualified_metadata_field}" if field.nil?
-
-      sql = "SELECT MV.resource_id, MV.resource_type_id  FROM MetadataValue MV";
-      sql = sql + " where MV.metadata_field_id= #{field.getFieldID} "
-      if (not value_or_nil.nil?) then
-        sql = sql + " AND MV.text_value LIKE '#{value_or_nil}'"
-      end
-      if (restrict_to_type) then
-        sql = sql + " AND MV.resource_type_id = #{objTypeId(restrict_to_type)}"
-      end
+    java_import org.dspace.content.MetadataSchema
+    java_import org.dspace.content.MetadataField
+    java_import org.dspace.storage.rdbms.DatabaseManager
+    java_import org.dspace.storage.rdbms.TableRow
+
+    (schema, element, qualifier) = fully_qualified_metadata_field.split('.')
+    schm = MetadataSchema.find(DSpace.context, schema)
+    raise "no such metadata schema: #{schema}" if schm.nil?
+    field = MetadataField.find_by_element(DSpace.context, schm.getSchemaID, element, qualifier)
+    raise "no such metadata field #{fully_qualified_metadata_field}" if field.nil?
+
+    sql = "SELECT MV.resource_id, MV.resource_type_id  FROM MetadataValue MV";
+    sql = sql + " where MV.metadata_field_id= #{field.getFieldID} "
+    if (not value_or_nil.nil?) then
+      sql = sql + " AND MV.text_value LIKE '#{value_or_nil}'"
+    end
+    if (restrict_to_type) then
+      sql = sql + " AND MV.resource_type_id = #{objTypeId(restrict_to_type)}"
+    end
 
-      tri = DatabaseManager.queryTable(DSpace.context, "MetadataValue",   sql)
-      dsos = [];
-      while (iter = tri.next())
-        dsos << self.find(iter.getIntColumn("resource_type_id"), iter.getIntColumn("resource_id") )
-      end
-      tri.close
-      return dsos
+    tri = DatabaseManager.queryTable(DSpace.context, "MetadataValue", sql)
+    dsos = [];
+    while (iter = tri.next())
+      dsos << self.find(iter.getIntColumn("resource_type_id"), iter.getIntColumn("resource_id"))
+    end
+    tri.close
+    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
 
-  def self.help( klasses = [ DSpace, DCommunity, DCollection, DItem, DGroup])
+  def self.help(klasses = [DSpace, DCommunity, DCollection, DItem, DGroup])
     klasses.each do |klass|
       klass.singleton_methods.sort.each do |mn|
         m = klass.method(mn)
@@ -162,6 +173,11 @@ module DSpace
       return @context
     end
 
+    def context_renew
+      @context.abort if @context
+      @context = org.dspace.core.Context.new()
+    end
+
     def init
       if @context.nil? then
         puts "Loading jars"

data/lib/dspace/dworkflowitem.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env jruby
+require 'dspace'
+
+class DWorkflowItem
+  def self.findAll(obj)
+    java_import org.dspace.workflow.WorkflowItem
+    if (obj.getType == DSpace::COLLECTION)
+      return WorkflowItem.findByCollection(DSpace.context, obj)
+    elsif   (obj.getType == DSpace::COMMUNITY) then
+      flows = []
+      obj.getCollections.each do |col|
+        flows += findAll(col)
+      end
+      return flows
+    end
+    return []
+  end
+
+end

data/lib/dspace/version.rb

@@ -1,3 +1,3 @@
 module DSpace
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
 end

metadata

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