dynarex-blog 0.5.3 → 0.5.4

data/lib/dynarex-blog.rb

@@ -63,40 +63,58 @@ class DynarexBlog
     file = lookup.records[id][:body][:file]
 
     dynarex = Dynarex.new(@file_path + file) 
-    dynarex.update(id, h).save
+    prev_tags = dynarex.record(id).tags
+    cur_tags = h[:tags]
     
-    uri = h[:title].gsub(/\s/,'-')
-    lookup.update(lookup_id, uri: uri).save
-    @hc_lookup.write(@current_lookup) { Document.new File.open(@file_path + @current_lookup,'r').read }    
+    if cur_tags.length > 0 then
+      
+      a = cur_tags.split(/\s/)
+    
+      if prev_tags and prev_tags.length > 0 then
+	
+	b = prev_tags.split(/\s/)
+	old_list = a - b # tags to be deleted
+	new_list = b - a # tags to be inserted
+	
+	old.each {|x| delete_entry(doc_tag, node_entry, tag_name, id) }
+	common = a.to_set.intersection(b).to_a # tags to be updated     
+	common.each {|name|  update_entry(name, id, h) } if dynarex.record(id).tags
+      else
+	new_list = a
+      end
+      
+      new_list.each {|tag| create_record(h, id, name=tag, type='tags') }
+      
+      dynarex.update(id, h)
+      dynarex.save
+    end
     
-    dynarex.record(id).tags.split(/\s/).each {|name|  update_entry(name, id, h) } if dynarex.record(id).tags
+    lookup.update(lookup_id, uri: h[:title].gsub(/\s/,'-')).save
+    @hc_lookup.write(@current_lookup) { Document.new File.open(@file_path + @current_lookup,'r').read }        
+
   end
 
-  def delete(id=0)
+  def delete(id='')
 
     # delete from the tags files (entry and lookup), the entry file and lookup
     # look the id up in lookup.xml
 
-    doc_entry, entry = open_lookup_record '_entry', id
-
-    dynarex_file = @file_path + entry.text('file').to_s
-    dynarex = Document.new(File.open(dynarex_file,'r').read)
-    dynarex_entry = XPath.first(dynarex.root, "records/entry[@id='#{id}']")
-    tags = dynarex_entry.text('tags').split(/\s/)
-
-    dynarex_entry.parent.delete dynarex_entry
-    File.open(dynarex_file,'w'){|f| dynarex.write f}
+    lookup = Dynarex.new @file_path + @current_lookup
+    lookup_id = lookup.records[id][:id]
+    file = lookup.records[id][:body][:file]
+    
+    dynarex = Dynarex.new(@file_path + file)    
+    tags = dynarex.record(id).tags.split(/\s/)
+    dynarex.delete(id).save
 
-    entry.parent.delete entry
-    lookup = "%s%s" % [@file_path, '_entry_lookup.xml']
-    File.open(lookup,'w'){|f| doc_entry.write f}
+    lookup.delete(lookup_id).save
 
     tags.each do |tag_name|
       # find the lookup
-      doc_tag, node_entry = open_lookup_record tag_name, id      
-      delete_entry(doc_tag, node_entry, tag_name, id)
+      delete_entry(tag_name, id)
     end
 
+    # start of reindexing
     doc = Document.new File.open(@file_path + 'index.xml','r').read
     node = XPath.first(doc.root, "records/entry[@id='#{id}']")
 
@@ -194,34 +212,32 @@ class DynarexBlog
     
   private
 
-  def delete_entry(doc, node, lookup_filename, id)
-    file = @file_path + node.text('file').to_s
-    Dynarex.new(file).delete(id).save file
+  def delete_entry(lookup_filename, id)
+    
+    lookup_path = "%s%s_lookup.xml" % [@file_path, lookup_filename]    
+    lookup = Dynarex.new lookup_path
+    
+    lookup_id = lookup.records[id][:id]
+    file = lookup.records[id][:body][:file]
+    lookup.delete(lookup_id).save    
+    
+    Dynarex.new(file).delete(id).save
 
-    node.parent.delete node
-    lookup = "%s%s_lookup.xml" % [@file_path, lookup_filename]
-    File.open(lookup,'w'){|f| doc.write f}
   end
   
   def update_entry(lookup_filename, id, h)
 
-    lookup_path = "%s%s_lookup.xml" % [@file_path, lookup_filename]
-    
+    lookup_path = "%s%s_lookup.xml" % [@file_path, lookup_filename]    
     lookup = Dynarex.new lookup_path
     lookup_id = lookup.records[id][:id]
+    
     file = lookup.records[id][:body][:file]
+    lookup.update(lookup_id, uri: h[:title].gsub(/\s/,'-')).save    
+
+    Dynarex.new(@file_path + file).update(id, h).save        
 
-    Dynarex.new(@file_path + file).update(id, h).save    
-    
-    uri = h[:title].gsub(/\s/,'-')
-    lookup.update(lookup_id, uri: uri).save    
   end  
 
-  def open_lookup_record(name, id)
-    lookup_path = "%s%s_lookup.xml" % [@file_path, name]
-    lookup = Document.new File.open(lookup_path,'r').read
-    [lookup, XPath.first(lookup.root, "records/entry[id='#{id}']")]
-  end
 
   def select_page(doc, number)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex-blog
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: []