typo; commit lookup in incremental

[moira.git] / server / cache.dc

diff --git a/server/cache.dc b/server/cache.dc
index 6e621b80d59fb0e7fbe47f6444c473311f833b75..ae04014bf0f208fc18515c72741ce531891b2843 100644 (file)
--- a/server/cache.dc
+++ b/server/cache.dc
@@ -15,6 +15,7 @@ static char *rcsid_cache_dc = "$Header$";
 #include "mr_server.h"
 EXEC SQL INCLUDE sqlca;
 
+EXEC SQL WHENEVER SQLERROR CALL ingerr;
 
 extern char *whoami, *strsave();
 extern int ingres_errno, mr_errcode;
@@ -145,7 +146,7 @@ int *id;
        break;
     case 'M':
     case 'm':
-       EXEC SQL SELECT mach_id INTO :j FROM machine WHERE name=uppercase(:iname);
+       EXEC SQL SELECT mach_id INTO :j FROM machine WHERE name=UPPERCASE(:iname);
        break;
     case 'C':
     case 'c':
@@ -207,7 +208,7 @@ int id;
 char *type;
 char **name;
 {
-    register struct item *i;
+    register struct item *i, *t;
     EXEC SQL BEGIN DECLARE SECTION;
     char iname[NAMESZ];
     int j, rowcount;
@@ -234,27 +235,27 @@ char **name;
     switch (*type) {
     case 'U':
     case 'u':
-       EXEC SQL SELECT login INTO :iname FROM users WHERE users_id=:j;
+       EXEC SQL SELECT CHAR(login) INTO :iname FROM users WHERE users_id=:j;
        break;
     case 'L':
     case 'l':
-       EXEC SQL SELECT name INTO :iname FROM list WHERE list_id=:j;
+       EXEC SQL SELECT CHAR(name) INTO :iname FROM list WHERE list_id=:j;
        break;
     case 'M':
     case 'm':
-       EXEC SQL SELECT name INTO :iname FROM machine WHERE mach_id=:j;
+       EXEC SQL SELECT CHAR(name) INTO :iname FROM machine WHERE mach_id=:j;
        break;
     case 'C':
     case 'c':
-       EXEC SQL SELECT name INTO :iname FROM cluster WHERE clu_id=:j;
+       EXEC SQL SELECT CHAR(name) INTO :iname FROM cluster WHERE clu_id=:j;
        break;
     case 'F':
     case 'f':
-       EXEC SQL SELECT label INTO :iname FROM filesys WHERE filsys_id=:j;
+       EXEC SQL SELECT CHAR(label) INTO :iname FROM filesys WHERE filsys_id=:j;
        break;
     case 'S':
     case 's':
-       EXEC SQL SELECT string INTO :iname FROM strings WHERE string_id=:j;
+       EXEC SQL SELECT CHAR(string) INTO :iname FROM strings WHERE string_id=:j;
        break;
     default:
        return(MR_INTERNAL);