IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6210


Ignore:
Timestamp:
Jan 26, 2006, 1:26:28 PM (20 years ago)
Author:
jhoblitt
Message:

rename:

project name p2tools -> pxtools
lib name p2tools -> pxtools
p2tools.h -> pxtools.h
p2admin.c -> pxadmin.c
p2adminConfig.c -> pxadminConfig.c
p2adminTables.c -> pxtables.c
p2deleteTables() -> pxDeleteTables()
p2createTables() -> pxCreateTables()
p2Config -> pxConfig

Location:
trunk/ippTools
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/autogen.sh

    r6208 r6210  
    88cd $srcdir
    99
    10 PROJECT=p2tools
     10PROJECT=pxtools
    1111TEST_TYPE=-f
    1212# change this to be a unique filename in the top level dir

  • trunk/ippTools/configure.ac

    r6208 r6210  
    11AC_PREREQ(2.59)
    22
    3 AC_INIT([p2tools], [0.0.1], [eugene@ifa.hawaii.edu])
     3AC_INIT([pxtools], [0.0.1], [jhoblitt@ifa.hawaii.edu])
    44AC_CONFIG_SRCDIR([autogen.sh])
    55
    … …  
    1818PKG_CHECK_MODULES([METADATADB], [metadatadb >= 0.0.1])
    1919
    20 p2tools_CFLAGS="-Wall -Werror -std=c99"
    21 AC_SUBST([p2tools_CFLAGS])
     20pxtools_CFLAGS="-Wall -Werror -std=c99"
     21AC_SUBST([pxtools_CFLAGS])
    2222
    2323AC_CONFIG_FILES([

  • trunk/ippTools/src/Makefile.am

    r6209 r6210  
    1 bin_PROGRAMS = p2search p2admin
     1bin_PROGRAMS = p2search pxadmin
    22
    3 include_HEADERS = p2tools.h
    4 lib_LTLIBRARIES = libp2tools.la
    5 libp2tools_la_CFLAGS    = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
    6 libp2tools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
    7 libp2tools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
    8 libp2tools_la_SOURCES   = \
     3include_HEADERS = pxtools.h
     4lib_LTLIBRARIES = libpxtools.la
     5libpxtools_la_CFLAGS    = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
     6libpxtools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
     7libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
     8libpxtools_la_SOURCES   = \
    99    p2searchDoneFrames.c \
    10     p2adminTables.c \
    11     p2alloc.c \
     10    pxalloc.c \
    1211    p2insertDoneFrames.c \
    1312    p2insertPendingFrames.c \
    … …  
    1716    p2searchRawFrames.c \
    1817    p2updatePending.c \
    19     p2writePendingFrames.c
     18    p2writePendingFrames.c \
     19    pxtables.c
    2020
    2121
    22 # for p2tools.h
     22# for pxtools.h
    2323AM_CPPFLAGS = -I$(top_srcdir)/src$
    2424
    25 p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
    26 p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libp2tools.la
     25p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
     26p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
    2727p2search_SOURCES = \
    2828    p2search.c \
    2929    p2searchConfig.c
    30 p2admin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
    31 p2admin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libp2tools.la
    32 p2admin_SOURCES = \
    33     p2admin.c \
    34     p2adminConfig.c
     30pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
     31pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
     32pxadmin_SOURCES = \
     33    pxadmin.c \
     34    pxadminConfig.c
    3535
    3636clean-local:

  • trunk/ippTools/src/chiptool.c

    r6170 r6210  
    11#include <stdlib.h>
    22
    3 #include "p2tools.h"
    4 
    5 static bool quickMode(p2Config *config);
    6 static bool defineMode(p2Config *config);
    7 static bool pendingMode(p2Config *config);
    8 static bool doneMode(p2Config *config);
     3#include "pxtools.h"
     4
     5static bool quickMode(pxConfig *config);
     6static bool defineMode(pxConfig *config);
     7static bool pendingMode(pxConfig *config);
     8static bool doneMode(pxConfig *config);
    99
    1010int main(int argc, char **argv) {
    11     p2Config        config;
     11    pxConfig        config;
    1212
    1313    p2searchConfig(&config, argc, argv);
    … …  
    4949}
    5050
    51 static bool quickMode(p2Config *config)
     51static bool quickMode(pxConfig *config)
    5252{
    5353    psArray *rawFrames = p2searchRawFrames(config);
    … …  
    7070}
    7171
    72 static bool defineMode(p2Config *config)
     72static bool defineMode(pxConfig *config)
    7373{
    7474    psArray *rawFrames = p2searchRawFrames(config);
    … …  
    136136}
    137137
    138 static bool pendingMode(p2Config *config)
     138static bool pendingMode(pxConfig *config)
    139139{
    140140    psArray *pendingFrames = p2searchPendingFrames(config);
    … …  
    152152}
    153153
    154 static bool doneMode(p2Config *config)
     154static bool doneMode(pxConfig *config)
    155155{
    156156    // get exp_id/class/class_id/url from the CLI // add the completed imfile to

  • trunk/ippTools/src/chiptoolConfig.c

    r6161 r6210  
    11#include <pmConfig.h>
    22
    3 #include "p2tools.h"
     3#include "pxtools.h"
    44
    5 bool p2searchConfig(p2Config *config, int argc, char **argv) {
     5bool p2searchConfig(pxConfig *config, int argc, char **argv) {
    66    PS_ASSERT_PTR_NON_NULL(config, false);
    77

  • trunk/ippTools/src/p2insertDoneFrames.c

    r6133 r6210  
    11# include <metadatadb.h>
    2 # include "p2tools.h"
     2#include "pxtools.h"
    33
    44// select pending frames (exposure+images) which are done/not done
    5 bool p2insertDoneFrames(p2Config *config, psArray *doneFrames) {
     5bool p2insertDoneFrames(pxConfig *config, psArray *doneFrames) {
    66    PS_ASSERT_PTR_NON_NULL(config, false);
    77    PS_ASSERT_PTR_NON_NULL(doneFrames, false);

  • trunk/ippTools/src/p2insertPendingFrames.c

    r6169 r6210  
    11#include <metadatadb.h>
    22
    3 # include "p2tools.h"
     3#include "pxtools.h"
    44
    55// select pending frames (exposure+images) which are done/not done
    66// NOTE this function converts the rawFrames to pendingFrames AND inserts them
    77//      this is useful since the table must be locked the whole time, to get the versions
    8 bool p2insertPendingFrames(p2Config *config, psArray *rawFrames) {
     8bool p2insertPendingFrames(pxConfig *config, psArray *rawFrames) {
    99    PS_ASSERT_PTR_NON_NULL(config, false);
    1010    PS_ASSERT_PTR_NON_NULL(rawFrames, false);

  • trunk/ippTools/src/p2pendingToDone.c

    r6166 r6210  
    1 # include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select pending frames (exposure+images) which are done/not done
    4 psArray *p2pendingToDone(p2Config *config, psArray *pendingFrames) {
     4psArray *p2pendingToDone(pxConfig *config, psArray *pendingFrames) {
    55    PS_ASSERT_PTR_NON_NULL(config, NULL);
    66    PS_ASSERT_PTR_NON_NULL(pendingFrames, NULL);

  • trunk/ippTools/src/p2rawToPending.c

    r6133 r6210  
    1 # include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select pending frames (exposure+images) which are done/not done
    4 psArray *p2rawToPending(p2Config *config, psArray *rawFrames) {
     4psArray *p2rawToPending(pxConfig *config, psArray *rawFrames) {
    55    PS_ASSERT_PTR_NON_NULL(config, NULL);
    66    PS_ASSERT_PTR_NON_NULL(rawFrames, NULL);

  • trunk/ippTools/src/p2searchDoneFrames.c

    r6164 r6210  
    1 #include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select raw frames (exposure+images) which match the given config options
    4 psArray *p2searchDoneFrames(p2Config *config) {
     4psArray *p2searchDoneFrames(pxConfig *config) {
    55    PS_ASSERT_PTR_NON_NULL(config, NULL);
    66

  • trunk/ippTools/src/p2searchPendingFrames.c

    r6165 r6210  
    1 # include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select pending frames (exposure+images) which are done/not done
    4 psArray *p2searchPendingFrames(p2Config *config) {
     4psArray *p2searchPendingFrames(pxConfig *config) {
    55    PS_ASSERT_PTR_NON_NULL(config, NULL);
    66
    … …  
    7878// the selection.  test to see how well/poorly this performs
    7979
    80 psArray *p2searchPendingImfiles(p2Config *config)
     80psArray *p2searchPendingImfiles(pxConfig *config)
    8181{
    8282    PS_ASSERT_PTR_NON_NULL(config, NULL);
    … …  
    125125}
    126126
    127 psArray *p2searchPendingExp(p2Config *config)
     127psArray *p2searchPendingExp(pxConfig *config)
    128128{
    129129    PS_ASSERT_PTR_NON_NULL(config, NULL);

  • trunk/ippTools/src/p2searchRawFrames.c

    r6157 r6210  
    1 # include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select raw frames (exposure+images) which match the given config options
    4 psArray *p2searchRawFrames(p2Config *config) {
     4psArray *p2searchRawFrames(pxConfig *config) {
    55    PS_ASSERT_PTR_NON_NULL(config, NULL);
    66

  • trunk/ippTools/src/p2updatePending.c

    r6133 r6210  
    1 # include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select pending frames (exposure+images) which are not done, select their done images, count, update
    4 bool p2updatePendingFrames(p2Config *config, psArray *pendingFrames) {
     4bool p2updatePendingFrames(pxConfig *config, psArray *pendingFrames) {
    55    PS_ASSERT_PTR_NON_NULL(config, false);
    66    PS_ASSERT_PTR_NON_NULL(pendingFrames, false);

  • trunk/ippTools/src/p2writePendingFrames.c

    r6133 r6210  
    1 # include "p2tools.h"
     1#include "pxtools.h"
    22
    33// select pending frames (exposure+images) which are done/not done
    4 bool p2writePendingFrames (p2Config *config, psArray *frames) {
     4bool p2writePendingFrames (pxConfig *config, psArray *frames) {
    55    PS_ASSERT_PTR_NON_NULL(config, false);
    66    PS_ASSERT_PTR_NON_NULL(frames, false);

  • trunk/ippTools/src/pxadmin.c

    r6128 r6210  
    22#include <metadatadb.h>
    33
    4 #include "p2tools.h"
     4#include "pxtools.h"
    55
    6 int main(int argc, char **argv) {
    7     p2Config        config;
     6int main(int argc, char **argv)
     7{
     8    pxConfig        config;
    89
    9     p2adminConfig(&config, argc, argv);
     10    pxAdminConfig(&config, argc, argv);
    1011
    1112    switch (config.mode) {
    1213        case P2_MODE_RECREATE:
    13             if (!p2deleteTables(&config)) {
     14            if (!pxDeleteTables(&config)) {
    1415                psError(PS_ERR_UNKNOWN, false, "table deletion failed");
    1516                exit(EXIT_FAILURE);
    … …  
    1718            // fall through
    1819        case P2_MODE_CREATE:
    19             if (!p2createTables(&config)) {
     20            if (!pxCreateTables(&config)) {
    2021                psError(PS_ERR_UNKNOWN, false, "table creation failed");
    2122                exit(EXIT_FAILURE);
    … …  
    2324            break;
    2425        case P2_MODE_DELETE:
    25             if (!p2deleteTables(&config)) {
     26            if (!pxDeleteTables(&config)) {
    2627                psError(PS_ERR_UNKNOWN, false, "table deletion failed");
    2728                exit(EXIT_FAILURE);

  • trunk/ippTools/src/pxadminConfig.c

    r6133 r6210  
    1 # include <pmConfig.h>
    2 # include "p2tools.h"
     1#include <pmConfig.h>
     2#include "pxtools.h"
    33
    4 bool p2adminConfig(p2Config *config, int argc, char **argv) {
     4bool pxAdminConfig(pxConfig *config, int argc, char **argv)
     5{
    56    PS_ASSERT_PTR_NON_NULL(config, false);
    67

  • trunk/ippTools/src/pxalloc.c

    r6207 r6210  
    1 #include "p2tools.h"
     1#include "pxtools.h"
    22
    33static void ppRawFrameFree(ppRawFrame *ptr);

  • trunk/ippTools/src/pxtools.h

    r6166 r6210  
    4444    char *class_id;
    4545    char *url;
    46 } p2Config;
     46} pxConfig;
    4747
    4848typedef struct {
    … …  
    7676);
    7777
    78 bool p2createTables (p2Config *config);
    79 bool p2deleteTables (p2Config *config);
    80 bool p2adminConfig (p2Config *config, int argc, char **argv);
    81 bool p2searchConfig (p2Config *config, int argc, char **argv);
    82 psArray *p2rawToPending (p2Config *config, psArray *rawFrames);
    83 psArray *p2searchRawFrames (p2Config *config);
    84 bool p2insertPendingFrames (p2Config *config, psArray *rawFrames);
    85 psArray *p2searchPendingFrames (p2Config *config);
    86 bool p2writePendingImages (p2Config *config, psArray *frames);
    87 bool p2updatePendingFrames (p2Config *config, psArray *pendingFrames);
    88 psArray *p2pendingToDone (p2Config *config, psArray *pendingFrames);
    89 bool p2insertDoneFrames (p2Config *config, psArray *doneFrames);
     78bool pxCreateTables (pxConfig *config);
     79bool pxDeleteTables (pxConfig *config);
     80bool pxAdminConfig (pxConfig *config, int argc, char **argv);
     81bool p2searchConfig (pxConfig *config, int argc, char **argv);
     82psArray *p2rawToPending (pxConfig *config, psArray *rawFrames);
     83psArray *p2searchRawFrames (pxConfig *config);
     84bool p2insertPendingFrames (pxConfig *config, psArray *rawFrames);
     85psArray *p2searchPendingFrames (pxConfig *config);
     86bool p2writePendingImages (pxConfig *config, psArray *frames);
     87bool p2updatePendingFrames (pxConfig *config, psArray *pendingFrames);
     88psArray *p2pendingToDone (pxConfig *config, psArray *pendingFrames);
     89bool p2insertDoneFrames (pxConfig *config, psArray *doneFrames);
    9090bool psTimeIsZero(psTime *time);
    91 bool p2writePendingFrames (p2Config *config, psArray *frames);
    92 psArray *p2searchDoneFrames(p2Config *config);
    93 psArray *p2searchPendingImfiles(p2Config *config);
     91bool p2writePendingFrames (pxConfig *config, psArray *frames);
     92psArray *p2searchDoneFrames(pxConfig *config);
     93psArray *p2searchPendingImfiles(pxConfig *config);
    9494psArray *p2pendingToDoneImfile(psArray *pendingImfiles);
    95 psArray *p2searchPendingExp(p2Config *config);
     95psArray *p2searchPendingExp(pxConfig *config);
    9696p2DoneExpRow *p2pendingToDoneExp(p2PendingExpRow *pendingExp);
Note: See TracChangeset for help on using the changeset viewer.