Merge pull request #778 from grtjn/777-incremental-deploy-modules

Fixed #777: incremental load only looked at content db for timestamps

Author: RobertSzkutak

deploy/lib/server_config.rb

@@ -1764,13 +1764,15 @@ def filter_to_newer_files(files, options)
     end
 
     uris = files.map { |f| xcc.build_target_uri(f, options) }
-    stamps_db = get_db_timestamps(uris)
+    stamps_db = get_db_timestamps(uris, options[:db])
     stamps_local = files.map { |file_uri| File.mtime(file_uri).getgm.iso8601(5) }
 
     files_with_stamps = files.zip(stamps_local, stamps_db)
 
     filtered = files_with_stamps.select do |file_uri, stamp_locally, stamp_in_db|
 
+      stamp_in_db = stamp_in_db || ""
+
       newer = (stamp_locally > stamp_in_db || stamp_in_db.strip.empty?)
 
       if (!newer)
@@ -1783,11 +1785,11 @@ def filter_to_newer_files(files, options)
     filtered.map { |f, stamp1, stamp2| f}
   end
 
-  def get_db_timestamps(uris)
+  def get_db_timestamps(uris, target_db)
     uris_as_string = uris.map{|i| "\"#{i}\""}.join(",")
     q = %Q{for $u in (#{uris_as_string}) return "" || adjust-dateTime-to-timezone(xdmp:timestamp-to-wallclock(xdmp:document-timestamp($u)), xs:dayTimeDuration("PT0H"))}
 
-    result = execute_query q, :db_name => @properties["ml.content-db"]
+    result = execute_query q, :db_name => target_db
     parse_body(result.body).split("\n")
   end