libis-services 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce67a6d9d8ae5f85b59d20275b53bc5fd2c3daa
-  data.tar.gz: 788b21aa7e8d522235c4d8a0bde001d69d84bd10
+  metadata.gz: 7af28a996d83058504db8b3886d97b4d5302225f
+  data.tar.gz: 4ff2c614654506bc23e0fa4ca9168828c289a46d
 SHA512:
-  metadata.gz: 92e69302a90ddf5f1c098e0a4523b9c45929afd6d1c4d7ec53bf0f1e23a662710f3d283a7e877f0a1a1237f216be38f84be2b2ffd9eec2484f31107cdbebbe5a
-  data.tar.gz: 687056444499489d0bf9ceb5ba7115ea569c76a016ce1b7a7c0e2fdd488ac6949f54af9f5ebe469a69bf44fe175d72545a46a739bcef904b66779e31c6422818
+  metadata.gz: 914bd614c3c46bba97873874d3b0f9545db6bcd04b10f90b889249d28ec5a410a0e5635dbed4edf70f3bdbb604d6101d914393fc087db9973665c4ffdc6f906f
+  data.tar.gz: c9f0161048b1f987647041adf1b756bfed83891c70d3698ed79d2b7e4fb3aefd48f0cc9fc421e1aacb748930fccaf90db9bb0b8b3545da4cb162f3aeee529f96

data/lib/libis/services/oracle_client.rb

@@ -5,13 +5,11 @@ module Libis
 
     class OracleClient
 
-      attr_reader :oci
+      attr_reader :url, :oci
 
-      def initialize(database, user, password)
-        @database = database
-        @user = user
-        @password = password
-        @oci = OCI8.new(user, password, database)
+      def initialize(url)
+        @url = url
+        @oci = OCI8.new(url)
         ObjectSpace.define_finalizer(self, self.class.finalize(@oci))
       end
 
@@ -63,7 +61,7 @@ module Libis
       def run(script, parameters = [])
         params = ''
         params = "\"" + parameters.join("\" \"") + "\"" if parameters and parameters.size > 0
-        process_result `sqlplus -S #{@user}/#{@password}@#{@database} @#{script} #{params}`
+        process_result `sqlplus -S #{url} @#{script} #{params}`
       end
 
       private

data/lib/libis/services/rosetta_db/client.rb

@@ -14,7 +14,7 @@ module Libis
         end
 
         def connect
-          @oracle = OracleClient.new(@url, @user, @password)
+          @oracle = OracleClient.new("#{@user}/#{@password}@#{@url}")
         end
 
         def set_schema(schema)

data/lib/libis/services/scope/search.rb

@@ -17,7 +17,11 @@ module Libis
 
         def connect(name, password, database = nil)
           database ||= 'libis-db-scope.cc.kuleuven.be:1556/SCOPEP.kuleuven.be'
-          @oracle = OracleClient.new(database, name, password)
+          @oracle = OracleClient.new("#{name}/#{password}/#{database}")
+        end
+
+        def connect_url(url)
+          @oracle = OracleClient.new(url)
         end
 
         def find(term, options = {})
@@ -35,8 +39,8 @@ module Libis
               raise RuntimeError, "Invalid Scope search type '#{options[:type]}'"
           end
           term = term.gsub(/[-\/]/, '_')
-          err_file = "/nas/vol03/oracle/SCOPEP/#{term}_err.XML"
-          md_file = "/nas/vol03/oracle/SCOPEP/#{term}_md.XML"
+          err_file = "/nas/vol03/oracle/#{options[:dir] || 'SCOPEP'}/#{term}_err.XML"
+          md_file = "/nas/vol03/oracle/#{options[:dir] || 'SCOPEP'}/#{term}_md.XML"
           if File.exist? err_file
             doc = Libis::Tools::XmlDocument.open(err_file)
             msg = doc['/error/error_msg']

data/lib/libis/services/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Services
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler