Changeset 244

Timestamp:

03/28/06 13:48:18 (6 years ago)

Author:

knok

Message:

Added maxget parameter.

Location:

Search-Namazu/trunk/Search-Namazu

Files:

• ChangeLog (modified) (1 diff)
• Namazu.pm (modified) (5 diffs)
• Namazu.xs (modified) (8 diffs)

Search-Namazu/trunk/Search-Namazu/ChangeLog

@@ +1 @@
+2006-03-28  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+        * Namazu.{xs,pm}: Added maxget parameter.
+
 2006-03-27  NOKUBI Takatsugu  <knok@daionet.gr.jp>
 

Search-Namazu/trunk/Search-Namazu/Namazu.pm

@@ -131 +131 @@
 Speciry maximum numbers of hits. Same as MaxHit directive in namazurc.
 
-=head4 returnas
+=head3 maxget
+
+Speciry result object numbers of hits to limit too many results.
+If the parameter was omitted, it is assumed same value as maxhit.
+
+=head3 returnas
 
 Specify return method, if the parameter is set as 'reference', it
@@ -234 +239 @@
     my $lang = $args{'lang'};
     my $query = $args{'query'};
-    my $maxhit = $args{'maxhit'};
+    my $maxhit = $args{'maxhit'} || 10000;
     my $returnas = $args{'returnas'};
+    my $maxget = $args{'maxget'} || $maxhit;
 
 # initialize
@@ -283 +289 @@
         nmz_setlang($lang);
     }
-    nmz_setmaxhit($maxhit) if defined $maxhit;
+    nmz_setmaxhit($maxhit);
 
 # query and get hlist
@@ -294 +300 @@
 
     if ($returnas eq 'reference') {
-        my $hlistref = call_search_main_ref($query);
+        my $hlistref = call_search_main_ref($query, $maxget);
         my $status = nmz_getstatus();
         if ($status != NMZ_SUCCESS) {
@@ -302 +308 @@
         return $hlistref;
     } else {
-        my @hlists = call_search_main($query);
+        my @hlists = call_search_main($query, $maxget);
         my $status = nmz_getstatus();
         if ($status != NMZ_SUCCESS) {

Search-Namazu/trunk/Search-Namazu/Namazu.xs

@@ -59 +59 @@
 static int status = 0;
 
-AV * call_search_main_c(char *query)
+AV * call_search_main_c(char *query, int maxget)
 {
         AV *retar;
@@ -67 +67 @@
         status = 0;
         retar = newAV();
+        av_extend(retar, hlist.num - 1);
         hlist = nmz_search(query);
         status = hlist.stat;
         for (i = 0; i < hlist.num; i ++) {
+            if (i < maxget) {
                 SV *ohlist = perl_eval_pv("new Search::Namazu::Result", TRUE);
                 dSP;
@@ -92 +94 @@
                 perl_call_method("set", G_DISCARD);
                 SvREFCNT_inc(ohlist);
-                av_push(retar, ohlist);
+                av_store(retar, i, ohlist);
                 FREETMPS;
                 LEAVE;
+            } else {
+                av_store(retar, i, &PL_sv_undef);
+            }      
         }
         nmz_free_hlist(hlist);
@@ -105 +110 @@
 
 void
-call_search_main(query)
+call_search_main(query, maxget)
         SV *query
+        int maxget
 
         PPCODE:
@@ -117 +123 @@
                 nmz_codeconv_query(qstr);
                 strcpy(cqstr, qstr);
-                retar = call_search_main_c(cqstr);
+                retar = call_search_main_c(cqstr, maxget);
 #if ! defined(PERL_VERSION)
                 { /* workaround for only one result */
@@ -130 +136 @@
 
 SV*
-call_search_main_ref(query)
+call_search_main_ref(query, maxget)
         SV *query
+        int maxget
 
         CODE:
@@ -142 +149 @@
                 nmz_codeconv_query(qstr);
                 strcpy(cqstr, qstr);
-                retar = call_search_main_c(cqstr);
+                retar = call_search_main_c(cqstr, maxget);
                 nmz_free_internal();
                 RETVAL = newRV_inc((SV*) retar);
@@ -203 +210 @@
 void
 nmz_setmaxhit(max)
-        int max;
+        int max
 
         CODE: