From 8b054a692205d1294815f4c86a83107624357bf8 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Wed, 29 Jul 2015 18:00:41 -0700
Subject: [PATCH] fixes #1517: Add synonym support to batch alias/implication
 form

---
 app/logical/alias_and_implication_importer.rb | 15 ++++++++++-----
 app/views/bulk_update_requests/_form.html.erb | 10 +++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/logical/alias_and_implication_importer.rb b/app/logical/alias_and_implication_importer.rb
index 17735b7b4..8f365301b 100644
--- a/app/logical/alias_and_implication_importer.rb
+++ b/app/logical/alias_and_implication_importer.rb
@@ -22,16 +22,21 @@ class AliasAndImplicationImporter
     text.gsub!(/\s+$/, "")
     text.gsub!(/ {2,}/, " ")
     text.split(/\r\n|\r|\n/).map do |line|
-      if line =~ /^create alias (\S+) -> (\S+)$/i
+      if line =~ /^(?:create alias|aliasing|alias) (\S+) -> (\S+)$/i
         [:create_alias, $1, $2]
-      elsif line =~ /^create implication (\S+) -> (\S+)$/i
+
+      elsif line =~ /^(?:create implication|implicating|implicate|imply) (\S+) -> (\S+)$/i
         [:create_implication, $1, $2]
-      elsif line =~ /^remove alias (\S+) -> (\S+)$/i
+
+      elsif line =~ /^(?:remove alias|unaliasing|unalias) (\S+) -> (\S+)$/i
         [:remove_alias, $1, $2]
-      elsif line =~ /^remove implication (\S+) -> (\S+)$/i
+
+      elsif line =~ /^(?:remove implication|unimplicating|unimplicate|unimply) (\S+) -> (\S+)$/i
         [:remove_implication, $1, $2]
-      elsif line =~ /^mass update (.+?) -> (.*)$/i
+
+      elsif line =~ /^(?:mass update|updating|update|change) (.+?) -> (.*)$/i
         [:mass_update, $1, $2]
+
       elsif line.strip.empty?
         # do nothing
       else
diff --git a/app/views/bulk_update_requests/_form.html.erb b/app/views/bulk_update_requests/_form.html.erb
index f0bf7a328..6b8f6511b 100644
--- a/app/views/bulk_update_requests/_form.html.erb
+++ b/app/views/bulk_update_requests/_form.html.erb
@@ -7,11 +7,11 @@
     <label class="text optional" for="bulk_update_request_script">Script</label>
 <pre class="hint">
 Use the following format:
-remove alias aaa -> bbb
-remove implication aaa -> bbb
-create alias aaa -> bbb
-create implication aaa -> bbb
-mass update aaa -> bbb
+unalias aaa -> bbb
+unimply aaa -> bbb
+alias aaa -> bbb
+imply aaa -> bbb
+update aaa -> bbb
 </pre>
     <%= text_area :bulk_update_request, :script, :size => "50x10" %>
   </div>