Index: trunk/ippdb/src/ippdb.c
===================================================================
--- trunk/ippdb/src/ippdb.c	(revision 9183)
+++ trunk/ippdb/src/ippdb.c	(revision 9187)
@@ -7194,5 +7194,5 @@
 static void rawDetrendExpRowFree(rawDetrendExpRow *object);
 
-rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang)
+rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
 {
     rawDetrendExpRow *object;
@@ -7218,4 +7218,5 @@
     object->ccd_temp = ccd_temp;
     object->posang = posang;
+    object->obstype = psStringCopy(obstype);
 
     return object;
@@ -7229,4 +7230,5 @@
     psFree(object->exp_type);
     psFree(object->filter);
+    psFree(object->obstype);
 }
 
@@ -7327,4 +7329,9 @@
         return false;
     }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+        psFree(md);
+        return false;
+    }
 
     status = psDBCreateTable(dbh, RAWDETRENDEXP_TABLE_NAME, md);
@@ -7340,5 +7347,5 @@
 }
 
-bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang)
+bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
 {
     psMetadata      *md;
@@ -7428,4 +7435,9 @@
     if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, posang)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
         psFree(md);
         return false;
@@ -7452,5 +7464,5 @@
     return deleted;
 }
-bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang)
+bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
 {
     psArray         *rowSet;
@@ -7598,4 +7610,10 @@
         return false;
     }
+    *obstype = psMetadataLookupPtr(&status, row, "obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+        psFree(row);
+        return false;
+    }
 
     psFree(row);
@@ -7606,5 +7624,5 @@
 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object)
 {
-    return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang);
+    return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
 }
 
@@ -7639,11 +7657,12 @@
     psF32           ccd_temp;
     psF64           posang;
-
-    if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang)) {
+    char            obstype[256];
+
+    if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);
+    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
 }
 
@@ -7826,4 +7845,9 @@
     if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, object->posang)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
+        psFree(md);
+        return NULL;
+    }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
         psFree(md);
         return NULL;
@@ -7853,4 +7877,5 @@
     psF32           ccd_temp;
     psF64           posang;
+    char            *obstype;
 
     exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
@@ -7939,6 +7964,11 @@
         return false;
     }
-
-    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);
+    obstype = psMetadataLookupPtr(&status, md, "obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+        return false;
+    }
+
+    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
 }
 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -8047,5 +8077,5 @@
 static void rawScienceExpRowFree(rawScienceExpRow *object);
 
-rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang)
+rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
 {
     rawScienceExpRow *object;
@@ -8071,4 +8101,5 @@
     object->ccd_temp = ccd_temp;
     object->posang = posang;
+    object->obstype = psStringCopy(obstype);
 
     return object;
@@ -8082,4 +8113,5 @@
     psFree(object->exp_type);
     psFree(object->filter);
+    psFree(object->obstype);
 }
 
@@ -8180,4 +8212,9 @@
         return false;
     }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+        psFree(md);
+        return false;
+    }
 
     status = psDBCreateTable(dbh, RAWSCIENCEEXP_TABLE_NAME, md);
@@ -8193,5 +8230,5 @@
 }
 
-bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang)
+bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
 {
     psMetadata      *md;
@@ -8281,4 +8318,9 @@
     if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, posang)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
         psFree(md);
         return false;
@@ -8305,5 +8347,5 @@
     return deleted;
 }
-bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang)
+bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
 {
     psArray         *rowSet;
@@ -8451,4 +8493,10 @@
         return false;
     }
+    *obstype = psMetadataLookupPtr(&status, row, "obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+        psFree(row);
+        return false;
+    }
 
     psFree(row);
@@ -8459,5 +8507,5 @@
 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object)
 {
-    return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang);
+    return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
 }
 
@@ -8492,11 +8540,12 @@
     psF32           ccd_temp;
     psF64           posang;
-
-    if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang)) {
+    char            obstype[256];
+
+    if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);
+    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
 }
 
@@ -8679,4 +8728,9 @@
     if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, object->posang)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
+        psFree(md);
+        return NULL;
+    }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
         psFree(md);
         return NULL;
@@ -8706,4 +8760,5 @@
     psF32           ccd_temp;
     psF64           posang;
+    char            *obstype;
 
     exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
@@ -8792,6 +8847,11 @@
         return false;
     }
-
-    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);
+    obstype = psMetadataLookupPtr(&status, md, "obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+        return false;
+    }
+
+    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
 }
 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -8900,5 +8960,5 @@
 static void rawImfileRowFree(rawImfileRow *object);
 
-rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang)
+rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
 {
     rawImfileRow    *object;
@@ -8924,4 +8984,5 @@
     object->ccd_temp = ccd_temp;
     object->posang = posang;
+    object->obstype = psStringCopy(obstype);
 
     return object;
@@ -8936,4 +8997,5 @@
     psFree(object->exp_type);
     psFree(object->filter);
+    psFree(object->obstype);
 }
 
@@ -9034,4 +9096,9 @@
         return false;
     }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+        psFree(md);
+        return false;
+    }
 
     status = psDBCreateTable(dbh, RAWIMFILE_TABLE_NAME, md);
@@ -9047,5 +9114,5 @@
 }
 
-bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang)
+bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
 {
     psMetadata      *md;
@@ -9135,4 +9202,9 @@
     if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, posang)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
         psFree(md);
         return false;
@@ -9159,5 +9231,5 @@
     return deleted;
 }
-bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang)
+bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
 {
     psArray         *rowSet;
@@ -9305,4 +9377,10 @@
         return false;
     }
+    *obstype = psMetadataLookupPtr(&status, row, "obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+        psFree(row);
+        return false;
+    }
 
     psFree(row);
@@ -9313,5 +9391,5 @@
 bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object)
 {
-    return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang);
+    return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
 }
 
@@ -9346,11 +9424,12 @@
     psF32           ccd_temp;
     psF64           posang;
-
-    if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang)) {
+    char            obstype[256];
+
+    if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);
+    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
 }
 
@@ -9533,4 +9612,9 @@
     if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, object->posang)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
+        psFree(md);
+        return NULL;
+    }
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
         psFree(md);
         return NULL;
@@ -9560,4 +9644,5 @@
     psF32           ccd_temp;
     psF64           posang;
+    char            *obstype;
 
     exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
@@ -9646,6 +9731,11 @@
         return false;
     }
-
-    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);
+    obstype = psMetadataLookupPtr(&status, md, "obstype");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+        return false;
+    }
+
+    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
 }
 psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)