Index: branches/jhoblitt/ippdb/src/ippdb.c
===================================================================
--- branches/jhoblitt/ippdb/src/ippdb.c	(revision 8084)
+++ branches/jhoblitt/ippdb/src/ippdb.c	(revision 8089)
@@ -5961,5 +5961,5 @@
 static void rawDetrendExpRowFree(rawDetrendExpRow *object);
 
-rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
+rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
 {
     rawDetrendExpRow *object;
@@ -5974,5 +5974,4 @@
     object->imfiles = imfiles;
     object->filter = psStringCopy(filter);
-    object->class = psStringCopy(class);
     object->airmass = airmass;
     object->ra = ra;
@@ -5991,5 +5990,4 @@
     psFree(object->exp_type);
     psFree(object->filter);
-    psFree(object->class);
 }
 
@@ -6035,9 +6033,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item airmass");
@@ -6078,5 +6071,5 @@
 }
 
-bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
+bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
 {
     psMetadata      *md;
@@ -6114,9 +6107,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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item airmass");
@@ -6151,5 +6139,5 @@
 }
 
-bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background)
+bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background)
 {
     psArray         *rowSet;
@@ -6231,10 +6219,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;
-    }
     *airmass = psMetadataLookupF32(&status, row, "airmass");
     if (!status) {
@@ -6275,5 +6257,5 @@
 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object)
 {
-    return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->background);
+    return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background);
 }
 
@@ -6286,5 +6268,4 @@
     psS32           imfiles;
     char            filter[256];
-    char            class[256];
     psF32           airmass;
     psF64           ra;
@@ -6293,10 +6274,10 @@
     psF64           background;
 
-    if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) {
+    if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background);
+    return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background);
 }
 
@@ -6427,9 +6408,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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item airmass");
@@ -6470,5 +6446,4 @@
     psS32           imfiles;
     char            *filter;
-    char            *class;
     psF32           airmass;
     psF64           ra;
@@ -6507,9 +6482,4 @@
         return false;
     }
-    class = psMetadataLookupPtr(&status, md, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        return false;
-    }
     airmass = psMetadataLookupF32(&status, md, "airmass");
     if (!status) {
@@ -6538,5 +6508,5 @@
     }
 
-    return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background);
+    return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background);
 }
 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -6596,5 +6566,5 @@
 static void rawScienceExpRowFree(rawScienceExpRow *object);
 
-rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
+rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
 {
     rawScienceExpRow *object;
@@ -6609,5 +6579,4 @@
     object->imfiles = imfiles;
     object->filter = psStringCopy(filter);
-    object->class = psStringCopy(class);
     object->airmass = airmass;
     object->ra = ra;
@@ -6626,5 +6595,4 @@
     psFree(object->exp_type);
     psFree(object->filter);
-    psFree(object->class);
 }
 
@@ -6670,9 +6638,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item airmass");
@@ -6713,5 +6676,5 @@
 }
 
-bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
+bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background)
 {
     psMetadata      *md;
@@ -6749,9 +6712,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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item airmass");
@@ -6786,5 +6744,5 @@
 }
 
-bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background)
+bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background)
 {
     psArray         *rowSet;
@@ -6866,10 +6824,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;
-    }
     *airmass = psMetadataLookupF32(&status, row, "airmass");
     if (!status) {
@@ -6910,5 +6862,5 @@
 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object)
 {
-    return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->background);
+    return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background);
 }
 
@@ -6921,5 +6873,4 @@
     psS32           imfiles;
     char            filter[256];
-    char            class[256];
     psF32           airmass;
     psF64           ra;
@@ -6928,10 +6879,10 @@
     psF64           background;
 
-    if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) {
+    if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background);
+    return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background);
 }
 
@@ -7062,9 +7013,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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item airmass");
@@ -7105,5 +7051,4 @@
     psS32           imfiles;
     char            *filter;
-    char            *class;
     psF32           airmass;
     psF64           ra;
@@ -7142,9 +7087,4 @@
         return false;
     }
-    class = psMetadataLookupPtr(&status, md, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        return false;
-    }
     airmass = psMetadataLookupF32(&status, md, "airmass");
     if (!status) {
@@ -7173,5 +7113,5 @@
     }
 
-    return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background);
+    return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background);
 }
 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)