(test_map_func): Modify for chise_char_feature_value_iterate.

[chise/libchise.git] / sample.c

diff --git a/sample.c b/sample.c
index e2b9bad..05093db 100644 (file)
--- a/sample.c
+++ b/sample.c
@@ -3,23 +3,45 @@
 char db_dir[] = "/usr/local/lib/chise/char-db";
 
 int
+test_map_func (CHISE_Char_ID cid, CHISE_Feature_Table *db,
+              CHISE_Value *valdatum)
+{
+  unsigned char buf[256];
+
+  printf ("(flags = %x)\n", valdatum->flags);
+  if (chise_value_size (valdatum) < 256)
+    {
+      strncpy (buf, chise_value_data (valdatum),
+              chise_value_size (valdatum));
+      buf[chise_value_size (valdatum)] = '\0';
+      printf ("#x%04X\t(%c)\t%s\n", cid, cid, buf);
+    }
+  else
+    printf ("#x%04X\t(%c)\t%s\n",
+           cid, cid, chise_value_to_c_string (valdatum));
+  return 0;
+}
+
+int
 main (int argc, char* argv[])
 {
-  CHISE_DS ds;
-  CHISE_Decoding_Table *dt_daikanwa;
+  CHISE_DS *ds;
+  CHISE_CCS ccs_daikanwa;
   CHISE_Feature_Table *ft_ideographic_structure;
+  CHISE_Feature_Table *ft_ascii;
   int modemask;
   int accessmask = 0;
   DBTYPE real_subtype;
   int status;
   CHISE_Char_ID char_id;
   CHISE_Value value;
-  
+  unsigned char buf[1024];
+
   /* open a data-source */
-  status = chise_open_data_source (&ds, CHISE_DS_Berkeley_DB, db_dir);
-  if (status)
+  ds = chise_open_data_source (CHISE_DS_Berkeley_DB, db_dir);
+  if (ds == NULL)
     {
-      chise_close_data_source (&ds);
+      printf ("Can't open data source\n");
       return -1;
     }
 
@@ -33,51 +55,35 @@ main (int argc, char* argv[])
   accessmask = DB_RDONLY;
 
   /* setup a decoding-table */
-  status = chise_open_decoding_table (&dt_daikanwa, &ds,
-                                     "=daikanwa",
-                                     real_subtype,
-                                     accessmask, modemask);
-  if (status)
+  ccs_daikanwa
+    = chise_ds_get_ccs (ds, "=daikanwa",
+                       real_subtype, accessmask, modemask);
+  if (ccs_daikanwa == NULL)
     {
-      chise_close_decoding_table (dt_daikanwa);
-      chise_close_data_source (&ds);
+      printf ("Can't open CCS =daikanwa\n");
+      chise_ds_close (ds);
       return -1;
     }
   
   /* get a character from the decoding-table */
-  char_id = chise_dt_get_char (dt_daikanwa, 364);
+  char_id = chise_ccs_decode (ccs_daikanwa, 364);
 
-  /* close the decoding-table */
-  chise_close_decoding_table (dt_daikanwa);
 
-
-  /*
-   * get a ideographic-structure feature of the character
-   */
-  
-  /* setup a feature-table */
-  status = chise_open_feature_table (&ft_ideographic_structure, &ds,
-                                    "ideographic-structure",
-                                    real_subtype, accessmask, modemask);
-  if (status)
-    {
-      chise_close_feature_table (ft_ideographic_structure);
-      chise_close_data_source (&ds);
-      return -1;
-    }
-  
   /* get a feature-value of the character */
-  status = chise_ft_get_value (ft_ideographic_structure, char_id, &value);
-
-  if (!status)
-    printf ("#x%X => %s\n", char_id, chise_value_to_c_string(&value));
+  ft_ideographic_structure
+    = chise_ds_get_feature (ds, "ideographic-structure",
+                           real_subtype, accessmask, modemask);
+  if (chise_char_gets_feature_value
+      (char_id, ft_ideographic_structure, buf, sizeof (buf)) != NULL)
+    printf ("#x%X => %s\n", char_id, buf);
   else
-    printf ("#x%X (%d)\n", char_id, status);
-
-  /* close the feature-table */
-  chise_close_feature_table (ft_ideographic_structure);
+    printf ("#x%X\n", char_id);
 
+  ft_ascii = chise_ds_get_feature (ds, "ascii",
+                                  real_subtype, accessmask, modemask);
+  chise_char_feature_value_iterate (ft_ascii, &test_map_func);
+  chise_char_feature_value_iterate (ft_ideographic_structure, &test_map_func);
 
   /* close the data-source */
-  chise_close_data_source (&ds);
+  chise_ds_close (ds);
 }