Diane Delgado's changes for a fixed table-locking order

[moira.git] / regtape / employee.dc

diff --git a/regtape/employee.dc b/regtape/employee.dc
index 7b8fd89255098ca6ea0993978c6d3c2a8301203b..a313c8069beac7decc6eff26c032468bdca1e2b1 100644 (file)
--- a/regtape/employee.dc
+++ b/regtape/employee.dc
@@ -73,6 +73,7 @@ int newfinger = 0;
 
 #define sqlfail() (sqlca.sqlcode && sqlca.sqlcode != 100)
 #define SQL_DUPLICATE -40100
+#define SQL_DEADLOCK -49900
 
 
 main(argc, argv)
@@ -111,19 +112,26 @@ char **argv;
 
     setlinebuf(stdout);
     setlinebuf(stderr);
+    initialize_sms_error_table();
 
     EXEC SQL CONNECT moira;
     if (sqlca.sqlcode != 0) {
-       com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+       com_err(whoami, 0, "ingres error %d opening database", sqlca.sqlcode);
        exit(1);
     }
 
     while (e = get_next_entry(in)) {
+    again:
        process_entry(e);
        EXEC SQL COMMIT WORK;
        if (sqlca.sqlcode != 0) {
-           com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-           exit(1);
+            if (sqlca.sqlcode == SQL_DEADLOCK) {
+                com_err(whoami, MR_DEADLOCK, "commiting work");
+                goto again;
+            } else {
+                com_err(whoami, 0, "ingres error %d committing work", sqlca.sqlcode);
+                exit(1);
+            }
        }
        if (wait) {
            printf("Next");
@@ -219,12 +227,8 @@ FILE *in;
     e.title = strtrim(title);
 
     e.class = "MITS";
-    if (!strcmp(e.dept, "PROJECT ATHENA"))
-      e.class = "STAFF";
-    else if (substr(e.title, "PROF") || substr(e.title, "LECTURE"))
+    if (substr(e.title, "PROF") || substr(e.title, "LECTURE"))
       e.class = "FACULTY";
-    else if (!strcmp(e.title, "VISITING SCIENTIST"))
-      e.class = "VSCIENTI";
 
     strcpy(email, strtrim(username));
     if (host[0] == '@')
@@ -247,6 +251,10 @@ struct entry *e;
     int id, status, who;
     EXEC SQL END DECLARE SECTION;
 
+    /* Don't process Lincoln Labs */
+    if (!strncmp(e->address, "LL", 2))
+      return;
+
     who = WHO;
     prog = PROG;
     first = e->first;
@@ -270,6 +278,10 @@ struct entry *e;
        if (sqlca.sqlcode == SQL_DUPLICATE) {
            com_err(whoami, 0, "duplicate ID number %s on user %s %s", sid, first, last);
            return;
+        } else if (sqlca.sqlcode == SQL_DEADLOCK) {
+            com_err(whoami, MR_DEADLOCK, "looking up user %s", sid);
+            EXEC SQL ROLLBACK;
+            return process_entry(e);
        } else
          sqlexit();
     }
@@ -278,7 +290,14 @@ struct entry *e;
          INTO :id, :dfirst, :dlast, :dmiddle, :class, :oaddr, :ophone, :dept, :status
          FROM users
          WHERE last = :last and first = :first and clearid = :eid;
-       if (sqlfail() && sqlca.sqlcode != SQL_DUPLICATE) sqlexit();
+        if (sqlfail()) {
+            if (sqlca.sqlcode == SQL_DEADLOCK) {
+                com_err(whoami, MR_DEADLOCK, "looking up user %s", sid);
+                EXEC SQL ROLLBACK;
+                return process_entry(e);
+            } else if (sqlca.sqlcode != SQL_DUPLICATE)
+              sqlexit();
+        }
        encrypted++;
        if (id == 0) {
            newuser(e);
@@ -286,14 +305,15 @@ struct entry *e;
        }
     }
 
-    /* Update class/state if necessary */
+    /* Update class/state if necessary.  (Exclude several spacial cases.) */
     if (strcmp(e->class, strtrim(class)) &&
-       strcmp(class, "STAFF") && strcmp(class, "SIPB")) {
+       strcmp(class, "STAFF") && strcmp(class, "SIPBMEM") &&
+       strcmp(class, "KNIGHT")) {
        com_err(whoami, 0, "updating class for %s %s from %s to %s",
                first, last, class, e->class);
-       if (status == US_NOT_ALLOWED && !strcmp(e->class, "FACULTY"))
+       if (status == US_NOT_ALLOWED)
          status = US_NO_LOGIN_YET;
-       if (status == US_ENROLL_NOT_ALLOWED && !strcmp(e->class, "FACULTY"))
+       if (status == US_ENROLL_NOT_ALLOWED)
          status = US_ENROLLED;
        strcpy(class, e->class);
        EXEC SQL UPDATE users
@@ -301,8 +321,13 @@ struct entry *e;
                modby = :who, modwith = :prog
          WHERE users_id = :id;
        if (sqlca.sqlcode != 0) {
-           com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-           exit(1);
+            if (sqlca.sqlcode == SQL_DEADLOCK) {
+                com_err(whoami, MR_DEADLOCK, "updating user");
+               return;
+            } else {
+                com_err(whoami, 0, "ingres error %d updating user", sqlca.sqlcode);
+                exit(1);
+           }
        }
     }
 
@@ -316,8 +341,13 @@ struct entry *e;
                modby = :who, modwith = :prog, modtime = 'now'
          WHERE users_id = :id;
        if (sqlca.sqlcode != 0) {
-           com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-           exit(1);
+            if (sqlca.sqlcode == SQL_DEADLOCK) {
+                com_err(whoami, MR_DEADLOCK, "updating name");
+               return;
+            } else {
+                com_err(whoami, 0, "ingres error %d updating name", sqlca.sqlcode);
+                exit(1);
+            }
        }
     }
 
@@ -392,8 +422,14 @@ struct entry *e;
            xmodtime = 'now', clearid = :sid
          WHERE users_id = :id;
        if (sqlca.sqlcode != 0) {
-           com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-           exit(1);
+            if (sqlca.sqlcode == SQL_DEADLOCK) {
+                com_err(whoami, MR_DEADLOCK, "updating user %s", sid);
+                EXEC SQL ROLLBACK;
+                return process_entry(e);
+            } else {
+                com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+                exit(1);
+            }
        }
     } else {
        EXEC SQL REPEATED UPDATE users
@@ -402,8 +438,14 @@ struct entry *e;
            xmodtime = 'now', clearid = :sid
          WHERE users_id = :id;
        if (sqlca.sqlcode != 0) {
-           com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-           exit(1);
+            if (sqlca.sqlcode == SQL_DEADLOCK) {
+                com_err(whoami, MR_DEADLOCK, "updating user %s", sid);
+                EXEC SQL ROLLBACK;
+                return process_entry(e);
+            } else {
+                com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+                exit(1);
+            }
        }
     }
 }
@@ -451,9 +493,7 @@ struct entry *e;
       sprintf(fullname, "%s %s %s", first, middle, last);
     else
       sprintf(fullname, "%s %s", first, last);
-    st = US_NOT_ALLOWED;
-    if (!strcmp(e->class, "FACULTY") || !strcmp(e->class, "STAFF"))
-      st = US_NO_LOGIN_YET;
+    st = US_NO_LOGIN_YET;
 
     sid = e->id;
     name = e->name;
@@ -467,13 +507,18 @@ struct entry *e;
        clearid, type, modtime, modby, modwith, fullname, office_addr,
        office_phone, department, fmodtime, fmodby, fmodwith,
        potype, xname, xdept, xtitle, xaddress, xphone1, xphone2, xmodtime)
-      VALUES (:login, :id, :uid, '/bin/csh', :last, :first, :middle, :st,
-             :sid, :class, 'now', :who, :prog, :fullname, :oaddr, :ophone,
-             :dept, 'now', :who, :prog, 'NONE', :name, :rdept,
-             :title, :oaddr, :rhphone, :rophone, 'now');
+      VALUES (:login, :id, :uid, '/bin/athena/tcsh', :last, :first,
+             :middle, :st, :sid, :class, 'now', :who, :prog,
+             :fullname, :oaddr, :ophone, :dept, 'now', :who, :prog,
+             'NONE', :name, :rdept, :title, :oaddr, :rhphone,
+             :rophone, 'now');
     if (sqlca.sqlcode != 0) {
-       com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-       exit(1);
+       if (sqlca.sqlcode == SQL_DEADLOCK) {
+           com_err(whoami, MR_DEADLOCK, "adding user");
+       } else {
+           com_err(whoami, 0, "ingres error %d adding user", sqlca.sqlcode);
+           exit(1);
+       }
     } else
       com_err(whoami, 0, "adding user %s %s", e->first, e->last);
 }
@@ -519,7 +564,7 @@ set_next_users_id(limit)
     EXEC SQL REPEATED UPDATE numvalues SET value = :value
       WHERE name = 'users_id';
     if (sqlca.sqlcode != 0) {
-       com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+       com_err(whoami, 0, "ingres error %d assigning ID", sqlca.sqlcode);
        exit(1);
     }
     return(retval);
@@ -562,7 +607,7 @@ set_next_uid(limit)
       value = MIN_ID_VALUE;
     EXEC SQL REPEATED UPDATE numvalues SET value = :value WHERE name = 'uid';
     if (sqlca.sqlcode != 0) {
-       com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+       com_err(whoami, 0, "ingres error %d assigning ID", sqlca.sqlcode);
        exit(1);
     }
     return(retval);
@@ -571,7 +616,11 @@ set_next_uid(limit)
 
 sqlexit()
 {
-    com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+    if (sqlca.sqlcode == SQL_DEADLOCK)
+      com_err(whoami, MR_DEADLOCK, "unrecoverable ingres error %d",
+              sqlca.sqlcode);
+    else
+      com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
     EXEC SQL ROLLBACK WORK;
     exit(1);
 }