whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Flag spurious givenName
Date Mon, 21 Jun 2021 22:27:36 GMT
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 c6308ca  Flag spurious givenName
c6308ca is described below

commit c6308ca342b6651c582633157b90be33ec7bb711
Author: Sebb <sebb@apache.org>
AuthorDate: Mon Jun 21 23:27:29 2021 +0100

    Flag spurious givenName
---
 www/members/ldap-namecheck.cgi | 6 +++++-
 www/secretary/ldap-names.cgi   | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index 632f007..e23d845 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -31,6 +31,8 @@ _html do
     _br
     _ 'If the givenName or sn does not match part or all of the public name, the cell is
light grey'
     _br
+    _ 'If the Public Name has only a single word, givenName is marked as strike-thru as it
should perhaps be dropped'
+    _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:'
@@ -75,7 +77,7 @@ _html do
       unused = parse['unused']
       _initials = parse['initials']
 
-      givenOK = given.empty? || ASF::Person.names_equivalent?(new_given, given)
+      givenOK = ASF::Person.names_equivalent?(new_given, given)
       badGiven += 1 unless givenOK
 
       snOK =    (new_sn == p.sn)
@@ -109,6 +111,8 @@ _html do
         _td bgcolor: missingGiven ? 'lightgrey' : 'white' do
           if givenOK
             _ given
+          elsif new_given == ''
+            _del given # entry should be removed
           else
             _em given
           end
diff --git a/www/secretary/ldap-names.cgi b/www/secretary/ldap-names.cgi
index 70243d6..0ad1351 100755
--- a/www/secretary/ldap-names.cgi
+++ b/www/secretary/ldap-names.cgi
@@ -73,6 +73,8 @@ _html do
     _br
     _ 'If the givenName or sn does not match part or all of the public name, the cell is
light grey'
     _br
+    _ 'If the Public Name has only a single word, givenName is marked as strike-thru as it
should perhaps be dropped'
+    _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:'
@@ -128,14 +130,15 @@ _html do
       unused = parse['unused']
       _initials = parse['initials']
 
-      givenOK = given.empty? || ASF::Person.names_equivalent?(new_given, given)
+      givenOK = ASF::Person.names_equivalent?(new_given, given)
       badGiven += 1 unless givenOK
 
       snOK =    (new_sn == p.sn)
       badSN += 1 unless snOK
 
       icla = ASF::ICLA.find_by_id(p.uid)
-      public_name = icla.name rescue '?'
+      public_name = icla.name rescue nil
+      next unless public_name # Don't check entries not in iclas.txt
 
       cnOK = (public_name == p.cn)
       pnames=public_name.split
@@ -174,6 +177,8 @@ _html do
         _td bgcolor: missingGiven ? 'lightgrey' : 'white' do
           if givenOK
             _ given
+          elsif new_given == ''
+            _del given # entry should be removed
           else
             _em given
           end

Mime
View raw message