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

Timestamp:

Sep 24, 2007, 6:18:00 PM (19 years ago)

Author:

jhoblitt

Message:

update magicInputSkyfile

File:

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

trunk/ippdb/src/ippdb.c

@@ -19293 +19293 @@
 static void magicInputSkyfileRowFree(magicInputSkyfileRow *object);
 
-magicInputSkyfileRow *magicInputSkyfileRowAlloc(psS64 magic_id, psS64 diff_id, psS32 node)
+magicInputSkyfileRow *magicInputSkyfileRowAlloc(psS64 magic_id, psS64 diff_id, const char *node)
 {
     magicInputSkyfileRow *_object;
@@ -19302 +19302 @@
     _object->magic_id = magic_id;
     _object->diff_id = diff_id;
-    _object->node = node;
+    _object->node = psStringCopy(node);
 
     return _object;
@@ -19309 +19309 @@
 static void magicInputSkyfileRowFree(magicInputSkyfileRow *object)
 {
+    psFree(object->node);
 }
 
@@ -19324 +19325 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "node", PS_DATA_S32, "AUTO_INCREMENT INDEX(magic_id, node)", 0)) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "node", PS_DATA_STRING, "INDEX(magic_id, node)", "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item node");
         psFree(md);
@@ -19342 +19343 @@
 }
 
-bool magicInputSkyfileInsert(psDB * dbh, psS64 magic_id, psS64 diff_id, psS32 node)
+bool magicInputSkyfileInsert(psDB * dbh, psS64 magic_id, psS64 diff_id, const char *node)
 {
     psMetadata *md = psMetadataAlloc();
@@ -19355 +19356 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "node", PS_DATA_S32, NULL, node)) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "node", PS_DATA_STRING, NULL, node)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item node");
         psFree(md);
@@ -19466 +19467 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "node", PS_DATA_S32, NULL, object->node)) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "node", PS_DATA_STRING, NULL, object->node)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item node");
         psFree(md);
@@ -19490 +19491 @@
         return false;
     }
-    psS32 node = psMetadataLookupS32(&status, md, "node");
+    char* node = psMetadataLookupPtr(&status, md, "node");
     if (!status) {
         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item node");