fixed header again - tom

[moira.git] / regtape / employee.dc

diff --git a/regtape/employee.dc b/regtape/employee.dc
index 2a710d925929a784a481f71e6860b4cad12c9c1d..35faefb099f1251b43b7e1f2beab7c75fd3ab7de 100644 (file)
--- a/regtape/employee.dc
+++ b/regtape/employee.dc
@@ -115,11 +115,12 @@ 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) {
@@ -127,7 +128,7 @@ char **argv;
                 com_err(whoami, MR_DEADLOCK, "commiting work");
                 goto again;
             } else {
-                com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
+                com_err(whoami, 0, "ingres error %d committing work", sqlca.sqlcode);
                 exit(1);
             }
        }
@@ -225,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] == '@')
@@ -253,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;
@@ -318,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);
+           }
        }
     }
 
@@ -333,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);
+            }
        }
     }
 
@@ -501,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);
 }
@@ -548,14 +563,8 @@ set_next_users_id(limit)
     EXEC SQL REPEATED UPDATE numvalues SET value = :value
       WHERE name = 'users_id';
     if (sqlca.sqlcode != 0) {
-        if (sqlca.sqlcode == SQL_DEADLOCK) {
-            com_err(whoami, MR_DEADLOCK, "adding user %s", sid);
-            EXEC SQL ROLLBACK;
-            return newuser(e);
-        } else {
-            com_err(whoami, 0, "ingres error %d", sqlca.sqlcode);
-            exit(1);
-        }
+       com_err(whoami, 0, "ingres error %d assigning ID", sqlca.sqlcode);
+       exit(1);
     }
     return(retval);
 }
@@ -597,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);