X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=chise.h;h=a1a89dbc833124256598d430a297a01aec7bf010;hb=cbb97a9b1ae66ba13c62d4265f814091131d1a09;hp=509b4735069aabdc0cd3d81757fbbec481fca029;hpb=6a2ea4bad7fd501f5749aa9fc998ce19dafc142c;p=chise%2Flibchise.git

diff --git a/chise.h b/chise.h
index 509b473..a1a89db 100644
--- a/chise.h
+++ b/chise.h
@@ -1,8 +1,11 @@
 #ifndef _CHISE_H
+#define _CHISE_H
 
 #include <db.h>
 #include <errno.h>
 
+extern const unsigned char chise_db_dir[];
+extern const unsigned char chise_system_db_dir[];
 
 typedef enum CHISE_DS_Type
 {
@@ -10,16 +13,18 @@ typedef enum CHISE_DS_Type
   CHISE_DS_Berkeley_DB
 } CHISE_DS_Type;
 
-typedef struct CHISE_DS
-{
-  CHISE_DS_Type type;
-  char *location;
-} CHISE_DS;
+typedef struct CHISE_DS CHISE_DS;
+
+CHISE_DS*
+CHISE_DS_open (CHISE_DS_Type type, const unsigned char *location,
+	       int subtype, int modemask);
 
-int chise_open_data_source (CHISE_DS *ds, CHISE_DS_Type type,
-			    char *location);
+int CHISE_DS_close (CHISE_DS *ds);
 
-int chise_close_data_source (CHISE_DS *ds);
+int
+chise_ds_foreach_char_feature_name (CHISE_DS *ds,
+				    int (*func) (CHISE_DS *ds,
+						 unsigned char *name));
 
 
 typedef int CHISE_Char_ID;
@@ -34,56 +39,98 @@ chise_value_size (const CHISE_Value *s)
 }
 
 static inline char *
+chise_value_data (const CHISE_Value *s)
+{
+  return s->data;
+}
+
+static inline char *
 chise_value_to_c_string (const CHISE_Value *s)
 {
   return s->data;
 }
 
 
-typedef DB CHISE_Attribute_Table;
+typedef struct CHISE_Feature_Table CHISE_Feature_Table;
+typedef CHISE_Feature_Table* CHISE_Feature;
 
+CHISE_Feature
+chise_ds_get_feature (CHISE_DS *ds, const unsigned char *name);
 
-typedef CHISE_Attribute_Table CHISE_Decoding_Table;
+static inline int
+chise_ds_load_char_feature_value (CHISE_DS *ds,
+				  CHISE_Char_ID cid,
+				  const unsigned char *name,
+				  CHISE_Value *valdatum);
 
-int chise_open_decoding_table (CHISE_Decoding_Table **db,
-			       CHISE_DS *ds, const char *ccs,
-			       DBTYPE real_subtype,
-			       u_int32_t accessmask, int modemask);
+int chise_feature_setup_db (CHISE_Feature feature, int writable);
 
-int chise_close_decoding_table (CHISE_Decoding_Table *db);
+int chise_feature_sync (CHISE_Feature feature);
 
-CHISE_Char_ID chise_dt_get_char (CHISE_Decoding_Table *db, int code_point);
+int chise_char_set_feature_value (CHISE_Char_ID cid,
+				  CHISE_Feature feature,
+				  unsigned char *value);
 
+int chise_char_load_feature_value (CHISE_Char_ID cid,
+				   CHISE_Feature feature,
+				   CHISE_Value *valdatum);
 
-typedef CHISE_Attribute_Table CHISE_Feature_Table;
+static inline int
+chise_ds_load_char_feature_value (CHISE_DS *ds,
+				  CHISE_Char_ID cid,
+				  const unsigned char *name,
+				  CHISE_Value *valdatum)
+{
+  return
+    chise_char_load_feature_value (cid, chise_ds_get_feature (ds, name),
+				   valdatum);
+}
 
-int chise_open_feature_table (CHISE_Feature_Table **db,
-			      CHISE_DS *ds, const char *feature,
-			      DBTYPE real_subtype,
-			      u_int32_t accessmask, int modemask);
+unsigned char*
+chise_char_gets_feature_value (CHISE_Char_ID cid,
+			       CHISE_Feature feature,
+			       unsigned char *dst, size_t size);
 
-int chise_close_feature_table (CHISE_Feature_Table *db);
+int
+chise_feature_foreach_char_with_value (CHISE_Feature feature,
+				       int (*func) (CHISE_Char_ID cid,
+						    CHISE_Feature feature,
+						    CHISE_Value *valdatum));
 
-int chise_ft_get_value (CHISE_Feature_Table *db,
-			CHISE_Char_ID cid, CHISE_Value *valdatum);
+#if 0
+int
+chise_feature_foreach_char_with_str (CHISE_Feature feature,
+				     int (*func) (CHISE_Char_ID cid,
+						  CHISE_Feature feature,
+						  unsigned char *str));
+#endif
 
 
+typedef struct CHISE_CCS_Table CHISE_CCS_Table;
+typedef CHISE_CCS_Table* CHISE_CCS;
 
-CHISE_Char_ID chise_decode_char (CHISE_DS *ds, char *ccs, int code_point);
+CHISE_CCS
+chise_ds_get_ccs (CHISE_DS *ds, const unsigned char *name);
 
-int chise_get_feature (CHISE_DS *ds, CHISE_Char_ID cid,
-		       char *key, CHISE_Value *valdatum);
+static inline CHISE_Char_ID
+chise_ds_decode_char (CHISE_DS *ds,
+		      const unsigned char *ccs, int code_point);
 
+int chise_ccs_setup_db (CHISE_CCS ccs, int writable);
 
-int chise_open_attribute_table (CHISE_Attribute_Table **db,
-				const char *db_dir,
-				const char *encoding, const char *feature,
-				DBTYPE real_subtype,
-				u_int32_t accessmask, int modemask);
+int chise_ccs_sync (CHISE_CCS ccs);
 
-int chise_close_attribute_table (CHISE_Attribute_Table *db);
+int chise_ccs_set_decoded_char (CHISE_CCS ccs,
+				int code_point, CHISE_Char_ID cid);
 
-int chise_get_attribute_table (CHISE_Attribute_Table *db,
-			       char *key, CHISE_Value *valdatum);
+CHISE_Char_ID chise_ccs_decode (CHISE_CCS ccs, int code_point);
+
+static inline CHISE_Char_ID
+chise_ds_decode_char (CHISE_DS *ds,
+		      const unsigned char *name, int code_point)
+{
+  return
+    chise_ccs_decode (chise_ds_get_ccs (ds, name), code_point);
+}
 
 #endif /* !_CHISE_H */