ifdef on GDSS (for sis)

[moira.git] / regtape / employee.dc

diff --git a/regtape/employee.dc b/regtape/employee.dc
index 7b8fd89255098ca6ea0993978c6d3c2a8301203b..35faefb099f1251b43b7e1f2beab7c75fd3ab7de 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)
@@ -114,16 +115,22 @@ char **argv;
 
     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 +226,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 +250,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 +277,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 +289,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);
@@ -301,8 +319,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 +339,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 +420,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 +436,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);
+            }
        }
     }
 }
@@ -472,8 +512,12 @@ struct entry *e;
              :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 +563,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 +606,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 +615,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);
 }