Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 5928)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 5945)
@@ -119,5 +119,5 @@
 void       help                   PROTO(());
 int        in_image               PROTO((double r, double d, Image *image));
-int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region, char *path));  /*** choose new name ***/
+int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region));  /*** choose new name ***/
 void       load_subpix            PROTO(());
 void       lock_image_db          PROTO((FITS_DB *db, char *filename));
Index: trunk/Ohana/src/addstar/src/SkyRegionUtils.c
===================================================================
--- trunk/Ohana/src/addstar/src/SkyRegionUtils.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/SkyRegionUtils.c	(revision 5945)
@@ -14,5 +14,5 @@
   /* match the basename against the GSCRegion file names */
   for (i = 0; i < input[0].Nregions; i++) {
-    status = stat ((char *) input[0].regions[i][0].filename, &filestats);
+    status = stat (input[0].filename[i], &filestats);
     if ((status == -1) && (errno == ENOENT)) continue;
     /* give an error for other conditions? */
Index: trunk/Ohana/src/addstar/src/UpdateDatabase_Image.c
===================================================================
--- trunk/Ohana/src/addstar/src/UpdateDatabase_Image.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/UpdateDatabase_Image.c	(revision 5945)
@@ -58,4 +58,5 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    catalog.filename = skylist[0].filename[i];
     load_pt_catalog (&catalog, skylist[0].regions[i]);
 
Index: trunk/Ohana/src/addstar/src/UpdateDatabase_Refcat.c
===================================================================
--- trunk/Ohana/src/addstar/src/UpdateDatabase_Refcat.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/UpdateDatabase_Refcat.c	(revision 5945)
@@ -52,4 +52,5 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    catalog.filename = skylist[0].filename[i];
     load_pt_catalog (&catalog, skylist[0].regions[i]);
 
Index: trunk/Ohana/src/addstar/src/UpdateDatabase_Reflist.c
===================================================================
--- trunk/Ohana/src/addstar/src/UpdateDatabase_Reflist.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/UpdateDatabase_Reflist.c	(revision 5945)
@@ -57,4 +57,5 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    catalog.filename = skylist[0].filename[i];
     load_pt_catalog (&catalog, skylist[0].regions[i]);
 
Index: trunk/Ohana/src/addstar/src/addstar.c
===================================================================
--- trunk/Ohana/src/addstar/src/addstar.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/addstar.c	(revision 5945)
@@ -11,6 +11,6 @@
   AddstarClientOptions options;
 
-  SkyTable *sky;
-  SkyList *skylist;
+  SkyTable *sky = NULL;
+  SkyList *skylist = NULL;
 
   double dtime;
@@ -74,5 +74,6 @@
     gettimeofday (&t1, NULL);
 
-    load_pt_catalog (&catalog, skylist[0].regions[i], CATDIR);
+    catalog.filename = skylist[0].filename[i];
+    load_pt_catalog (&catalog, skylist[0].regions[i]);
 
     /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
Index: trunk/Ohana/src/addstar/src/get2mass.c
===================================================================
--- trunk/Ohana/src/addstar/src/get2mass.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/get2mass.c	(revision 5945)
@@ -31,4 +31,5 @@
     switch (mode) {
       case 0:
+	// XXX put filename from table here
 	refcat = get2mass_AS_data (&sky[0].regions[i], patch, photcode, &Nrefcat);
 	if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (allsky)\n", Nrefcat);
@@ -84,5 +85,5 @@
     if (De < patch[0].Dmin) continue;
     sprintf (datafile, "%s/%s", path, filename);
-    regions[Nregions].filename = (e_void) strcreate (datafile);
+    // XXX : put in table regions[Nregions].filename = (e_void) strcreate (datafile);
     regions[Nregions].Rmin = Rs;
     regions[Nregions].Rmax = Re;
Index: trunk/Ohana/src/addstar/src/get2mass_as.c
===================================================================
--- trunk/Ohana/src/addstar/src/get2mass_as.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/get2mass_as.c	(revision 5945)
@@ -55,5 +55,5 @@
   if (!FilterSkip) Shutdown ("invalid photcode %s", GetPhotcodeNamebyCode(photcode));
 
-  filename = (char *) region[0].filename;
+  // filename = (char *) region[0].filename;
   gf = gzopen (filename, "rb");
   if (gf == NULL) Shutdown ("can't read 2mass data file: %s", filename);
Index: trunk/Ohana/src/addstar/src/get2mass_dr2.c
===================================================================
--- trunk/Ohana/src/addstar/src/get2mass_dr2.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/get2mass_dr2.c	(revision 5945)
@@ -27,5 +27,6 @@
   fprintf (stderr, "overlap: %f - %f, %f - %f\n", RA0, RA1, DEC0, DEC1);
 
-  filename = (char *) region[0].filename;
+  // XXX get from args
+  // filename = (char *) region[0].filename;
   gf = gzopen (filename, "rb");
   if (gf == NULL) Shutdown ("can't read 2mass data file: %s", filename);
Index: trunk/Ohana/src/addstar/src/getgsc.c
===================================================================
--- trunk/Ohana/src/addstar/src/getgsc.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/getgsc.c	(revision 5945)
@@ -25,5 +25,5 @@
   
   for (i = 0; i < skylist[0].Nregions; i++) {
-    gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
+    // XXX : get from table gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
 
     REALLOCATE (stars, Stars, MAX (1, Nstars + Ngsc));
Index: trunk/Ohana/src/addstar/src/load_pt_catalog.c
===================================================================
--- trunk/Ohana/src/addstar/src/load_pt_catalog.c	(revision 5928)
+++ trunk/Ohana/src/addstar/src/load_pt_catalog.c	(revision 5945)
@@ -1,8 +1,6 @@
 # include "addstar.h"
 
-int load_pt_catalog (Catalog *catalog, SkyRegion *region, char *path) {
+int load_pt_catalog (Catalog *catalog, SkyRegion *region) {
   
-  catalog[0].filename = (char *) region[0].filename;
-
   check_permissions (catalog[0].filename);
   if (VERBOSE) fprintf (stderr, "adding to %s\n", catalog[0].filename);