Changeset 74 for lang/elisp/pdicv-mode/trunk/pdicv-core.el

Timestamp:

01/31/09 00:20:29 (16 years ago)

Author:

naoya_t

Message:

modified around entry word tabsep

Files:

• lang/elisp/pdicv-mode/trunk/pdicv-core.el (modified) (4 diffs)

lang/elisp/pdicv-mode/trunk/pdicv-core.el

@@ -215 +215 @@
 
          (32bit-address-mode (if (= (-> header 'index-blkbit) 32) t nil))
-                 (tab-sep-p (if (eq 'unicode-bocu-6 (-> header 'version)) t nil))
+                 (tab-sep-p (eq 'unicode-bocu-6 (-> header 'version)))
 
          (ix 0) (ix-max (-> header 'nindex))
@@ -297 +297 @@
     (let* ((result ()) ;(match-count 0)
            (header (pdicv-get-header-info filename))
+                   (tab-sep-p (eq 'unicode-bocu-6 (-> header 'version)))
                    (block-size (-> header 'block-size))
            (offset (+ (-> header 'datablock-begins-at) (* phys block-size)))
@@ -340 +341 @@
                         (concat (substring eword 0 compress-length) eword-compressed) ))
           (setq q (1+ eword-len))
-                                        ; �������������
+                  ;; �������������
           (when (not aligned)
                         (setq eword-attrib (nt:read-uchar rest q))
@@ -384 +385 @@
             ) ; if extended
 
-                                        ;         (insert (format "- %s\n" eword))
-          (when (funcall criteria-func eword pron jword example)
-                        (push (list eword pron jword example) result))
+                  (if tab-sep-p
+                          (let* ((splitted (split-string eword "\t"))
+                                         (eword (car splitted))
+                                         (entry (cadr splitted)))
+                                (when (funcall criteria-func entry eword pron jword example)
+                                  (push (list entry pron jword example) result)))
+                        (when (funcall criteria-func eword eword pron jword example)
+                          (push (list eword pron jword example) result)))
+                  ;;(when (funcall criteria-func eword pron jword example)
+                  ;;    (push (list eword pron jword example) result))
           );let
         ); wend