Index: trunk/Ohana/src/libdvo/include/dvo.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvo.h	(revision 7080)
+++ trunk/Ohana/src/libdvo/include/dvo.h	(revision 8328)
@@ -197,10 +197,4 @@
 void coords_precess (double *ra, double *dec, double in_epoch, double out_epoch);
 
-int lock_catalog (Catalog *catalog, int lockmode);
-int unlock_catalog (Catalog *catalog);
-int load_catalog (Catalog *catalog, int VERBOSE);
-int save_catalog (Catalog *catalog, char VERBOSE);
-int update_catalog (Catalog *catalog, char VERBOSE);
-
 int FindMosaicForImage (Image *images, int Nimages, int entry);
 int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry);
@@ -221,5 +215,4 @@
 PhotCode *GetPhotcodebyNsec (int Nsec);
 PhotCode *GetPhotcodeEquivbyCode (int code);
-
 char     *GetPhotcodeNamebyCode (int code);
 
@@ -274,6 +267,23 @@
 int   ConvertStruct (char *buffer, int size, int Nbytes, char *type);
 
+/** dvo_catalog APIs */
+void dvo_catalog_init (Catalog *catalog);
+void dvo_catalog_create (SkyRegion *region, Catalog *catalog, int Nsecfilt, char *catformat, char *catmode);
+int dvo_catalog_lock (Catalog *catalog, int lockmode);
+int dvo_catalog_unlock (Catalog *catalog);
+int dvo_catalog_load (Catalog *catalog, int VERBOSE);
+int dvo_catalog_save (Catalog *catalog, char VERBOSE);
+int dvo_catalog_update (Catalog *catalog, char VERBOSE);
+
+/* catmode-specific APIs */
+int dvo_catalog_load_raw (Catalog *catalog, int VERBOSE);
+int dvo_catalog_save_raw (Catalog *catalog, char VERBOSE);
+int dvo_catalog_load_mef (Catalog *catalog, int VERBOSE);
+int dvo_catalog_save_mef (Catalog *catalog, char VERBOSE);
+int dvo_catalog_load_split (Catalog *catalog, int VERBOSE);
+int dvo_catalog_save_split (Catalog *catalog, char VERBOSE);
+int dvo_catalog_update_split (Catalog *catalog, char VERBOSE);
+
 /*** conversion functions / I/O conversions ***/
-
 Average *ReadRawAverage (FILE *f, int Naverage, int format);
 Measure *ReadRawMeasure (FILE *f, int Nmeasure, int format);
@@ -312,12 +322,4 @@
 int MeasureToFtable (FTable *ftable, Measure *measure, int Nmeasure, int format);
 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format);
-
-int load_catalog_raw (Catalog *catalog, int VERBOSE);
-int save_catalog_raw (Catalog *catalog, char VERBOSE);
-int load_catalog_mef (Catalog *catalog, int VERBOSE);
-int save_catalog_mef (Catalog *catalog, char VERBOSE);
-int load_catalog_split (Catalog *catalog, int VERBOSE);
-int save_catalog_split (Catalog *catalog, char VERBOSE);
-int update_catalog_split (Catalog *catalog, char VERBOSE);
 
 /*** DVO image db I/O Functions ***/