Changeset 8201

Timestamp:

Aug 6, 2006, 5:20:46 PM (20 years ago)

Author:

jhoblitt

Message:

change [foo]printMetadata() to strip position fields
change [foo]printMetadatas() to strip position fields
add [foo]printMetadataRaw()
add [foo]printMetadatasRaw()

Location:

trunk/glueforge/templates/psdb

Files:

• Makefile.am (modified) (1 diff)
• code.tt (modified) (2 diffs)
• header.tt (modified) (1 diff)
• printmetadata.tt (added)
• printmetadata_h.tt (added)
• printmetadataraw.tt (added)
• printmetadataraw_h.tt (added)
• printmetadatas.tt (modified) (1 diff)
• printmetadatas_h.tt (modified) (1 diff)
• printmetadatasraw.tt (added)
• printmetadatasraw_h.tt (added)

trunk/glueforge/templates/psdb/Makefile.am

@@ -68 +68 @@
     popobject_c.tt \
     popobject_h.tt \
+    printmetadata.tt \
+    printmetadata_h.tt \
+    printmetadataraw.tt \
+    printmetadataraw_h.tt \
     printmetadatas.tt \
     printmetadatas_h.tt \
+    printmetadatasraw.tt \
+    printmetadatasraw_h.tt \
     printobjects.tt \
     printobjects_h.tt \

trunk/glueforge/templates/psdb/code.tt

@@ -3 +3 @@
 #include "[% pkg_name %].h"
 
+#define [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME "position"
 [% FOREACH table = tables -%]
 #define [% table.namespace FILTER upper %]_TABLE_NAME "[% table.name %]"
-#define [% table.namespace FILTER upper %]_INDEX_NAME "position"
+#define [% table.namespace FILTER upper %]_INDEX_NAME [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME
 [% END -%]
 #define MAX_STRING_LENGTH 1024
@@ -11 +12 @@
 [% INCLUDE init.tt %]
 [% INCLUDE cleanup.tt %]
+[% INCLUDE printmetadata.tt %]
+[% INCLUDE printmetadataraw.tt %]
 [% INCLUDE printmetadatas.tt %]
+[% INCLUDE printmetadatasraw.tt %]
 [% FOREACH table = tables -%]
 [% INCLUDE alloc.tt %]

trunk/glueforge/templates/psdb/header.tt

@@ -13 +13 @@
 [% INCLUDE init_h.tt %]
 [% INCLUDE cleanup_h.tt %]
+[% INCLUDE printmetadata_h.tt %]
+[% INCLUDE printmetadataraw_h.tt %]
 [% INCLUDE printmetadatas_h.tt %]
+[% INCLUDE printmetadatasraw_h.tt %]
 [% FOREACH table = tables -%]
 [% INCLUDE object_h.tt %]

trunk/glueforge/templates/psdb/printmetadatas.tt

@@ -4 +4 @@
     PS_ASSERT_PTR_NON_NULL(mdname, false);
 
-    psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(mds); i++) {
         psMetadata *md = mds->data[i];
-        if (!psMetadataAddMetadata(
-            output,
-            PS_LIST_TAIL,
-            mdname,
-            PS_META_DUPLICATE_OK,
-            NULL,
-            md
-        )) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add metadata");
-            psFree(output);
+        if (![% pkg_namespace %]PrintMetadata(stream, md, mdconfigformat)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print metadata");
             return false;
         }
     }
 
-    psString str = psMetadataConfigFormat(output);
-    if (!str) {
-        psError(PS_ERR_UNKNOWN, false, "failed to format data into a string");
-        psFree(output);
-    }
-    psFree(output);
-    fprintf(stream, "%s\n", str);
-    psFree(str);
-
     return true;
 }

trunk/glueforge/templates/psdb/printmetadatas_h.tt

@@ -1 +1 @@
 /** Formats and prints an array of metadata
+ *
+ * Any internal use fields are stripped.
  *
  * When mdconfigformat is set the formated output is in psMetadataConfig