IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 30, 2012, 1:46:12 PM (14 years ago)
Author:
eugene
Message:

merge changes from eam_branches/ipp-20120405

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/Ohana/src/relastro/include/relastro.h

    r33652 r33963  
    120120
    121121/* global variables set in parameter file */
    122 # define MAX_PATH_LENGTH 1024
    123 char   ImageCat[MAX_PATH_LENGTH];
    124 char   GSCFILE[MAX_PATH_LENGTH];
    125 char   CATDIR[MAX_PATH_LENGTH];
     122# define DVO_MAX_PATH 1024
     123char   ImageCat[DVO_MAX_PATH];
     124char   GSCFILE[DVO_MAX_PATH];
     125char   CATDIR[DVO_MAX_PATH];
    126126char   *HIGH_SPEED_DIR;
    127127char   CATMODE[16];    /* raw, mef, split, mysql */
    128128char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    129 char   SKY_TABLE[MAX_PATH_LENGTH];
     129char   SKY_TABLE[DVO_MAX_PATH];
    130130int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
    131131

  • trunk/Ohana/src/relastro/src/ConfigInit.c

    r33652 r33963  
    3939  // force CATDIR to be absolute (so parallel mode will work)
    4040  GetConfig (config, "CATDIR",                 "%s",  0, CATDIR);
    41   char *tmpcatdir = abspath (CATDIR, MAX_PATH_LENGTH);
     41  char *tmpcatdir = abspath (CATDIR, DVO_MAX_PATH);
    4242  strcpy (CATDIR, tmpcatdir);
    4343  free (tmpcatdir);

  • trunk/Ohana/src/relastro/src/UpdateObjectOffsets.c

    r33652 r33963  
    8787
    8888    // ensure that the paths are absolute path names
    89     char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
     89    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
    9090    free (table->hosts[i].pathname);
    9191    table->hosts[i].pathname = tmppath;

  • trunk/Ohana/src/relastro/src/args.c

    r33652 r33963  
    9898    RADIUS = atof(argv[N]);
    9999    remove_argument (N, &argc, argv);
    100     HIGH_SPEED_DIR = abspath(argv[N], MAX_PATH_LENGTH);
     100    HIGH_SPEED_DIR = abspath(argv[N], DVO_MAX_PATH);
    101101    remove_argument (N, &argc, argv);
    102102  }

  • trunk/Ohana/src/relastro/src/high_speed_catalogs.c

    r33652 r33963  
    6868    char line[2048];
    6969    snprintf (line, 2048, "cp %s/Images.dat %s/Images.dat", CATDIR, HIGH_SPEED_DIR);
    70     system (line);
     70    int status = system (line);
     71    if (status) {
     72      fprintf (stderr, "copy of Images.dat failed\n");
     73      exit (3);
     74    }
    7175  }
    7276
    … …  
    109113
    110114    // ensure that the paths are absolute path names
    111     char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
     115    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
    112116    free (table->hosts[i].pathname);
    113117    table->hosts[i].pathname = tmppath;
    … …  
    125129
    126130      free (outputDir);
    127       outputDir = abspath (tableOut->hosts[index].pathname, MAX_PATH_LENGTH);
     131      outputDir = abspath (tableOut->hosts[index].pathname, DVO_MAX_PATH);
    128132    }
    129133

  • trunk/Ohana/src/relastro/src/load_catalogs.c

    r33652 r33963  
    126126
    127127    // ensure that the paths are absolute path names
    128     char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
     128    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
    129129    free (table->hosts[i].pathname);
    130130    table->hosts[i].pathname = tmppath;

  • trunk/Ohana/src/relastro/src/relastro_objects.c

    r33652 r33963  
    109109
    110110    // ensure that the paths are absolute path names
    111     char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
     111    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
    112112    free (table->hosts[i].pathname);
    113113    table->hosts[i].pathname = tmppath;
Note: See TracChangeset for help on using the changeset viewer.