IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 9419


Ignore:
Timestamp:
Oct 9, 2006, 11:55:54 AM (20 years ago)
Author:
jhoblitt
Message:

drop table.position auto index

Location:
trunk/glueforge/templates/psdb
Files:
12 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/glueforge/templates/psdb/Makefile.am

    r9415 r9419  
    6161    objectfrommetadata_h.tt \
    6262    pkgconfig_pc_in.tt \
    63     pop.tt \
    64     pop_at.tt \
    65     pop_c.tt \
    66     pop_h.tt \
    67     popfits.tt \
    68     popfits_at.tt \
    69     popfits_c.tt \
    70     popfits_h.tt \
    71     popobject.tt \
    72     popobject_at.tt \
    73     popobject_c.tt \
    74     popobject_h.tt \
    7563    printmetadata.tt \
    7664    printmetadata_h.tt \

  • trunk/glueforge/templates/psdb/code.tt

    r9414 r9419  
    3131#include "[% pkg_name %].h"
    3232
    33 #define [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME "position"
    3433[% FOREACH table = tables -%]
    3534#define [% table.namespace FILTER upper %]_TABLE_NAME "[% table.name %]"
    36 #define [% table.namespace FILTER upper %]_INDEX_NAME [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME
    3735[% END -%]
    3836#define MAX_STRING_LENGTH 1024
    … …  
    5048[% INCLUDE insert.tt %]
    5149[% INCLUDE delete.tt -%]
    52 [% INCLUDE pop.tt %]
    5350[% INCLUDE insertobject.tt %]
    5451[% INCLUDE insertobjects.tt %]
    55 [% INCLUDE popobject.tt %]
    5652[% INCLUDE insertfits.tt %]
    57 [% INCLUDE popfits.tt %]
    5853[% INCLUDE selectrowsfits.tt %]
    5954[% INCLUDE metadatafromobject.tt %]

  • trunk/glueforge/templates/psdb/config.pl

    r9415 r9419  
    1919    'droptable_c.tt'        => "$output/tests/droptable.c",
    2020    'insert_c.tt'           => "$output/tests/insert.c",
    21     'pop_c.tt'              => "$output/tests/pop.c",
    2221    'insertobject_c.tt'     => "$output/tests/insertobject.c",
    23     'popobject_c.tt'        => "$output/tests/popobject.c",
    2422    'insertfits_c.tt'       => "$output/tests/insertfits.c",
    25     'popfits_c.tt'          => "$output/tests/popfits.c",
    2623    'selectrowsfits_c.tt'   => "$output/tests/selectrowsfits.c",
    2724    'metadatafromobject_c.tt' => "$output/tests/metadatafromobject.c",

  • trunk/glueforge/templates/psdb/createtable.tt

    r6029 r9419  
    55
    66    md = psMetadataAlloc();
    7     if (!psMetadataAdd(md, PS_LIST_TAIL, [% table.namespace FILTER upper %]_INDEX_NAME, PS_DATA_S32, "AUTO_INCREMENT", 0.0)) {
    8         psError(PS_ERR_UNKNOWN, false, "failed to add item %s", [% table.namespace FILTER upper %]_INDEX_NAME);
    9         psFree(md);
    10         return false;
    11     }
    127[% FOREACH item = table.columns -%]
    138[% IF item.comment;

  • trunk/glueforge/templates/psdb/header.tt

    r9414 r9419  
    5151[% INCLUDE insert_h.tt %]
    5252[% INCLUDE delete_h.tt %]
    53 [% INCLUDE pop_h.tt %]
    5453[% INCLUDE insertobject_h.tt %]
    5554[% INCLUDE insertobjects_h.tt %]
    56 [% INCLUDE popobject_h.tt %]
    5755[% INCLUDE insertfits_h.tt %]
    58 [% INCLUDE popfits_h.tt %]
    5956[% INCLUDE selectrowsfits_h.tt %]
    6057[% INCLUDE metadatafromobject_h.tt %]

  • trunk/glueforge/templates/psdb/insertfits_at.tt

    r5907 r9419  
    66AT_CHECK([insert])
    77# run popfis so there is afits file to read
    8 AT_CHECK([popfits])
     8AT_CHECK([selectrowsfits])
    99AT_CHECK([insertfits])
    1010AT_CHECK([dbcleanup])

  • trunk/glueforge/templates/psdb/printmetadata.tt

    r8206 r9419  
    55    psMetadata *clean = psMetadataCopy(NULL, md);
    66
    7     // don't bother to check the return status as the key we are trying to
    8     // remove may or may not be there
    9     // XXX someday psErr should be checked -- the only acceptable error is key
    10     // not found
    11     psMetadataRemoveKey(clean, [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME);
    12    
    137    if (![% pkg_namespace %]PrintMetadataRaw(stream, clean, mdcf)) {
    148        psError(PS_ERR_UNKNOWN, false, "failed to print metadata");

  • trunk/glueforge/templates/psdb/printmetadatas.tt

    r8219 r9419  
    77    for (long i = 0; i < psArrayLength(mds); i++) {
    88        psMetadata *md = psMetadataCopy(NULL, mds->data[i]);
    9         // don't bother to check the return status as the key we are trying to
    10         // remove may or may not be there
    11         // XXX someday psErr should be checked -- the only acceptable error
    12         // is key not found
    13 
    14         psMetadataRemoveKey(md, [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME);
    159        if (!psMetadataAddMetadata(output, PS_LIST_TAIL, mdname, PS_META_DUPLICATE_OK, NULL, md)) {
    1610            psError(PS_ERR_UNKNOWN, false, "failed to add a metadata item");

  • trunk/glueforge/templates/psdb/selectrowobjects.tt

    r7664 r9419  
    88    if (!rowSet) {
    99        return NULL;
    10     }
    11 
    12     // strip index column
    13     for (i = 0; i < rowSet->n; i++) {
    14         if (!psMetadataRemove((psMetadata *)(rowSet->data[i]), 0, [% table.namespace FILTER upper %]_INDEX_NAME)) {
    15             psError(PS_ERR_UNKNOWN, true, "failed to remove item %s", [% table.namespace FILTER upper %]_INDEX_NAME);
    16             psFree(rowSet);
    17             return false;
    18         }
    1910    }
    2011

  • trunk/glueforge/templates/psdb/selectrowsfits.tt

    r7291 r9419  
    22{
    33    psArray         *rowSet;
    4     psU64           i;
    54
    65    rowSet = psDBSelectRows(dbh, [% table.namespace FILTER upper %]_TABLE_NAME, where, limit);
    76    if (!rowSet) {
    87        return false;
    9     }
    10 
    11     // strip index column
    12     for (i = 0; i < rowSet->n; i++) {
    13         if (!psMetadataRemove((psMetadata *)rowSet->data[i], 0, [% table.namespace FILTER upper %]_INDEX_NAME)) {
    14             psError(PS_ERR_UNKNOWN, true, "failed to remove item %s", [% table.namespace FILTER upper %]_INDEX_NAME);
    15             psFree(rowSet);
    16             return false;
    17         }
    188    }
    199

  • trunk/glueforge/templates/psdb/tests_makefile_am.tt

    r4345 r9419  
    5151    droptable \
    5252    insert \
    53     pop \
    5453    insertobject \
    55     popobject \
    5654    insertfits \
    57     popfits \
    5855    selectrowsfits \
    5956    metadatafromobject \

  • trunk/glueforge/templates/psdb/testsuite_at.tt

    r4334 r9419  
    1616[% INCLUDE insert_at.tt %]
    1717###
    18 [% INCLUDE pop_at.tt %]
    19 ###
    2018[% INCLUDE insertobject_at.tt %]
    2119###
    22 [% INCLUDE popobject_at.tt %]
    23 ###
    2420[% INCLUDE insertfits_at.tt %]
    25 ###
    26 [% INCLUDE popfits_at.tt %]
    2721###
    2822[% INCLUDE selectrowsfits_at.tt %]
Note: See TracChangeset for help on using the changeset viewer.