lint

[moira.git] / gen / prlogger.dc

diff --git a/gen/prlogger.dc b/gen/prlogger.dc
index 354c72999fcd902175553937d245524b4a553f29..df9074ef1cbfa5a730bcdc5b720578aced53d3a2 100644 (file)
--- a/gen/prlogger.dc
+++ b/gen/prlogger.dc
@@ -33,10 +33,11 @@ char **argv;
     EXEC SQL END DECLARE SECTION;
 
 #ifsql INGRES
-    EXEC SQL CONNECT sms;
+    EXEC SQL CONNECT moira;
+    EXEC SQL SET LOCKMODE SESSION WHERE LEVEL=TABLE, READLOCK=SHARED;
 #endsql
 #ifsql INFORMIX
-    EXEC SQL DATABASE sms;
+    EXEC SQL DATABASE moira;
 #endsql
 
     if (argc == 2) {
@@ -65,7 +66,7 @@ char **argv;
     EXEC SQL WHENEVER SQLERROR GOTO sqlerr;
 
     EXEC SQL DECLARE x CURSOR FOR 
-      SELECT login, mit_year FROM users WHERE status = 1;
+      SELECT login, type FROM users WHERE status = 1;
     EXEC SQL OPEN x;
     while (1) {
        EXEC SQL FETCH x INTO :login, :class;
@@ -93,6 +94,10 @@ char **argv;
 
  sqlerr:
     com_err(whoami, MR_INGRES_ERR, " code %d\n", sqlca.sqlcode);
+#ifsql INGRES
+    if (sqlca.sqlcode == 17700 || sqlca.sqlcode == -37000)
+      exit(MR_DEADLOCK);
+#endsql
     critical_alert("DCM", "PrLogger build encountered INGRES ERROR %d",
                   sqlca.sqlcode);
     exit(MR_INGRES_ERR);