Changeset 71 for lang/elisp/pdicv-mode/trunk/pdicv-search.el

Timestamp:

01/30/09 23:52:02 (16 years ago)

Author:

naoya_t

Message:

 

Files:

• lang/elisp/pdicv-mode/trunk/pdicv-search.el (modified) (6 diffs)

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

@@ -1 +1 @@
 ;;; pdicv-search.el --- upper layer
 ;;
-;; Copyright (C) 2005 Naoya TOZUKA. All Rights Reserved.
-;;
-;; Author: Naoya TOZUKA <pdicviewer@gmail.com>
-;; Maintainer: Naoya TOZUKA <pdicviewer@gmail.com>
-;; Primary distribution site: http://pdicviewer.naochan.com/el/
+;; Copyright (C) 2005-2009 naoya_t. All Rights Reserved.
+;;
+;; Author: naoya_t <naoya.t@aqua.plala.or.jp>
+;; Maintainer: naoya_t <naoya.t@aqua.plala.or.jp>
+;; Primary distribution site:
+;;   http://lambdarepos.svnrepository.com/svn/share/lang/elisp/pdicv-mode/trunk
 ;;
 ;; Created: 06 Feb 2005
 ;; Last modified: 23 Dec 2005
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Keywords: read-from-file
 
@@ -73 +74 @@
   ""
 ;  (pdicv-search dicname nil regexp-to-search t field-to-search)
-  (pdicv-search dicname regexp-to-search nil t field-to-search)
-  )
+  (pdicv-search dicname regexp-to-search nil t field-to-search))
 
 (defun pdicv-search-just (dicname word-to-search &optional field-to-search)
   ""
-  (pdicv-search dicname word-to-search t nil field-to-search)
-  )
+  (pdicv-search dicname word-to-search t nil field-to-search))
 
 (defun pdicv-search (dicname word-to-search &optional just-p regexp-p field-to-search)
@@ -89 +88 @@
   (catch 'pdicv-search
     (let ((candidates
-           (if just-p (cons (downcase word-to-search) (nt:english-guess-original-form word-to-search))))
+           (if just-p (cons (downcase word-to-search) (nt:english-guess-original-form word-to-search))
+                         (list word-to-search)
+                         ))
           (candidate word-to-search)
           (first-round-p t)
           (dicinfo (assoc dicname pdicv-dictionary-list)))
-
+          ;;(debug candidates);(nt:english-guess-original-form word-to-search))
       (if (null dicinfo) (throw 'pdicv-search 'dictionary-not-found))
 
@@ -106 +107 @@
               (while dicname-list
                 (pdicv-search (car dicname-list) candidate just-p regexp-p field-to-search)
-                (setq dicname-list (cdr dicname-list))
-                )
-              )
-                                        ;else...
+                (setq dicname-list (cdr dicname-list))))
+                  ;;else...
           (let* ((encoding-list (nth 2 dicinfo))
                  (word-encoding (if (listp encoding-list) (car encoding-list) encoding-list))
@@ -154 +153 @@
                  );let*
                                         ;         (insert (format "%s" criteria))
-
             (pdicv-core-search dicinfo criteria simple-mode-p (not first-round-p)) ; clear only at the first time
             );let*
@@ -163 +161 @@
     );caught
   )
+ ;;debug
 
 (defun pdicv-search-interactive ()