Changeset 254 for Search-Namazu

Timestamp:

04/05/06 10:37:51 (6 years ago)

Author:

knok

Message:

Fixed search status info.

Location:

Search-Namazu/trunk/Search-Namazu

Files:

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

Search-Namazu/trunk/Search-Namazu/ChangeLog

@@ +1 @@
+2006-04-05  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+        * Namazu.xs: Fixed search status info.
+
 2006-04-03  NOKUBI Takatsugu  <knok@daionet.gr.jp>
 

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

@@ -66 +66 @@
 #define IDXID "//idxid"
 #define IDXID_LEN strlen(IDXID)
-
+        
 static int status = 0;
+
+void set_status(void)
+{
+        int idxid;
+        status = SUCCESS;
+        for (idxid = 0; idxid < nmz_get_idxnum(); idxid ++) {
+            struct nmz_hitnumlist *hnlist = nmz_get_idx_hitnumlist(idxid);
+            while (hnlist != NULL) {
+                  if (hnlist->stat != SUCCESS)
+                     status = hnlist->stat;
+                  hnlist = hnlist->next;
+            }
+        }
+}
 
 AV * call_search_main_c(char *query, int maxget)
@@ -75 +89 @@
         char result[SEARCH_NAMAZU_FIELDS][BUFSIZE];
         int i;
-        status = 0;
         retar = newAV();
         hlist = nmz_search(query);
         av_extend(retar, hlist.num - 1);
-        status = hlist.stat;
+        set_status();
         for (i = 0; i < hlist.num; i ++) {
             if (i < maxget) {
@@ -129 +142 @@
         if (flen < 0 || maxget <= 0 || query == NULL)
                 return retar;
-        status = 0;
         fstr = (char **) malloc(sizeof(char *) * (flen + 1));
         fsize = (int *) malloc(sizeof(int) * (flen + 1));
@@ -140 +152 @@
         hlist = nmz_search(query);
         av_extend(retar, hlist.num - 1);
-        status = hlist.stat;
+        set_status();
         stash = gv_stashpv("Search::Namazu::ResultXS", 0);
         for (i = 0; i < hlist.num; i ++) {