IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14232


Ignore:
Timestamp:
Jul 16, 2007, 12:35:24 PM (19 years ago)
Author:
jhoblitt
Message:

VERSION 1.1.25

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/dbconfig/config.md

    r14061 r14232  
    22    pkg_name        STR     ippdb
    33    pkg_namespace   STR     ippdb
    4     pkg_version     STR     1.1.24
     4    pkg_version     STR     1.1.25
    55END

  • trunk/ippdb/configure.ac

    r14061 r14232  
    55dnl
    66
    7 AC_PREREQ(2.59)
     7AC_PREREQ(2.61)
    88
    9 AC_INIT([ippdb], [1.1.24], [pan-starrs.ifa.hawaii.edu])
     9AC_INIT([ippdb], [1.1.25], [pan-starrs.ifa.hawaii.edu])
    1010AC_CONFIG_SRCDIR([ippdb.pc.in])
    1111
    … …  
    1919
    2020AC_LANG(C)
    21 AC_PROG_CC
     21AC_PROG_CC_C99
    2222AC_PROG_INSTALL
    2323AC_PROG_LIBTOOL
    … …  
    3535dnl is this the best was to setup recursive CFLAGS?
    3636IPP_STDOPTS
    37 ippdb_CFLAGS="-Wall -Werror -pedantic -std=c99 -fno-strict-aliasing"
     37ippdb_CFLAGS="-Wall -Werror -pedantic -fno-strict-aliasing"
    3838AC_SUBST([ippdb_CFLAGS])
    3939

  • trunk/ippdb/src/ippdb.c

    r14169 r14232  
    1287412874{
    1287512875    psMetadata *md = psMetadataAlloc();
    12876     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key INDEX(det_id, exp_id) fkey (det_id) ref detRun(det_id)", 0)) {
     12876    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id) ref detRun(det_id)", 0)) {
    1287712877        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1287812878        psFree(md);
    1287912879        return false;
    1288012880    }
    12881     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key INDEX(det_id, iteration)", 0)) {
     12881    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(exp_id) ref rawExp(exp_id)", 0)) {
    1288212882        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1288312883        psFree(md);
    1288412884        return false;
    1288512885    }
    12886     if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey (exp_id) ref rawExp(exp_id)", 64)) {
     12886    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key INDEX(det_id, exp_id)", 64)) {
    1288712887        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
    1288812888        psFree(md);
    1288912889        return false;
    1289012890    }
    12891     if (!psMetadataAdd(md, PS_LIST_TAIL, "include", PS_DATA_BOOL, NULL, 0)) {
     12891    if (!psMetadataAdd(md, PS_LIST_TAIL, "include", PS_DATA_BOOL, "INDEX(det_id, iteration)", 0)) {
    1289212892        psError(PS_ERR_UNKNOWN, false, "failed to add item include");
    1289312893        psFree(md);
    … …  
    1322813228{
    1322913229    psMetadata *md = psMetadataAlloc();
    13230     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey (det_id, exp_id) ref detInputExp(det_id, exp_id)", 0)) {
     13230    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, exp_id) ref detInputExp(det_id, exp_id)", 0)) {
    1323113231        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1323213232        psFree(md);
    1323313233        return false;
    1323413234    }
    13235     if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey (exp_id, class_id) ref rawImfile(exp_id, class_id)", 64)) {
     13235    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey(exp_id, class_id) ref rawImfile(exp_id, class_id)", 64)) {
    1323613236        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
    1323713237        psFree(md);
    … …  
    1324313243        return false;
    1324413244    }
    13245     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) {
     13245    if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, "INDEX(det_id, exp_id)", "255")) {
    1324613246        psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
    1324713247        psFree(md);
    … …  
    1386313863        return false;
    1386413864    }
    13865     if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key", 64)) {
     13865    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey(det_id, exp_id) ref detProcessedImfile(det_id, exp_id)", 64)) {
    1386613866        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
    1386713867        psFree(md);
    … …  
    1445214452        return false;
    1445314453    }
    14454     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, class_id) ref  detProcessedImfile(det_id, class_id)", 0)) {
     14454    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, class_id) ref detProcessedImfile(det_id, class_id)", 0)) {
    1445514455        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1445614456        psFree(md);
    … …  
    1498514985{
    1498614986    psMetadata *md = psMetadataAlloc();
    14987     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration, class_id) ref detStackedImfile(det_id, iteration, class_id)", 0)) {
     14987    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detInputExp(det_id, iteration)", 0)) {
    1498814988        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1498914989        psFree(md);
    1499014990        return false;
    1499114991    }
    14992     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) {
     14992    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, iteration, class_id) ref detStackedImfile(det_id, iteration, class_id)", 0)) {
    1499314993        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1499414994        psFree(md);
    … …  
    1535415354{
    1535515355    psMetadata *md = psMetadataAlloc();
    15356     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key INDEX(det_id, iteration) fkey(det_id) ref detInputExp(det_id)", 0)) {
     15356    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id) ref detInputExp(det_id)", 0)) {
    1535715357        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1535815358        psFree(md);
    1535915359        return false;
    1536015360    }
    15361     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) {
     15361    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, iteration, class_id) ref detNormalizedStatImfile(det_id, iteration, class_id)", 0)) {
    1536215362        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1536315363        psFree(md);
    1536415364        return false;
    1536515365    }
    15366     if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key", "64")) {
     15366    if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key INDEX(det_id, iteration)", "64")) {
    1536715367        psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
    1536815368        psFree(md);
    … …  
    1590115901{
    1590215902    psMetadata *md = psMetadataAlloc();
    15903     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detNormalizedImfile(det_id, iteration)", 0)) {
     15903    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detInputExp(det_id, iteration)", 0)) {
    1590415904        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1590515905        psFree(md);
    1590615906        return false;
    1590715907    }
    15908     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) {
     15908    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, iteration) ref detNormalizedImfile(det_id, iteration)", 0)) {
    1590915909        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1591015910        psFree(md);
    … …  
    1643716437{
    1643816438    psMetadata *md = psMetadataAlloc();
    16439     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) {
     16439    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration, exp_id) ref detInputExp(det_id, iteration, exp_id)", 0)) {
    1644016440        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1644116441        psFree(md);
    1644216442        return false;
    1644316443    }
    16444     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) {
     16444    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, exp_id, class_id) ref detProcessedImfile(det_id, exp_id, class_id)", 0)) {
    1644516445        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1644616446        psFree(md);
    1644716447        return false;
    1644816448    }
    16449     if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key", 64)) {
     16449    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detNormalizedExp(det_id, iteration)", 64)) {
    1645016450        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
    1645116451        psFree(md);
    1645216452        return false;
    1645316453    }
    16454     if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key", "64")) {
     16454    if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key INDEX(det_id, iteration, exp_id)", "64")) {
    1645516455        psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
    1645616456        psFree(md);
    … …  
    1711017110{
    1711117111    psMetadata *md = psMetadataAlloc();
    17112     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) {
     17112    if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration, exp_id) ref detInputExp(det_id, iteration, exp_id)", 0)) {
    1711317113        psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
    1711417114        psFree(md);
    1711517115        return false;
    1711617116    }
    17117     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) {
     17117    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, iteration, exp_id) ref detResidImfile(det_id, iteration, exp_id)", 0)) {
    1711817118        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1711917119        psFree(md);
    1712017120        return false;
    1712117121    }
    17122     if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key", 64)) {
     17122    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key INDEX(det_id, iteration)", 64)) {
    1712317123        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
    1712417124        psFree(md);
    … …  
    1775417754        return false;
    1775517755    }
    17756     if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) {
     17756    if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, iteration) ref detResidExp(det_id, iteration)", 0)) {
    1775717757        psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
    1775817758        psFree(md);
Note: See TracChangeset for help on using the changeset viewer.