Changeset 4197

Timestamp:

Jun 9, 2005, 12:03:06 PM (21 years ago)

Author:

jhoblitt

Message:

add cpp [foo]_INDEX_NAME

Location:

trunk/glueforge/templates/psdb

Files:

• code.tt (modified) (1 diff)
• createtable.tt (modified) (1 diff)
• pop.tt (modified) (2 diffs)
• selectrowsfits.tt (modified) (1 diff)

trunk/glueforge/templates/psdb/code.tt

@@ -2 +2 @@
 
 #define [% namespace FILTER upper %]_TABLE_NAME "[% table_name %]"
+#define [% namespace FILTER upper %]_INDEX_NAME "position"
 
 [% INCLUDE alloc.tt %]

trunk/glueforge/templates/psdb/createtable.tt

@@ -5 +5 @@
 
     md = psMetadataAlloc();
-    psMetadataAdd(md, PS_LIST_TAIL, "position", PS_META_S32, "AUTO_INCREMENT", 0.0);
+    psMetadataAdd(md, PS_LIST_TAIL, [% namespace FILTER upper %]_INDEX_NAME, PS_META_S32, "AUTO_INCREMENT", 0.0);
 [% FOREACH item = columns %]
 [% IF item.comment;

trunk/glueforge/templates/psdb/pop.tt

@@ -22 +22 @@
     }
 
-    rowID = psMetadataLookupS32(&status, row, "position");
+    rowID = psMetadataLookupS32(&status, row, [% namespace FILTER upper %]_INDEX_NAME);
     if (!status) {
         // psError(); something bad happened
@@ -29 +29 @@
 
     popped = psMetadataAlloc();
-    psMetadataAddS32(popped, PS_LIST_TAIL, "position", NULL, rowID);
+    psMetadataAddS32(popped, PS_LIST_TAIL, [% namespace FILTER upper %]_INDEX_NAME, NULL, rowID);
 
     deleted = psDBDeleteRows(dbh, [% namespace FILTER upper %]_TABLE_NAME, popped);

trunk/glueforge/templates/psdb/selectrowsfits.tt

@@ -9 +9 @@
     }
 
-    // strip position column
+    // strip index column
     for (i = 0; i > rowSet->n; i++) {
-        if (!psMetadataRemove((psMetadata *)rowSet->data[i], 0, "position")) {
+        if (!psMetadataRemove((psMetadata *)rowSet->data[i], 0, [% namespace FILTER upper %]_INDEX_NAME)) {
             // psError(); something bad happened
             psFree(rowSet);