better handling of cursor env variable

app/models/doi.rb

@@ -778,7 +778,7 @@ def self.query(query, options={})
     end
 
     # make sure field name uses underscore
-    # escape forward slashes in query
+    # escape forward slash, but not other Elasticsearch special characters
     if query.present?
       query = query.gsub(/publicationYear/, "publication_year")
       query = query.gsub(/relatedIdentifiers/, "related_identifiers")
@@ -1839,12 +1839,18 @@ def self.transfer(options={})
   # +job_name+:: Acive Job class name of the Job that would be executed on every matched results
   def self.loop_through_dois(options={})
     size = (options[:size] || 1000).to_i
-    cursor = options[:cursor] || []
     filter = options[:filter] || {}
     label = options[:label] || ""
     options[:job_name] ||= ""
     query = options[:query].presence
 
+    if options[:cursor].present? 
+      timestamp, doi = options[:cursor].split(",", 2)
+      cursor = [timestamp.to_i, doi]
+    else
+      cursor = []
+    end
+
     response = Doi.query(query, filter.merge(page: { size: 1, cursor: [] }))
     message = "#{label} #{response.results.total} Dois with #{label}."
 

app/models/other_doi.rb

@@ -96,12 +96,18 @@ def self.import_by_id(options={})
   # +job_name+:: Acive Job class name of the Job that would be executed on every matched results
   def self.loop_through_dois(options={})
     size = (options[:size] || 1000).to_i
-    cursor = options[:cursor] || []
     filter = options[:filter] || {}
     label = options[:label] || ""
     options[:job_name] ||= ""
     query = options[:query].presence
 
+    if options[:cursor].present? 
+      timestamp, doi = options[:cursor].split(",", 2)
+      cursor = [timestamp.to_i, doi]
+    else
+      cursor = []
+    end
+
     response = OtherDoi.query(query, filter.merge(page: { size: 1, cursor: [] }))
     message = "#{label} #{response.results.total} other dois with #{label}."