dor-services 4.22.4 → 4.22.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGNmODk1OTA4MGVlYTZjMmVmYjBjOTRkMTk2MmMyOTk2ZDVhMDI5OA==
+    OTI0OGVkMDM4YWVjYzE4MTgxOGJhYTI1MTExZDA4YWFlZTE0ZDRiNQ==
   data.tar.gz: !binary |-
-    OWMwZTg1ODA3ZGE1YTg0Njk1NmMzM2FmMWU0ZGJkNjQ5MzZmYmZkOQ==
+    ZjA2YmNkYjJkM2YxMTkzYTI1YjE4OTY3ZTEzYzMwMWUyNDliOTQwMA==
 SHA512:
   metadata.gz: !binary |-
-    MjYwYzkwNTFjZmIxZGRlY2M5NjIyZTYzNTNkNTMyZGVmNzk2NGIwYjc0NjNk
-    NWUzMTExZDA1N2IyNWNjZTc0MTNkZWM3Y2M1ZDMzNjA1OGM1NzFjMjAwNDI0
-    MTkwYjlhMjVjMmQ4OTMzODIzZWM5MDNmYTA3MjkwYjc5MTEzODI=
+    MDRmODA5Nzk5ZDJkZTNjN2M1MWQ5NDdkZTg4MjJhODRiYTczN2RmMWE5NWYw
+    ZDI4YWEzYzE5OWI1YzM2Yjc1MzVkOWEzMzhmNDVhY2Q5NDVhYWY2YTA5MTY0
+    M2VkOTFiODZhZjhjNWM0Yzc0YWMwOTdhNDU1ZDg0OWI0MDAwY2Y=
   data.tar.gz: !binary |-
-    ZTFkZWVjOTI2OTZjZjBlZjA2OTVjNmY1ODQ0MzE2NDM0ZjBiYzE1ZTNhMWM3
-    OTQ0NzYwOGIwYTA0NDRlMWVjM2JkODhmNzdiZGYyMDc3ZTA3ZGMxZjc5OTFl
-    YjVmYzIyMjI0MDU4MDliNDQ4ODk0YjAxNjU1OTY5ZDZkN2I3Mzk=
+    MTIyMmY0ZDY2NGQ1YzRiMTgxN2ZlZjFlM2JjY2M1NWJkNmY5MzhlZGZhMTY5
+    NDc0NTk5ODJhNjllMzAzMjg4NmM0MWQ0OTgzMWQ0ODg3OWM2NzA2YjEzYjlm
+    ZTUzMDI1MTFjOWYyNzYzMjNlNjk4OTcxYTQwNThhOTlhZmIzNmM=

data/config/config_defaults.yml

@@ -61,5 +61,7 @@
 :workflow:
   :url:
   :timeout: 60
+  :logfile: workflow_service.log
+  :shift_age: weekly
 :dor_services:
   :url:

data/lib/dor/config.rb

@@ -26,8 +26,13 @@ module Dor
         $-v = temp_v
       end
       params = { :dor_services_url => result.dor_services.url }
+ 
+      if(result.workflow.logfile && result.workflow.shift_age)
+        params[:logger] = Logger.new(result.workflow.logfile, result.workflow.shift_age)
+      elsif(result.workflow.logfile)
+        params[:logger] = Logger.new(result.workflow.logfile)
+      end
       params[:timeout] = result.workflow.timeout if result.workflow.timeout
-    # params[:logger]  = Logger.new('logs/workflow_service.log', 'weekly') # if you want to control the logger, insert it here.
       Dor::WorkflowService.configure result.workflow.url, params
       result
     end

data/lib/dor/models/describable.rb

@@ -121,16 +121,21 @@ module Dor
         title_node = Nokogiri::XML::Node.new('title', doc)
         title_node.content = collection_title
 
-        id_node = Nokogiri::XML::Node.new('identifier', doc)
-        id_node['type'] = 'uri'
-        id_node.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
+        # e.g., 
+        #   <location>
+        #     <url>http://purl.stanford.edu/rh056sr3313</url>
+        #   </location>
+        loc_node = doc.create_element('location')
+        url_node = doc.create_element('url')
+        url_node.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
+        loc_node << url_node
 
         type_node = Nokogiri::XML::Node.new('typeOfResource', doc)
         type_node['collection'] = 'yes'
         doc.root.add_child(related_item_node)
         related_item_node.add_child(title_info_node)
         title_info_node.add_child(title_node)
-        related_item_node.add_child(id_node)
+        related_item_node.add_child(loc_node)
         related_item_node.add_child(type_node)
       end
     end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.22.4'
+  VERSION = '4.22.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.22.4
+  version: 4.22.5
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora