Changeset 5950 for trunk/glueforge/templates/psdb/objectfrommetadata_c.tt

Timestamp:

Jan 6, 2006, 6:46:10 PM (21 years ago)

Author:

jhoblitt

Message:

fix tests to work with per table data
minor pslib 0.9.0 compatibility fixes

File:

• trunk/glueforge/templates/psdb/objectfrommetadata_c.tt (modified) (1 diff)

trunk/glueforge/templates/psdb/objectfrommetadata_c.tt

@@ -10 +10 @@
 int main ()
 {
-    psMetadata      *md;
-    [% indented(table.object_name, "*object") %];
+[% FOREACH table = tables -%]
+    {
+        psMetadata      *md;
+        [% indented(table.object_name, "*object") %];
 
-    md = psMetadataAlloc();
+        md = psMetadataAlloc();
 [% FOREACH item = table.columns -%]
 [% IF item.type == "S32" or item.type == "F32" or item.type == "F64" -%]
-    if (!psMetadataAdd[% item.type %](md, PS_LIST_TAIL, "[% item.name %]", NULL, [% item.test %])) {
+        if (!psMetadataAdd[% item.type %](md, PS_LIST_TAIL, "[% item.name %]", 0, NULL, [% item.test %])) {
 [% ELSIF item.type == "STR" -%]
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "[% item.name %]", NULL, [% item.test %])) {
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "[% item.name %]", 0, NULL, [% item.test %])) {
 [% ELSIF item.type == "BOOL" -%]
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "[% item.name %]", PS_DATA_BOOL, NULL, [% item.test %])) {
+        if (!psMetadataAdd(md, PS_LIST_TAIL, "[% item.name %]", PS_DATA_BOOL, NULL, [% item.test %])) {
 [% END -%]
-        psFree(md);
-        exit(EXIT_FAILURE);
-    }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
 [% END -%]
 
-    object = [% table.namespace %]ObjectFromMetadata(md);
-    if (!object) {
+        object = [% table.namespace %]ObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
         psFree(md);
-        exit(EXIT_FAILURE);
-    }
-
-    psFree(md);
 
 [% FOREACH item = table.columns -%]
 [% IF item.type == "S32" or item.type == "F32" or item.type == "F64" or item.type == "BOOL" -%]
-    if (!object->[% item.name %] == [% item.test %]) {
+        if (!object->[% item.name %] == [% item.test %]) {
 [% ELSIF item.type == "STR" -%]
-    if (strncmp(object->[% item.name %], [% item.test %], MAX_STRING_LENGTH)) {
+        if (strncmp(object->[% item.name %], [% item.test %], MAX_STRING_LENGTH)) {
 [% END -%]
-        psFree(object);
-        exit(EXIT_FAILURE);
-    }
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
 [% END -%]
 
-    psFree(object);
+        psFree(object);
+    }
 
+[% END -%]
     exit(EXIT_SUCCESS);
 }