Changeset 26 for Search-Namazu

Timestamp:

01/24/00 14:35:23 (12 years ago)

Author:

knok

Message:

Search::Namazu new version.

Location:

Search-Namazu/trunk

Files:

• ChangeLog (modified) (1 diff)
• Namazu.pm (modified) (3 diffs)
• Namazu.xs (modified) (6 diffs)

Search-Namazu/trunk/ChangeLog

@@ +1 @@
+2000-01-24  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+        * Version 0.20.
+        * Namazu.{pm,xs}: Adapted to new library symbols (nmz_ prefix).
+
 1999-12-08  NOKUBI Takatsugu  <knok@daionet.gr.jp>
 

Search-Namazu/trunk/Namazu.pm

@@ -78 +78 @@
 # %EXPORT_TAGS = (all => [qw()]);
 
-$VERSION = '0.02';
+$VERSION = '0.10';
 
 bootstrap Search::Namazu $VERSION;
@@ -98 +98 @@
     my $sortmeth = $args{'sortMethod'};
     my $sortord = $args{'sortOrder'};
-    my $config = $args{'config'};
     my $lang = $args{'lang'};
     my $query = $args{'query'};
 
-# initialize libnamazu... (not implemented yet.)
-
-    if (defined $config) {
-        load_conf($config);
-    }
+# initialize
 
     if (! defined $index) {
@@ -171 +166 @@
 }
 
-package Search::Namazu::HList;
+package Search::Namazu::Result;
 
 sub new {

Search-Namazu/trunk/Namazu.xs

@@ -34 +34 @@
 #include "libnamazu.h"
 #include "codeconv.h"
-#include "conf.h"
 #include "field.h"
 #include "hlist.h"
@@ -64 +63 @@
                 char result[BUFSIZE];
 
-                uniq_idxnames();
-                expand_idxname_aliases();
-                complete_idxnames();
+                nmz_uniq_idxnames();
+                nmz_expand_idxname_aliases();
+                nmz_complete_idxnames();
 
                 qstr = SvPV(query, na);
                 strcpy(cqstr, qstr);
-                codeconv_query(cqstr);
+                nmz_codeconv_query(cqstr);
                 retar = newAV();
                 hlist = nmz_search(cqstr);
                 for (i = 0; i < hlist.num; i ++) {
-                        SV *ohlist = perl_eval_pv("new Search::Namazu::HList", TRUE);
+                        SV *ohlist = perl_eval_pv("new Search::Namazu::Result", TRUE);
                         SV *tmp;
-                        get_field_data(hlist.data[i].idxid, hlist.data[i].docid, "uri", result);
+                        nmz_get_field_data(hlist.data[i].idxid, hlist.data[i].docid, "uri", result);
                         PUSHMARK(SP);
                         XPUSHs(ohlist);
@@ -92 +91 @@
                         av_push(retar, ohlist);
                 }
-                free_hlist(hlist);
+                nmz_free_hlist(hlist);
                 EXTEND(SP, hlist.num);
                 for (i = 0; i < hlist.num; i ++) {
                         XPUSHs(av_pop(retar));
                 }
-                free_idxnames();
-                free_aliases();
-                free_replaces();
+                nmz_free_internal();
 
 int
@@ -110 +107 @@
         CODE:
                 tmp = SvPV(index, na);
-                RETVAL = add_index(tmp);
+                RETVAL = nmz_add_index(tmp);
 
         OUTPUT:
@@ -118 +115 @@
 nmz_sortbydate()
         CODE:
-                set_sortmethod(SORT_BY_SCORE);
+                nmz_set_sortmethod(SORT_BY_SCORE);
 
 void
 nmz_sortbyscore()
         CODE:
-                set_sortmethod(SORT_BY_DATE);
+                nmz_set_sortmethod(SORT_BY_DATE);
 
 void
 nmz_sortbyfield()
         CODE:
-                set_sortmethod(SORT_BY_FIELD);
+                nmz_set_sortmethod(SORT_BY_FIELD);
 
 void
 nmz_descendingsort()
         CODE:
-                set_sortorder(ASCENDING);
+                nmz_set_sortorder(ASCENDING);
 
 void
 nmz_ascendingsort()
         CODE:
-                set_sortorder(DESCENDING);
-
-int
-nmz_setconfig(conf)
-        SV *conf
-
-        PREINIT:
-                char *tmp;
-
-        CODE:
-                tmp = SvPV(conf, na);
-                RETVAL = load_conf(tmp);
-
-        OUTPUT:
-                RETVAL
+                nmz_set_sortorder(DESCENDING);
 
 int
@@ -163 +146 @@
         CODE:
                 tmp = SvPV(lang, na);
-                RETVAL = set_lang(tmp);
+                RETVAL = nmz_set_lang(tmp);
 
         OUTPUT: