[Erbot-cvs] erbot erbc.el ChangeLog

[D. Goel]

CVSROOT:        /cvsroot/erbot
Module name:    erbot
Changes by:     D. Goel <deego> 06/09/28 16:22:28

Modified files:
        .              : erbc.el ChangeLog 

Log message:
        better default search

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/erbc.el?cvsroot=erbot&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/erbot/ChangeLog?cvsroot=erbot&r1=1.61&r2=1.62

Patches:
Index: erbc.el
===================================================================
RCS file: /cvsroot/erbot/erbot/erbc.el,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- erbc.el     9 May 2006 18:18:04 -0000       1.126
+++ erbc.el     28 Sep 2006 16:22:28 -0000      1.127
@@ -1,5 +1,5 @@
 ;;; erbc.el --- Erbot user-interface commands -- see also erbc5.el
-;; Time-stamp: <2006-05-08 00:14:08 deego>
+;; Time-stamp: <2006-09-28 12:17:42 deego>
 ;; Copyright (C) 2002 D. Goel
 ;; Emacs Lisp Archive entry
 ;; Filename: erbc.el
@@ -1145,7 +1145,13 @@
        )
     (cond
      ((<= len 1)
-      (fs-describe (first msg) nil nil nil origmsg))
+      (if (fsi-notes (first msg))
+         (fs-describe 
+          (first msg)
+          nil nil nil origmsg)
+      (fs-describe 
+       (fsi-generalize-search-term (first msg))
+       nil nil nil origmsg)))
      (t
       (setq mainterm (first msg))
       (setq firstterm mainterm)
@@ -1184,9 +1190,13 @@
           mainterm (first remainder) (second remainder)
           "Try: " origmsg)
        (fs-describe
-        firstterm (first remainder) (second remainder)
+        (fsi-generalize-search-term firstterm) (first remainder) (second 
remainder)
         (third remainder) origmsg))))))
 
+
+(defun fsi-generalize-search-term (term)
+  (erbutils-replace-string-in-string "-" "[ -]*" term))
+
 ;; (defalias 'fs-hello 'fs-hi)
 ;; (defalias 'fs-hey 'fs-hi)
 
@@ -3669,7 +3679,7 @@
 
 
 (defun fsi-notes (name)
-  "Internal. Return the notes as a list. "
+  "Internal. Return the notes as a list.  Else nil"
   (sit-for 0)
   (let ((exnotes (erbbdb-get-exact-notes name)))
     (and (stringp exnotes) (erbn-read exnotes))))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/erbot/erbot/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- ChangeLog   21 Aug 2006 04:48:28 -0000      1.61
+++ ChangeLog   28 Sep 2006 16:22:28 -0000      1.62
@@ -1,3 +1,8 @@
+2006-09-28  D Goel  <address@hidden>
+
+       * erbc.el (fsi-describe-from-english): smarter self search
+       (fsi-generalize-search-term): new, for above.
+
 2006-08-21  Michael Olson  <address@hidden>
 
        * erbot.el (erbot-install): Remove check for erc-backend-version,