Don't explicitly call out students anymore; we get that information from

[moira.git] / gen / directory.pc

diff --git a/gen/directory.pc b/gen/directory.pc
index d79804db5181727f3d86d0e2f4e9c59ba49fd2e2..0e23aca7afbe63e991440ba05fda52d24f0f0bda 100644 (file)
--- a/gen/directory.pc
+++ b/gen/directory.pc
@@ -29,8 +29,6 @@ int main(int argc, char **argv)
 {
   FILE *out = stdout;
   char *outf = NULL, outft[MAXPATHLEN];
-  struct stat sb;
-  int flag;
   EXEC SQL BEGIN DECLARE SECTION;
   char login[USERS_LOGIN_SIZE], last_name[USERS_LAST_SIZE];
   char first_name[USERS_FIRST_SIZE], middle_name[USERS_MIDDLE_SIZE];
@@ -44,17 +42,6 @@ int main(int argc, char **argv)
 
   if (argc == 2)
     {
-      if (stat(argv[1], &sb) == 0)
-       {
-         if (ModDiff (&flag, "users", sb.st_mtime))
-           exit(MR_DATE);
-         if (flag < 0)
-           {
-             fprintf(stderr, "File %s does not need to be rebuilt.\n",
-                     argv[1]);
-             exit(MR_NO_CHANGE);
-           }
-       }
       outf = argv[1];
       sprintf(outft, "%s~", outf);
       if (!(out = fopen(outft, "w")))
@@ -77,7 +64,7 @@ int main(int argc, char **argv)
     login, last, first, middle, office_addr, office_phone, 
     home_addr, home_phone, clearid, type 
     FROM users WHERE status = 1 AND type != 'SYSTEM' AND type != 'STAFF'
-    AND type NOT LIKE 'GUES%';
+    AND type != 'TEST' and type != 'REGTEST' AND type NOT LIKE 'GUES%';
   EXEC SQL OPEN x;
   while (1)
     {
@@ -110,9 +97,7 @@ int main(int argc, char **argv)
                "%s\t5:%s\t2:%s@mit.edu\t1:%s\t0:%s\t14:%s\t15:%s\t10:%s\n",
                 id, last_name, login, last_name, first_name, middle_name,
                 last_name, first_name, middle_name, login, login,
-                "", "", "", "", strcmp(type, "G") == 0 ? "G" : 
-               !strncmp(type, "19", 2) ? "Undergraduate" : 
-               !strncmp(type, "20", 2) ? "Undergraduate" : "MIT Affiliate");
+                "", "", "", "", "MIT Affiliate");
 #endif
     }
   EXEC SQL CLOSE x;