more options for compat name alg.

tcpd · Oct 31, 2017 · 28e565e · 28e565e
1 parent d53ede3
commit 28e565e
Show file tree

Hide file tree

Showing 5 changed files with 245 additions and 81 deletions.
diff --git a/WebContent/select-op.jsp b/WebContent/select-op.jsp
@@ -48,15 +48,36 @@
             <span class="help">Edit distance 0 not included</span>
 
         </div>
-        <div style="display:none" class="div-min-token-overlap">
-            <label for="min-token-overlap">Token overlap</label>
-            <input type="text" class="form-control" id="min-token-overlap" name="min-token-overlap" placeholder="<%=Config.DEFAULT_MIN_TOKEN_OVERLAP%>">
-            <span class="help">Group rows together if this number of tokens are common</span>
+
+        <div class="div-compat-alg-controls">
+            <div class="div-min-token-overlap">
+                <label for="min-token-overlap">Token overlap</label>
+                <input type="text" class="form-control" id="min-token-overlap" name="min-token-overlap" placeholder="<%=Config.DEFAULT_MIN_TOKEN_OVERLAP%>">
+                <span class="help">Group rows together if this number of tokens are common</span>
+            </div>
+            <div class="div-ignore-token-frequency">
+                <label for="ignore-token-frequency">Ignore token frequency</label>
+                <input type="text" class="form-control" id="ignore-token-frequency" name="ignore-token-frequency" placeholder="<%=Config.DEFAULT_IGNORE_TOKEN_FREQUENCY%>">
+                <span class="help">Frequency threshold in this dataset beyond which a token will be ignored</span>
+            </div>
+            <br/>
+
+            <div style="display:block" class="div-substringAllowed">
+                <label for="substringAllowed">Cluster substrings together</label>
+                    <input type="checkbox" class="form-control" id="substringAllowed" name="substringAllowed" checked>
+            </div>
+            <span class="help">If checked, a name is clustered with a longer name of which it is a part.<br/>
+                e.g., <i>RAM GOPAL</i> is clustered with <i>RAM GOPAL VARMA</i><br/>
+            The number of overlapping tokens does not matter. </span>
+            <br/>
+            <br/>
+
+            <div class="div-initialMapping">
+            <label for="initialMapping">Allow initials</label>
+            <input type="checkbox" class="form-control" id="initialMapping" name="initialMapping" checked>
+                <span class="help">If checked, allows partial words or initials from one name to full words in the other. <br/>e.g., <i>M. GANDHI</i> is clustered with <i>MOHANDAS GANDHI</i></span>
         </div>
-        <div style="display:none" class="div-ignore-token-frequency">
-            <label for="ignore-token-frequency">Ignore token frequency</label>
-            <input type="text" class="form-control" id="ignore-token-frequency" name="ignore-token-frequency" placeholder="<%=Config.DEFAULT_IGNORE_TOKEN_FREQUENCY%>">
-            <span class="help">Frequency threshold in this dataset beyond which a token will be ignored</span>
+            <hr/>
         </div>
     </div>
 
@@ -93,10 +114,7 @@
                 if ($(this).is(':checked'))
                 {
                     result[this.name] = 'on';
-                    epadd.log ('checkbox ' + this.name + ' is on');
                 }
-                else
-                    epadd.log ('checkbox ignored');
             }
             else {
                 result[this.name] = this.value;
@@ -129,11 +147,9 @@
         }
 
         if (alg === 'compatibleNames') {
-            $('.div-min-token-overlap').show();
-            $('.div-ignore-token-frequency').show();
+            $('.div-compat-alg-controls').show();
         } else {
-            $('.div-min-token-overlap').hide();
-            $('.div-ignore-token-frequency').hide();
+            $('.div-compat-alg-controls').hide();
         }
     };
 

diff --git a/WebContent/table.jsp b/WebContent/table.jsp
@@ -170,8 +170,9 @@ import="java.util.*"
 
         boolean isReviewed = groupRows.stream().flatMap(List::stream).allMatch(r -> mergeManager.hasLabel (r, "reviewed"));
         String isReviewedClass = isReviewed ? "reviewed" : "";
+        String tooltip = "Cluster with " + Util.pluralize(groupRows.size(), " id");
         %>
-        <tbody data-groupId="<%=gid%>" class="inside-table <%=isReviewedClass%>" id="table-body">
+        <tbody title="<%=tooltip%>" data-groupId="<%=gid%>" class="inside-table <%=isReviewedClass%>" id="table-body">
         <tr class="toolbar-row">
             <td colspan="20"> <!-- 20 just to be safe -- we just want it at extreme right -->
                 <button data-groupId="<%=gid%>" class="select-button" type="button" id="select-all" >Select all</button>