[whimsy] branch master updated: Better matching

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 2dc05a0  Better matching
2dc05a0 is described below

commit 2dc05a0bea2c53127b37b7797ed0a74a1e2cf174
Author: Sebb <se...@apache.org>
AuthorDate: Sat Jul 28 21:13:16 2018 +0100

    Better matching
---
 www/secretary/ldap-names.cgi | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/www/secretary/ldap-names.cgi b/www/secretary/ldap-names.cgi
index b4add9d..383a5b4 100755
--- a/www/secretary/ldap-names.cgi
+++ b/www/secretary/ldap-names.cgi
@@ -30,6 +30,12 @@ _html do
     _ 'The table below show the differences, if any.'
     _br
     _ 'The Modify? columns show suggested fixes. If the name is non-italic then the suggestion is likely correct; italicised suggestions may be wrong/unnecessary.'
+    _br
+    _ 'The suggested name is considered correct if:'
+    _ul do
+      _li 'The existing field value matches the uid or the cn'
+      _li 'The existing field is missing'
+    end
   end
 
   skipSN = ARGV.shift == 'skipSN' # skip entries with only bad SN
@@ -113,7 +119,7 @@ _html do
           if givenOK
             _ ''
           else
-              if given == p.uid or given == '---'
+              if given == p.uid or given == '---' or given == p.cn
                 _ new_given # likely to be correct
               else
                 _em new_given # less likely
@@ -131,7 +137,7 @@ _html do
           if snOK
             _ ''
           else
-            if p.sn == p.uid
+            if p.sn == p.uid or p.sn == p.cn
               _ new_sn
             else
               _em new_sn