Changeset 308 for trunk/gsdl/src

Timestamp:

1999-06-28T20:56:29+12:00 (25 years ago)

Author:

rjmcnab

Message:

A bit of hacking to remove the restriction that the index to get
a document must be a level 2 index. Now both level 2 and level 3
indexes can be used to get the text of a document.

File:

• trunk/gsdl/src/colservr/mgq.c (modified) (8 diffs)

trunk/gsdl/src/colservr/mgq.c

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/06/28 08:56:29  rjmcnab
+   A bit of hacking to remove the restriction that the index to get
+   a document must be a level 2 index. Now both level 2 and level 3
+   indexes can be used to get the text of a document.
+
    Revision 1.3  1999/01/19 01:38:16  rjmcnab
+
    Made the source more portable.
 
@@ -120 +126 @@
   return 0;
 }
+
+static int GetParaNumFromDocNum(query_data *qd, int docnum) {
+  int Documents = qd->td->cth.num_of_docs;
+  int *Paragraph = qd->paragraph;
+
+  if (docnum > 0 && docnum <= Documents)
+    return Paragraph[docnum-1]+1;
+  return 0;
+}
 #endif
 
@@ -133 +148 @@
 static int ProcessDocs (query_data * qd, int skip, int howmany, 
             enum result_kinds kind, 
-            int (*sender)(char *,int,int,float,void *), void *ptr)
-{
+            int (*sender)(char *,int,int,float,void *), void *ptr) {
   int max_buf = 0, output_failure = 0;
   int DocCount = 0;
   int need_text = (kind == result_docs);
-  
-  for (;;) {
-    if (skip <= 0) break;
+
+  /* skip the requested number of documents */
+  while (skip > 0) {
+    if (!NextDoc(qd)) return 0;
     skip--;
-    if (!NextDoc(qd)) return 0;
-  }
-  
-  if (need_text)
-    {
-      max_buf = atoi (GetDefEnv ("buffer", "1048576"));
-    }
-  
-  do
-    {
-      u_char *UDoc = NULL;
-      unsigned long ULen=0;
+  }
+
+  /* find out the maximum size for the text buffer */
+  if (need_text) max_buf = atoi (GetDefEnv ("buffer", "1048576"));
+
+  /* process each document */
+  do {
+    u_char *UDoc = NULL;
+    unsigned long ULen=0;
+
+#if defined(PARADOCNUM) ||  defined(NZDL)
+    /* adjust the document number for paragraph level result_docs */
+    /* this is a bit of a hack ... */
+    if (kind==result_docs && qd->id->ifh.InvfLevel == 3 &&
+    qd->DL != NULL && (int)qd->doc_pos < (int)qd->DL->num)
+      qd->DL->DE[qd->doc_pos].DocNum = GetParaNumFromDocNum(qd, qd->DL->DE[qd->doc_pos].DocNum);
+#endif
+    
+    if (need_text) {
+      /* load the compressed text */
+      if (LoadCompressedText (qd, max_buf))
+    MGQError("Unable to load compressed text(memory?).");
+
+      /* uncompress the loaded text */
+      UDoc = GetDocText (qd, &ULen);
+      if (UDoc == NULL) MGQError("UDoc is unexpectedly NULL");
+    }
       
-      if (need_text)
-    {
-      /* load the compressed text */
-      if (LoadCompressedText (qd, max_buf))
-        {
-          MGQError("Unable to load compressed text(memory?).");
-        }
-      /* uncompress the loaded text */
-      UDoc = GetDocText (qd, &ULen);
-      if (UDoc == NULL)
-        MGQError("UDoc is unexpectedly NULL");
-    }
+    if (UDoc != NULL  ||  kind == result_docnums) {
+      int docnum = GetDocNum(qd);
+#if defined(PARADOCNUM) ||  defined(NZDL)
+      if (qd->id->ifh.InvfLevel == 3) docnum = GetDocNumFromParaNum(qd, docnum);
+#endif
+      switch (kind) {
+      case result_docnums:
+    if (sender != NULL)
+      output_failure = (*sender)("",0,docnum,GetDocWeight(qd),ptr);
+    break;
+      case result_docs:
+    if (sender != NULL)
+      output_failure = (*sender)((char *)UDoc,ULen,docnum,GetDocWeight(qd),ptr);
+    break;
+      default:
+    break;
+      }
+    }
+    DocCount++;
       
-      if (UDoc != NULL  ||  kind == result_docnums)
-    {
-      int docnum = GetDocNum(qd);
-#if defined(PARADOCNUM) ||  defined(NZDL)
-      if (qd->id->ifh.InvfLevel == 3) docnum = GetDocNumFromParaNum(qd, docnum);
-#endif
-      switch (kind)
-        {
-        case result_docnums:
-          if (sender != NULL)
-        output_failure = (*sender)("",0,docnum,GetDocWeight(qd),ptr);
-          break;
-        case result_docs:
-          if (sender != NULL)
-        output_failure = (*sender)((char *)UDoc,ULen,docnum,GetDocWeight(qd),ptr);
-          break;
-        default:
-          break;
-        }
-    }
-      DocCount++;
-      
-    }
-  while (NextDoc (qd) && output_failure == 0 && --howmany > 0);
-  
-  if (need_text)
-    {
-      FreeTextBuffer (qd);
-    }
+  } while (NextDoc (qd) && output_failure == 0 && --howmany > 0);
+  
+  if (need_text) FreeTextBuffer (qd);
   
   return (DocCount);
@@ -311 +322 @@
 }
 
-/* search_doc_collect will search for an index which */
-/* belongs to a certain collection and which has a document */
-/* level index. It returns -1 if none could be found. */
+/* search_collect will search for an index which */
+/* belongs to a certain collection It returns -1 if none could be found. */
 /* init_dbcache should be called before this function */
-static int search_doc_collect (char *collection) {
+static int search_collect (char *collection) {
   int i = 0;
 
@@ -321 +331 @@
     if ((dbcache[i].accessnum >= 0) &&
     (dbcache[i].qd != NULL) &&
-    (strcmp (collection, dbcache[i].collection) == 0) &&
-    (dbcache[i].qd->id->ifh.InvfLevel == 2)) {
+    (strcmp (collection, dbcache[i].collection) == 0)
+    /* && (dbcache[i].qd->id->ifh.InvfLevel == 2)*/
+    ) {
       dbcache[i].accessnum = get_next_accessnum ();
       return i;
@@ -331 +342 @@
 }
 
-/* search_doc_collect will search for an index which */
+/* search_gensuffix will search for an index which */
 /* has a certain gensuffix. It returns -1 if none could be found. */
 /* init_dbcache should be called before this function */
@@ -608 +619 @@
 }
 
-/* load_text_database tries to make a level 2 index of the */
+/* load_text_database tries to make an index of the */
 /* specified collection current */
 int load_text_database (char *collection) {
@@ -615 +626 @@
 
   /* search for the index */
-  i = search_doc_collect (collection);
+  i = search_collect (collection);
 
   /* return if none were found */