Index: branches/jhoblitt/ippdb/src/ippdb.c
===================================================================
--- branches/jhoblitt/ippdb/src/ippdb.c	(revision 8006)
+++ branches/jhoblitt/ippdb/src/ippdb.c	(revision 8020)
@@ -4670,5 +4670,5 @@
 static void pzPendingImfileRowFree(pzPendingImfileRow *object);
 
-pzPendingImfileRow *pzPendingImfileRowAlloc(const char *exp_id, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
+pzPendingImfileRow *pzPendingImfileRowAlloc(const char *exp_id, psS32 bytes, const char *md5sum, const char *class_id, const char *uri)
 {
     pzPendingImfileRow *object;
@@ -4680,5 +4680,4 @@
     object->bytes = bytes;
     object->md5sum = psStringCopy(md5sum);
-    object->class = psStringCopy(class);
     object->class_id = psStringCopy(class_id);
     object->uri = psStringCopy(uri);
@@ -4691,5 +4690,4 @@
     psFree(object->exp_id);
     psFree(object->md5sum);
-    psFree(object->class);
     psFree(object->class_id);
     psFree(object->uri);
@@ -4722,9 +4720,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -4750,5 +4743,5 @@
 }
 
-bool pzPendingImfileInsert(psDB * dbh, const char *exp_id, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
+bool pzPendingImfileInsert(psDB * dbh, const char *exp_id, psS32 bytes, const char *md5sum, const char *class_id, const char *uri)
 {
     psMetadata      *md;
@@ -4771,9 +4764,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -4793,5 +4781,5 @@
 }
 
-bool pzPendingImfilePop(psDB *dbh, char **exp_id, psS32 *bytes, char **md5sum, char **class, char **class_id, char **uri)
+bool pzPendingImfilePop(psDB *dbh, char **exp_id, psS32 *bytes, char **md5sum, char **class_id, char **uri)
 {
     psArray         *rowSet;
@@ -4855,10 +4843,4 @@
         return false;
     }
-    *class = psMetadataLookupPtr(&status, row, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        psFree(row);
-        return false;
-    }
     *class_id = psMetadataLookupPtr(&status, row, "class_id");
     if (!status) {
@@ -4881,5 +4863,5 @@
 bool pzPendingImfileInsertObject(psDB *dbh, pzPendingImfileRow *object)
 {
-    return pzPendingImfileInsert(dbh, object->exp_id, object->bytes, object->md5sum, object->class, object->class_id, object->uri);
+    return pzPendingImfileInsert(dbh, object->exp_id, object->bytes, object->md5sum, object->class_id, object->uri);
 }
 
@@ -4889,14 +4871,13 @@
     psS32           bytes;
     char            md5sum[256];
-    char            class[256];
     char            class_id[256];
     char            uri[256];
 
-    if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class, (char **)&class_id, (char **)&uri)) {
+    if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class_id, (char **)&uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class, class_id, uri);
+    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class_id, uri);
 }
 
@@ -5012,9 +4993,4 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return NULL;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, object->class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5037,5 +5013,4 @@
     psS32           bytes;
     char            *md5sum;
-    char            *class;
     char            *class_id;
     char            *uri;
@@ -5056,9 +5031,4 @@
         return false;
     }
-    class = psMetadataLookupPtr(&status, md, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        return false;
-    }
     class_id = psMetadataLookupPtr(&status, md, "class_id");
     if (!status) {
@@ -5072,5 +5042,5 @@
     }
 
-    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class, class_id, uri);
+    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class_id, uri);
 }
 psArray *pzPendingImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -5560,5 +5530,5 @@
 static void newImfileRowFree(newImfileRow *object);
 
-newImfileRow *newImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri)
+newImfileRow *newImfileRowAlloc(const char *exp_id, const char *class_id, const char *uri)
 {
     newImfileRow    *object;
@@ -5568,5 +5538,4 @@
 
     object->exp_id = psStringCopy(exp_id);
-    object->class = psStringCopy(class);
     object->class_id = psStringCopy(class_id);
     object->uri = psStringCopy(uri);
@@ -5578,5 +5547,4 @@
 {
     psFree(object->exp_id);
-    psFree(object->class);
     psFree(object->class_id);
     psFree(object->uri);
@@ -5599,9 +5567,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5627,5 +5590,5 @@
 }
 
-bool newImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri)
+bool newImfileInsert(psDB * dbh, const char *exp_id, const char *class_id, const char *uri)
 {
     psMetadata      *md;
@@ -5638,9 +5601,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5660,5 +5618,5 @@
 }
 
-bool newImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri)
+bool newImfilePop(psDB *dbh, char **exp_id, char **class_id, char **uri)
 {
     psArray         *rowSet;
@@ -5710,10 +5668,4 @@
         return false;
     }
-    *class = psMetadataLookupPtr(&status, row, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        psFree(row);
-        return false;
-    }
     *class_id = psMetadataLookupPtr(&status, row, "class_id");
     if (!status) {
@@ -5736,5 +5688,5 @@
 bool newImfileInsertObject(psDB *dbh, newImfileRow *object)
 {
-    return newImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri);
+    return newImfileInsert(dbh, object->exp_id, object->class_id, object->uri);
 }
 
@@ -5742,14 +5694,13 @@
 {
     char            exp_id[256];
-    char            class[256];
     char            class_id[256];
     char            uri[256];
 
-    if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) {
+    if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class_id, (char **)&uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return newImfileRowAlloc(exp_id, class, class_id, uri);
+    return newImfileRowAlloc(exp_id, class_id, uri);
 }
 
@@ -5855,9 +5806,4 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return NULL;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, object->class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5878,5 +5824,4 @@
     bool            status;
     char            *exp_id;
-    char            *class;
     char            *class_id;
     char            *uri;
@@ -5887,9 +5832,4 @@
         return false;
     }
-    class = psMetadataLookupPtr(&status, md, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        return false;
-    }
     class_id = psMetadataLookupPtr(&status, md, "class_id");
     if (!status) {
@@ -5903,5 +5843,5 @@
     }
 
-    return newImfileRowAlloc(exp_id, class, class_id, uri);
+    return newImfileRowAlloc(exp_id, class_id, uri);
 }
 psArray *newImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)