Changeset 10328 for trunk/ippdb/src/ippdb.c

Timestamp:

Nov 30, 2006, 2:46:56 PM (20 years ago)

Author:

jhoblitt

Message:

version 0.0.62

File:

• trunk/ippdb/src/ippdb.c (modified) (12 diffs)

trunk/ippdb/src/ippdb.c

@@ -20 +20 @@
 /*
  *
- * This file was generated by glueforge 0.32
+ * This file was generated by glueforge 0.33
  *
  * Do NOT directly edit this file.
@@ -131 +131 @@
             METADATAITEM_STRIFY_CASE(PS_DATA_F64, "%f", F64);
             case PS_DATA_STRING:
+                psStringSubstitute(str, " ", "_");
                 psStringAppend(&str, "%s", item->data.str);
                 break;
@@ -884 +885 @@
 static void summitImfileRowFree(summitImfileRow *object);
 
-summitImfileRow *summitImfileRowAlloc(const char *exp_id, const char *camera, const char *telescope, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
+summitImfileRow *summitImfileRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *file_id, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
 {
     summitImfileRow *_object;
@@ -894 +895 @@
     _object->camera = psStringCopy(camera);
     _object->telescope = psStringCopy(telescope);
+    _object->file_id = psStringCopy(file_id);
     _object->bytes = bytes;
     _object->md5sum = psStringCopy(md5sum);
@@ -908 +910 @@
     psFree(object->camera);
     psFree(object->telescope);
+    psFree(object->file_id);
     psFree(object->md5sum);
     psFree(object->class);
@@ -932 +935 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "file_id", PS_DATA_STRING, "Key", "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item file_id");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "bytes", PS_DATA_S32, NULL, 0)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item bytes");
@@ -970 +978 @@
 }
 
-bool summitImfileInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
+bool summitImfileInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *file_id, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
 {
     psMetadata *md = psMetadataAlloc();
@@ -985 +993 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, telescope)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item telescope");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "file_id", PS_DATA_STRING, NULL, file_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item file_id");
         psFree(md);
         return false;
@@ -1036 +1049 @@
 bool summitImfileInsertObject(psDB *dbh, summitImfileRow *object)
 {
-    return summitImfileInsert(dbh, object->exp_id, object->camera, object->telescope, object->bytes, object->md5sum, object->class, object->class_id, object->uri);
+    return summitImfileInsert(dbh, object->exp_id, object->camera, object->telescope, object->file_id, object->bytes, object->md5sum, object->class, object->class_id, object->uri);
 }
 
@@ -1124 +1137 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "file_id", PS_DATA_STRING, NULL, object->file_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item file_id");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "bytes", PS_DATA_S32, NULL, object->bytes)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item bytes");
@@ -1173 +1191 @@
         return false;
     }
+    char* file_id = psMetadataLookupPtr(&status, md, "file_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item file_id");
+        return false;
+    }
     psS32 bytes = psMetadataLookupS32(&status, md, "bytes");
     if (!status) {
@@ -1199 +1222 @@
     }
 
-    return summitImfileRowAlloc(exp_id, camera, telescope, bytes, md5sum, class, class_id, uri);
+    return summitImfileRowAlloc(exp_id, camera, telescope, file_id, bytes, md5sum, class, class_id, uri);
 }
 psArray *summitImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)