sgfa 0.1.0 → 0.1.1

data/lib/sgfa/jacket_fs.rb

@@ -31,14 +31,28 @@ class JacketFs < Jacket
   #
   # @param path [String] Path to create the jacket
   # @param id_text [String] Text ID of the jacket
-  # @return [String] Hash ID of the jacket
   # @raise [Error::Limits] if id_text exceeds allowed limits
   # @raise [Error::Conflict] if path already exists
+  # @return [String] Hash ID of the jacket
   def self.create(path, id_text)
+    id_hash = Digest::SHA256.new.update(id_text).hexdigest
+    JacketFs.create_raw(path, id_text, id_hash)
+  end # def self.create()
+  
+  
+  #####################################
+  # Create a jacket from backup
+  # 
+  # @param path (see create)
+  # @param id_text (see create)
+  # @param id_hash [String] Hash ID of the jacket
+  # @return [String] Hash ID of the jacket
+  # @raise [Error::Limits] if id_text exceeds allowed limits
+  # @raise [Error::Conflict] if path already exists
+  # @note You probably want to use {create}, not this method
+  def self.create_raw(path, id_text, id_hash)
     Jacket.limits_id(id_text)
 
-    # info
-    id_hash = Digest::SHA256.new.update(id_text).hexdigest
     info = {
       'sgfa_jacket_ver' => 1,
       'id_hash' => id_hash,
@@ -60,7 +74,7 @@ class JacketFs < Jacket
     StoreFs.create(File.join(path, 'store'))
 
     return id_hash
-  end # def self.create()
+  end # def self.create_raw()
 
 
   #####################################

data/lib/sgfa/state_fs.rb

@@ -190,6 +190,15 @@ class StateFs
   # @raise [Error::Sanity] if state not open
   # @raise [Error::Corrupt] if tag list is missing
   def list
+    tagh, max = _list
+    return tagh.keys
+  end # def list
+
+
+  #####################################
+  # Read raw tag list
+  # return [Array] \[max_tagn, tag_hash\]
+  def _list
     raise Error::Sanity, 'State not open' if !@path
 
     ftn = File.join(@path, TagList)
@@ -198,8 +207,20 @@ class StateFs
     rescue Errno::ENOENT
       raise Error::Corrupt, 'Unable to read tag list'
     end
-    return txt.lines.map{|tg| tg.chomp }
-  end # def list
+
+    tagh = {}
+    max = 0
+    txt.lines.each do |ln|
+      ma = /^(\d{9}) (.*)$/.match(ln)
+      raise Error::Corrupt, 'Tag list format incorrect' if !ma
+      num = ma[1].to_i
+      tagh[ma[2]] = num
+      max = num if num > max
+    end
+
+    return tagh, max
+  end # _list
+  private :_list
 
 
   #####################################
@@ -216,11 +237,13 @@ class StateFs
   def tag(name, offs, max)
     raise Error::Sanity, 'State not open' if !@path
 
-    fn = File.join(@path, name)
+    tagh, tagm = _list
+    raise Error::NonExistent, 'Tag does not exist' if !tagh[name]
+    fn = File.join(@path, tagh[name].to_s)
     begin
       fi = File.open(fn, 'rb')
     rescue Errno::ENOENT
-      raise Error::NonExistent, 'Tag does not exist'
+      raise Error::Corrupt, 'Tag file missing'
     end
 
     ents = []
@@ -257,8 +280,7 @@ class StateFs
 
     # read list of tags
     changed = false
-    thash = {}
-    self.list.each{|tag| thash[tag] = true }
+    thash, max = _list
 
     cng.each do |tag, hc|
       cnt = 0
@@ -267,14 +289,15 @@ class StateFs
       se = hc.to_a.select{|en, ti| ti }.sort{|aa, bb| aa[1] <=> bb[1] }
 
       # files
-      fn = File.join(@path, tag)
       if thash[tag]
+        fn = File.join(@path, thash[tag].to_s)
         begin
           oldf = File.open(fn, 'rb')
         rescue Errno::ENOENT
           raise Error::Corrupt, 'Existing tag is missing'
         end
       else
+        fn = File.join(@path, (max + 1).to_s)
         oldf = nil
       end
       newf = Tempfile.new('state', @path, :encoding => 'ASCII-8BIT')
@@ -319,7 +342,8 @@ class StateFs
       else
         FileUtils.ln(newf.path, fn, :force => true)
         if !oldf
-          thash[tag] = true
+          max += 1
+          thash[tag] = max
           changed = true
         end
       end
@@ -330,7 +354,7 @@ class StateFs
     if changed
       fnl = File.join(@path, TagList)
       File.open(fnl, 'w', :encoding => 'utf-8') do |fi|
-        thash.each_key{|tag| fi.puts tag }
+        thash.each{|tag, num| fi.puts '%09d %s' % [num, tag] }
       end
     end
 

data/lib/sgfa/store_s3.rb

@@ -0,0 +1,119 @@
+#
+# Simple Group of Filing Applications
+# Jacket store using AWS S3.
+#
+# Copyright (C) 2015 by Graham A. Field.
+#
+# See LICENSE.txt for licensing information.
+#
+# This program is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+require 'aws-sdk'
+require 'tempfile'
+
+require_relative 'error'
+
+module Sgfa
+
+#####################################################################
+# Stores copies of {History}, {Entry}, and attached files that are
+# in a {Jacket} using AWS S3.
+#
+class StoreS3
+
+  #####################################
+  # Open the store
+  #
+  # @param client [AWS::S3::Client] The configured S3 client
+  # @param bucket [String] The bucket name
+  # @param prefix [String] Prefix to use for object keys
+  def open(client, bucket, prefix=nil)
+    @s3 = client
+    @bck = bucket
+    @pre = prefix || ''
+  end # def open()
+
+
+  #####################################
+  # Close the store
+  def close()
+    true
+  end # def close()
+
+
+  #####################################
+  # Get a temp file 
+  def temp
+    Tempfile.new('blob', Dir.tmpdir, :encoding => 'utf-8')
+  end # def temp
+
+
+  #####################################
+  # Get key
+  def _key(type, item)
+    case type
+      when :entry then ext = '-e'
+      when :history then ext = '-h'
+      when :file then ext = '-f'
+      else raise NotImplementedError, 'Invalid item type'
+    end
+    key = @pre + item + ext
+    return key
+  end # def _key()
+  private :_key
+
+
+  #####################################
+  # Read an item from the store
+  def read(type, item)
+    key = _key(type, item)
+    fi = temp
+    fi.set_encoding(Encoding::ASCII_8BIT)
+    @s3.get_object( bucket: @bck, key: key, response_target: fi )
+    fi.rewind
+    return fi
+  rescue Aws::S3::Errors::NoSuchKey
+    return false  
+  end # def read()
+
+
+  #####################################
+  # Store an item
+  def write(type, item, cont)
+    key = _key(type, item)
+    cont.rewind
+    @s3.put_object( bucket: @bck, key: key, body: cont )
+
+    if cont.respond_to?( :close! )
+      cont.close!
+    else
+      cont.close
+    end
+  end # def write()
+
+
+  #####################################
+  # Delete
+  def delete(type, item)
+    key = _key(type, item)
+    @s3.delete_object( bucket: @bck, key: key )
+    return true
+  rescue Aws::S3::Errors::NoSuchKey
+    return false
+  end # def delete()
+
+
+  #####################################
+  # Get size of an item
+  def size(type, item)
+    key = _key(type, item)
+    resp = @s3.head_object( bucket: @bck, key: key )
+    return resp.content_length
+  rescue Aws::S3::Errors::NotFound
+    return false
+  end # def size()
+
+end # class StoreS3
+
+end # module Sgfa

data/lib/sgfa/web/base.rb

@@ -169,6 +169,13 @@ class Base
   end # def _escape()
 
 
+  #####################################
+  # Escape URL using only percent encoding
+  def _escape_path(txt)
+    Rack::Utils.escape_path(txt)
+  end # def _escape_path():
+
+
   ##########################################
   # Unescape URL
   def _escape_un(txt)

data/lib/sgfa/web/binder.rb

@@ -22,7 +22,6 @@ module Web
 #####################################################################
 # Binder web interface
 #
-# @todo Add a docket view 
 class Binder < Base
 
   #####################################
@@ -139,6 +138,7 @@ class Binder < Base
       when '_log'; return _get_log(env, path)
       when '_list'; return _get_list(env, path)
       when '_info'; return _get_info(env, path)
+      when '_docket'; return _get_docket(env, path)
       else; return
     end
 
@@ -170,6 +170,7 @@ class Binder < Base
 
   NavBarJacket = [
     ['Tag', '_tag'],
+    ['Docket', '_docket'],
     ['List', '_list'],
     ['Entry', nil],
     ['Edit', '_edit'],
@@ -262,6 +263,18 @@ class Binder < Base
   end # def _link_tag()
 
 
+  #####################################
+  # Link to a docket
+  def _link_dock(env, tag, disp)
+    "<a href='%s/%s/_docket/%s'>%s</a>" % [
+      env['SCRIPT_NAME'],
+      env['sgfa.jacket.url'],
+      _escape(tag),
+      disp
+    ]
+  end # def _link_dock()      
+
+
   #####################################
   # Link to a tag prefix
   def _link_prefix(env, pre, disp)
@@ -283,7 +296,7 @@ class Binder < Base
       enum,
       anum,
       hnum,
-      _escape(name),
+      _escape_path(name),
       disp
     ]
   end # def _link_attach()
@@ -300,7 +313,7 @@ class Binder < Base
 
   JacketsForm =
     "\n<hr>\n<form class='edit' method='post' action='%s' " +
-    "enctype='multipart/form-data'>\n" +
+    "enctype='multipart/form-data' accept-charset='utf-8'>\n" +
     "<fieldset><legend>Create or Edit Jacket</legend>\n" +
     "<label for='jacket'>Name:</label>" +
     "<input class='jacket' name='jacket' type='text'><br>\n" +
@@ -389,7 +402,7 @@ class Binder < Base
 
   UsersForm = 
     "\n<hr>\n<form class='edit' method='post' action='%s' " +
-    "enctype='multipart/form-data'>\n" +
+    "enctype='multipart/form-data' accept-charset='utf-8'>\n" +
     "<fieldset><legend>Set User or Group Permissions</legend>\n" +
     "<label for='user'>Name:</label>" +
     "<input class='user' name='user' type='text'><br>\n" +
@@ -490,7 +503,7 @@ class Binder < Base
 
 
   TagTable = 
-    "<div class='title'>Tag: %s</div>\n" +
+    "<div class='tagname'>Tag: %s</div>\n" +
     "<table class='list'>\n<tr>" +
     "<th>Time</th><th>Title</th><th>Files</th><th>Tags</th><th>Edit</th>" +
     "</tr>\n%s</table>\n"
@@ -528,7 +541,7 @@ class Binder < Base
       html = 'No entries'
     else
       rows = ''
-      ents.reverse_each do |enum, rnum, time, title, tcnt, acnt|
+      ents.reverse_each do |enum, rnum, hnum, time, title, tcnt, acnt|
         rows << TagRow % [
           time.localtime.strftime("%F %T %z"),
           _link_entry(env, enum, _escape_html(title)),
@@ -545,13 +558,87 @@ class Binder < Base
       _escape(tag)
     ]
     query = (per != PageSize) ? { 'perpage' => per.to_s } : nil
-    pages = _link_pages(page, per, size, link, query)
+    pages = PageDiv % _link_pages(page, per, size, link, query)
 
     env['sgfa.status'] = :ok
     env['sgfa.html'] = html + pages
   end # def _get_tag()
 
 
+  # each entry
+  DocketEach = 
+"<div class='title'>%s</div>
+<div class='body'><em>Permission denied</em></div>
+<div class='sidebar'>
+<div class='time'>%s</div>
+<div class='history'>Revision: %d %s<br>History: %s</div>
+<div class='tags'>Number of tags: %d</div>
+<div class='attach'>Number of attachments: %d</div>
+</div>
+<div class='hash'>Hash: Permission denied</div>
+"
+
+  # Page division
+  PageDiv = "<div class='pages'>%s</div>\n"
+
+
+  #####################################
+  # Get a docket view
+  def _get_docket(env, path)
+    _navbar_jacket(env, 'Docket')
+
+    # tag, page, perpage
+    tag = path.empty? ? Jacket::TagAll : _escape_un(path.shift)
+    page = path.empty? ? 1 : path.shift.to_i
+    page = 1 if page == 0
+    rck = Rack::Request.new(env)
+    params = rck.GET
+    per = params['perpage'] ? params['perpage'].to_i : 0
+    per = PageSize if( per == 0 || per > PageSizeMax )
+
+    # get 
+    tr = _trans(env)
+    size, ents = env['sgfa.binder'].read_tag(tr, tag, (page-1)*per, per,
+      raw: true)
+    html = "<div class='tagname'>Docket: %s</div>\n" % _escape_html(tag)
+    if ents.size == 0
+      html << 'No entries'
+    else
+      rows = ''
+      ents.reverse_each do |item|
+        if item.is_a?(Entry)
+          rows << _disp_entry(env, item, jacket: false, current: true)
+        else
+          enum, rnum, hnum, time, title, tcnt, acnt = item
+          if rnum == 1
+            prev = 'previous'
+          else
+            prev = _link_revision(env, enum, rnum-1, 'previous')
+          end
+          hist = _link_history(env, hnum, hnum.to_s)
+          rows << DocketEach % [
+            _escape_html(title),
+            time.localtime.strftime("%F %T %z"),
+            rnum, prev, hist, tcnt, acnt,
+          ]
+        end
+      end
+      html << rows
+    end
+
+    link = '%s/%s/_docket/%s' % [
+      env['SCRIPT_NAME'],
+      env['sgfa.jacket.url'],
+      _escape(tag)
+    ]
+    query = (per != PageSize) ? { 'perpage' => per.to_s } : nil
+    pages = PageDiv % _link_pages(page, per, size, link, query)
+
+    env['sgfa.status'] = :ok
+    env['sgfa.html'] = html + pages
+  end # def _get_docket()
+
+
   LogTable = 
     "<table class='list'>\n<tr>" +
     "<th>History</th><th>Date/Time</th><th>User</th><th>Entries</th>" +
@@ -628,11 +715,11 @@ class Binder < Base
     "<div class='tags'>%s</div>\n" +
     "<div class='attach'>%s</div>\n" + 
     "</div>\n" +
-    "<div class='hash'>Hash: %s<br>Jacket: %s</div>\n"
+    "<div class='hash'>Hash: %s</div>\n"
 
   #####################################
   # Display an entry
-  def _disp_entry(env, ent)
+  def _disp_entry(env, ent, opts={})
 
     enum = ent.entry
     rnum = ent.revision
@@ -643,7 +730,7 @@ class Binder < Base
     if tl.empty?
       tags << "none\n"
     else
-      tl.each do |tag|
+      tl.sort.each do |tag|
         tags << _link_tag(env, tag, _escape_html(tag)) + "<br>\n"
       end
     end
@@ -663,17 +750,20 @@ class Binder < Base
     else
       prev = _link_revision(env, enum, rnum-1, 'previous')
     end
-    curr = _link_entry(env, enum, 'current')
+    curr = opts[:current] ? '' : _link_entry(env, enum, 'current')
     edit = _link_edit(env, enum, 'edit')
+    hist = _link_history(env, hnum, hnum.to_s)
+    hash = ent.hash
+    hash << ('<br>Jacket: %s' % ent.jacket) if opts[:jacket]
 
     body = EntryDisp % [
       _escape_html(ent.title),
       _escape_html(ent.body),
       ent.time.localtime.strftime('%F %T %z'),
-      rnum, prev, curr, _link_history(env, hnum, hnum.to_s), edit,
+      rnum, prev, curr, hist, edit,
       tags,
       att,
-      ent.hash, ent.jacket
+      hash
     ]
 
     return body
@@ -735,14 +825,14 @@ class Binder < Base
 
   ListTable = 
     "<table class='list'>\n<tr>" +
-    "<th>Tag</th><th>Number</th></tr>\n" +
+    "<th>Tag</th><th>Number</th><th>View</th></tr>\n" +
     "%s\n</table>\n"
 
   ListPrefix =
-    "<tr><td class='prefix'>%s: prefix</td><td>%d tags</td></tr>\n"
+    "<tr><td class='prefix'>%s: prefix</td><td>%d tags</td><td></td></tr>\n"
 
   ListTag =
-    "<tr><td class='tag'>%s</td><td>%d entries</td></tr>\n"
+    "<tr><td class='tag'>%s</td><td>%d entries</td><td>%s %s</td></tr>\n"
 
   #####################################
   # Get list of tags
@@ -780,8 +870,12 @@ class Binder < Base
       end
       regular.sort.each do |tag|
         size, ents = bnd.read_tag(tr, tag, 0, 0)
-        rows << ListTag %
-          [_link_tag(env, tag, _escape_html(tag)), size]
+        rows << ListTag % [
+          _link_tag(env, tag, _escape_html(tag)),
+          size,
+          _link_tag(env, tag, 'Tag'),
+          _link_dock(env, tag, 'Docket')
+        ]
       end
 
     # list entire prefix
@@ -796,8 +890,12 @@ class Binder < Base
 
       prefix[pre].sort.each do |tag|
         size, ents = bnd.read_tag(tr, tag, 0, 0)
-        rows << ListTag %
-          [_link_tag(env, tag, _escape_html(tag)), size]
+        rows << ListTag % [
+          _link_tag(env, tag, _escape_html(tag)),
+          size,
+          _link_tag(env, tag, 'Tag'),
+          _link_dock(env, tag, 'Docket')
+        ]
       end
     end
 
@@ -880,58 +978,149 @@ class Binder < Base
 
 
   EditForm = 
-    "<form class='edit' method='post' action='%s/%s' " +
-    "enctype='multipart/form-data'>\n" +
-    "<input name='entry' type='hidden' value='%d'>\n" +
-    "<input name='revision' type='hidden' value='%d'>\n" +
+    "<form class='edit' method='post' action='%s/%s' \
+enctype='multipart/form-data' accept-charset='utf-8'>
+<fieldset>
+<legend>Basic Info</legend>
+<label for='title'>Title:</label>
+<input class='title' name='title' type='text' value='%s'><br>
+<label for='time'>Time:</label>
+<input name='time' type='text' value='%s'><br>
+<label for='body'>Body:</label>
+<textarea class='body' name='body'>%s</textarea>
+</fieldset>
+<fieldset>
+<legend>Attachments</legend>
+<table>
+<tr><th>Name</th><th>Upload/Replace</th><th></th></tr>
+%s</table>
+</fieldset>
+<fieldset>
+<legend>Tags</legend>
+<table>
+%s</table>
+</fieldset>
+<input name='entry' type='hidden' value='%d'>
+<input name='revision' type='hidden' value='%d'>
+<input name='attcnt' id='attcnt' type='hidden' value='%d'>
+<input name='tagcnt' id='tagcnt' type='hidden' value='%d'>
+<input type='submit' name='save' value='Save Changes'>
+</form>
+<script>
+var addAttach = (function(){
+  var count = %d;
+  return function(elmt){
+    count = count + 1;
+    var row = document.createElement('tr');
+
+    var col1 = document.createElement('td');
+    var inpt = document.createElement('input');
+    inpt.setAttribute('type', 'text');
+    inpt.setAttribute('name', 'attname' + count);
+    inpt.setAttribute('class', 'attname');
+    col1.appendChild(inpt);
+    inpt = document.createElement('input');
+    inpt.setAttribute('type', 'hidden');
+    inpt.setAttribute('name', 'attnumb' + count);
+    inpt.setAttribute('value', '0');
+    col1.appendChild(inpt);
+    row.appendChild(col1);
+
+    var col2 = document.createElement('td');
+    inpt = document.createElement('input');
+    inpt.setAttribute('type', 'file');
+    inpt.setAttribute('name', 'attfile' + count);
+    col2.appendChild(inpt);
+    row.appendChild(col2);
+
+    var col3 = document.createElement('td');
+    col3.appendChild(elmt.cloneNode(true));
+    row.appendChild(col3);
+
+    var pcol = elmt.parentNode;
+    pcol.removeChild(elmt);
+    var prow = pcol.parentNode;
+    var ptab = prow.parentNode;
+    ptab.appendChild(row);
+
+    var acnt = document.getElementById('attcnt');
+    acnt.setAttribute('value', count + 1);
+  }
+})();
+var addTag = (function(){
+  var count = %d;
+  return function(elmt){
+    count = count + 1;
+    var row = document.createElement('tr');
+
+    var col1 = document.createElement('td');
+    var pcol = elmt.parentNode;
+    var prev = pcol.previousElementSibling.lastChild;
+    var ptyp = prev.nodeName;
+    if( ptyp == 'SELECT' ){
+      var valu = prev.options[prev.selectedIndex].getAttribute('value');
+    } else {
+      var valu = '';
+    }
+    var inpt = document.createElement('input');
+    inpt.setAttribute('name', 'tag' + count);
+    inpt.setAttribute('class', 'tag');
+    inpt.setAttribute('type', 'text');
+    inpt.setAttribute('value', valu);
+    col1.appendChild(inpt);
+    row.appendChild(col1);
 
-    "<div class='edit'>\n" +
+    var col2 = document.createElement('td');
+    var addb = document.getElementById('add_tag');
+    addb.parentNode.removeChild(addb);
+    col2.appendChild(addb);
+    row.appendChild(col2);
 
-    "<fieldset><legend>Basic Info</legend>\n" +
+    var prow = pcol.parentNode;
+    var ptab = prow.parentNode;
+    ptab.appendChild(row);
 
-    "<label for='title'>Title:</label>" +
-    "<input class='title' name='title' type='text' value='%s'><br>\n" +
+    var tcnt = document.getElementById('tagcnt');
+    tcnt.setAttribute('value', count + 1);
+  }
+})();
+</script>"
 
-    "<label for='time'>Time:</label>" +
-    "<input name='time' type='text' value='%s'><br>\n" +
 
-    "<label for='body'>Body:</label>" +
-    "<textarea class='body' name='body'>%s</textarea>\n" +
+  EditAttach =
+"<tr><td><input name='attname%d' class='attname' type='text' value='%s'>\
+<input name='attnumb%d' type='hidden' value='%d'>\
+</td><td><input name='attfile%d' type='file'></td><td>%s</td></tr>\n"
 
-    "</fieldset>\n" +
-    "<fieldset><legend>Attachments</legend>\n%s</fieldset>\n" +
-    "<fieldset><legend>Tags</legend>\n%s</fieldset>\n" +
 
-    "<input type='submit' name='save' value='Save Changes'>\n" +
-    "</div></form>\n"
+  EditAttachButton =
+"<button type='button' class='add_row' id='add_attach' \
+onclick='addAttach(this)'>+</button>"
 
-  EditFilePre = 
-    "<table class='edit_file'>\n" +
-    "<tr><th>Name</th><th>Upload/Replace</th></tr>\n"
 
-  EditFileEach =
-    "<tr><td><input name='attname%d' type='text' value='%s'>" +
-    "<input name='attnumb%d' type='hidden' value='%d'></td>" +
-    "<td><input name='attfile%d' type='file'></td></tr>\n"
+  EditTag =
+"<tr><td><input name='tag%d' class='tag' type='text' value='%s'></td>\
+<td>%s</td></tr>\n"
 
-  EditFileCnt =
-    "</table>\n<input name='attcnt' type='hidden' value='%d'>\n"
 
-  EditTagOld =
-    "<input name='tag%d' type='text' value='%s'><br>\n"
+  EditTagSel =
+"<tr>
+<td>%s: <select name='pre%d'>
+<option value='%s: ' selected></option>
+%s</select></td>
+<td><button type='button' class='add_row' onclick='addTag(this)'>+\
+</button></td>
+</tr>\n"
 
-  EditTagNew =
-    "<input name='tag%d' type='text'><br>\n"
+  
+  EditTagButton =
+"<button type='button' class='add_row' id='add_tag' onclick='addTag(this)'>+\
+</button>"
 
-  EditTagSel =
-    "%s: <select name='tag%d'>" +
-    "<option value='' selected></option>%s</select><br>\n"
 
   EditTagOpt =
-    "<option value='%s: %s'>%s</option>"
+"<option value='%s: %s'>%s</option>\n"
 
-  EditTagCnt = 
-    "<input name='tagcnt' type='hidden' value='%d'>\n"
 
   #####################################
   # Get edit form
@@ -940,6 +1129,7 @@ class Binder < Base
 
     tr = _trans(env)
 
+    # get entry
     if path.empty?
       enum = 0
       rnum = 0
@@ -954,6 +1144,7 @@ class Binder < Base
       rnum = ent.revision
     end
 
+    # get tag list and prefixes
     lst = env['sgfa.binder'].read_list(tr)
     prefix = {}
     lst.each do |tag|
@@ -968,51 +1159,49 @@ class Binder < Base
       end
     end
 
+    # attachments
+    atts = ''
+    acnt = 0
+    ent.attachments.each do |anum, hnum, name|
+      atts << EditAttach % [acnt, _escape_html(name), acnt, anum, acnt, '']
+      acnt += 1
+    end
+    atts << EditAttach % [acnt, '', acnt, 0, acnt, EditAttachButton]
+
+    # tags
     tags = ''
     cnt = 0
-    ent.tags.each do |tag|
-      tags << EditTagOld % [cnt, _escape_html(tag)]
-      cnt += 1
-    end
-    prefix.each do |pre, lst|
+    prefix.keys.sort.each do |pre|
+      lst = prefix[pre]
       px = _escape_html(pre)
       opts = ''
-      lst.each do |post|
+      lst.sort.each do |post|
         ex = _escape_html(post)
         opts << EditTagOpt % [px, ex, ex]
       end
-      tags << EditTagSel % [px, cnt, opts]
-      cnt += 1
-    end
-    5.times do |tg|
-      tags << EditTagNew % cnt
-      cnt += 1
-    end
-    tags << EditTagCnt % cnt
-
-    atts = "Attachments go here\n"
-    atts = EditFilePre.dup
-    cnt = 0
-    ent.attachments.each do |anum, hnum, name|
-      atts << EditFileEach % [cnt, _escape_html(name), cnt, anum, cnt]
+      tags << EditTagSel % [px, cnt, px, opts]
       cnt += 1
     end
-    5.times do |ix|
-      atts << EditFileEach % [cnt, '', cnt, 0, cnt]
-      cnt += 1
+    tcnt = 0
+    ent.tags.sort.each do |tag|
+      tags << EditTag % [tcnt, _escape_html(tag), '']
+      tcnt += 1
     end
-    atts << EditFileCnt % cnt
+    tags << EditTag % [tcnt, '', EditTagButton]
 
+    # the page
     html = EditForm % [
-      env['SCRIPT_NAME'], env['sgfa.jacket.url'], enum, rnum, 
+      env['SCRIPT_NAME'], env['sgfa.jacket.url'],
       _escape_html(ent.title), ent.time.localtime.strftime('%F %T %z'),
-      _escape_html(ent.body), atts, tags,
+      _escape_html(ent.body), atts, tags, enum, rnum, acnt+1, tcnt+1,
+      acnt, tcnt
     ]
     
     env['sgfa.status'] = :ok
     env['sgfa.html'] = html
   end # def _get_edit
- 
+
+
   JacketPost = [
     'entry',
     'revision',
@@ -1029,6 +1218,13 @@ class Binder < Base
     rck = Rack::Request.new(env)
     params = rck.POST
 
+    # stupid kludge to fix bad standards inplementation.
+    # apparently browsers don't set the charset correctly so rack defaults
+    # to ASCII-8BIT, and then everything dies when there's actually UTF-8
+    # present.  Since modern browsers actually send UTF-8 when we ask for
+    # it, just force it to UTF-8 and hope for the best.
+    params.each{ |key, val| val.force_encoding('utf-8') if val.is_a?(String) }
+
     # validate fields present
     JacketPost.each do |fn|
       next if params[fn]
@@ -1088,9 +1284,15 @@ class Binder < Base
         
       # old file
       else
-        ent.rename(anum, name) if name != ''
         ent.replace(anum, ftmp) if ftmp
-      end     
+        if name != ''
+          ent.rename(anum, name)
+        elsif ftmp
+          ent.rename(anum, file[:filename])
+        else
+          ent.delete(anum)
+        end
+      end
 
     end
 
@@ -1121,6 +1323,13 @@ class Binder < Base
     rck = Rack::Request.new(env)
     params = rck.POST
 
+    # stupid kludge to fix bad standards inplementation.
+    # apparently browsers don't set the charset correctly so rack defaults
+    # to ASCII-8BIT, and then everything dies when there's actually UTF-8
+    # present.  Since modern browsers actually send UTF-8 when we ask for
+    # it, just force it to UTF-8 and hope for the best.
+    params.each{ |key, val| val.force_encoding('utf-8') if val.is_a?(String) }
+
     tr = _trans(env)
     tr[:title] = 'Test title'
     tr[:body] = 'Test description of action'