Changeset 21 for Search-Namazu

Timestamp:

12/08/99 16:34:19 (12 years ago)

Author:

knok

Message:

Adapted to new library symbols (like NmzResult?, set_sortmethod... et al.)

Location:

Search-Namazu/trunk

Files:

• ChangeLog (modified) (1 diff)
• Namazu.pm (modified) (2 diffs)
• Namazu.xs (modified) (4 diffs)

Search-Namazu/trunk/ChangeLog

@@ +1 @@
+1999-12-08  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+        * Namazu.xs: Adapted to new library symbols (like NmzResult,
+        set_sortmethod... et al.)
+
 1999-11-17  NOKUBI Takatsugu  <knok@daionet.gr.jp>
 

Search-Namazu/trunk/Namazu.pm

@@ -36 +36 @@
                                 query => 'foo');
 
+  foreach my $hlist (@hlists) {
+      print ($self->score, $self->uri, $self->date, $self->rank);
+  }
+
 =head1 DESCRIPTION
 
@@ -74 +78 @@
 # %EXPORT_TAGS = (all => [qw()]);
 
-$VERSION = '0.01';
+$VERSION = '0.02';
 
 bootstrap Search::Namazu $VERSION;

Search-Namazu/trunk/Namazu.xs

@@ -61 +61 @@
                 int i;
                 AV *retar;
-                HLIST hlist;
+                NmzResult hlist;
                 char result[BUFSIZE];
 
@@ -72 +72 @@
                 codeconv_query(cqstr);
                 retar = newAV();
-                hlist = search_main(cqstr);
-                for (i = 0; i < hlist.n; i ++) {
+                hlist = nmz_search(cqstr);
+                for (i = 0; i < hlist.num; i ++) {
                         SV *ohlist = perl_eval_pv("new Search::Namazu::HList", TRUE);
                         SV *tmp;
-                        get_field_data(hlist.d[i].idxid, hlist.d[i].docid, "uri", result);
+                        get_field_data(hlist.data[i].idxid, hlist.data[i].docid, "uri", result);
                         PUSHMARK(SP);
                         XPUSHs(ohlist);
-                        XPUSHs(sv_2mortal(newSViv(hlist.d[i].score)));
+                        XPUSHs(sv_2mortal(newSViv(hlist.data[i].score)));
                         XPUSHs(sv_2mortal(newSVpv(result, strlen(result))));
-                        XPUSHs(sv_2mortal(newSViv(hlist.d[i].date)));
-                        XPUSHs(sv_2mortal(newSViv(hlist.d[i].rank)));
+                        XPUSHs(sv_2mortal(newSViv(hlist.data[i].date)));
+                        XPUSHs(sv_2mortal(newSViv(hlist.data[i].rank)));
                         PUTBACK;
                         perl_call_method("set", G_DISCARD);
@@ -93 +93 @@
                 }
                 free_hlist(hlist);
-                EXTEND(SP, hlist.n);
-                for (i = 0; i < hlist.n; i ++) {
+                EXTEND(SP, hlist.num);
+                for (i = 0; i < hlist.num; i ++) {
                         XPUSHs(av_pop(retar));
                 }
@@ -118 +118 @@
 nmz_sortbydate()
         CODE:
-                set_sortbydate();
+                set_sortmethod(SORT_BY_SCORE);
 
 void
 nmz_sortbyscore()
         CODE:
-                set_sortbyscore();
+                set_sortmethod(SORT_BY_DATE);
 
 void
 nmz_sortbyfield()
         CODE:
-                set_sortbyfield();
+                set_sortmethod(SORT_BY_FIELD);
 
 void
 nmz_descendingsort()
         CODE:
-                set_sort_descending();
+                set_sortorder(ASCENDING);
 
 void
 nmz_ascendingsort()
         CODE:
-                set_sort_ascending();
+                set_sortorder(DESCENDING);
 
 int