X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fretrieve.c;h=cf0787c01614d05936c92a4973a255bd26620960;hb=47ea1fc957c7b97bb30a26698f072109cae275e4;hp=2eb556ab05bd8b5858853b95934ec71750cde87a;hpb=c41c84a497ae744aa825a90f144c85b54f1cd4bb;p=idzebra-moved-to-github.git

diff --git a/index/retrieve.c b/index/retrieve.c
index 2eb556a..cf0787c 100644
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.13  2000-03-20 19:08:36  adam
+ * Revision 1.19  2002-07-25 13:06:43  adam
+ * Character set negotiation updates
+ *
+ * Revision 1.18  2002/07/02 20:20:09  adam
+ * idzebra:{filename,score,size,localnumber} tags for XML
+ *
+ * Revision 1.17  2002/05/03 13:49:04  adam
+ * play with shellsort
+ *
+ * Revision 1.16  2002/04/04 20:50:37  adam
+ * Multi register works with record paths and data1 profile path
+ *
+ * Revision 1.15  2002/04/04 14:14:13  adam
+ * Multiple registers (alpha early)
+ *
+ * Revision 1.14  2001/01/22 11:41:41  adam
+ * Added support for raw retrieval (element set name "R").
+ *
+ * Revision 1.13  2000/03/20 19:08:36  adam
  * Added remote record import using Z39.50 extended services and Segment
  * Requests.
  *
@@ -58,16 +76,8 @@
 #include <unistd.h>
 #endif
 
-#include <recctrl.h>
-#include "zserver.h"
-
-#ifndef ZEBRASDR
-#define ZEBRASDR 0
-#endif
-
-#if ZEBRASDR
-#include "zebrasdr.h"
-#endif
+#include "index.h"
+#include <direntz.h>
 
 int zebra_record_ext_read (void *fh, char *buf, size_t count)
 {
@@ -131,14 +141,14 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     RecordAttr *recordAttr;
     void *clientData;
 
-    rec = rec_get (zh->service->records, sysno);
+    rec = rec_get (zh->reg->records, sysno);
     if (!rec)
     {
         logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
 	*basenamep = 0;
         return 14;
     }
-    recordAttr = rec_init_attr (zh->service->zei, rec);
+    recordAttr = rec_init_attr (zh->reg->zei, rec);
 
     file_type = rec->info[recInfo_fileType];
     fname = rec->info[recInfo_filename];
@@ -146,7 +156,13 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     *basenamep = (char *) odr_malloc (stream, strlen(basename)+1);
     strcpy (*basenamep, basename);
 
-    if (!(rt = recType_byName (zh->service->recTypes,
+    if (comp && comp->which == Z_RecordComp_simple &&
+        comp->u.simple->which == Z_ElementSetNames_generic)
+    {
+        if (!strcmp (comp->u.simple->u.generic, "R"))
+            file_type = "text";
+    }
+    if (!(rt = recType_byName (zh->reg->recTypes,
 			       file_type, subType, &clientData)))
     {
         logf (LOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
@@ -155,6 +171,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
     retrieveCtrl.fh = &fc;
     fc.fd = -1;
+    retrieveCtrl.fname = fname;
     if (rec->size[recInfo_storeData] > 0)
     {
         retrieveCtrl.readf = zebra_record_int_read;
@@ -167,10 +184,22 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     }
     else
     {
-        if ((fc.fd = open (fname, O_BINARY|O_RDONLY)) == -1)
+        char full_rep[1024];
+
+        if (zh->path_reg && !yaz_is_abspath (fname))
+        {
+            strcpy (full_rep, zh->path_reg);
+            strcat (full_rep, "/");
+            strcat (full_rep, fname);
+        }
+        else
+            strcpy (full_rep, fname);
+        
+
+        if ((fc.fd = open (full_rep, O_BINARY|O_RDONLY)) == -1)
         {
             logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
-		  fname);
+		  full_rep);
             rec_rm (&rec);
             return 14;
         }
@@ -189,9 +218,13 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.odr = stream;
     retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
     retrieveCtrl.comp = comp;
+    retrieveCtrl.encoding = zh->record_encoding;
     retrieveCtrl.diagnostic = 0;
-    retrieveCtrl.dh = zh->service->dh;
-    retrieveCtrl.res = zh->service->res;
+    retrieveCtrl.dh = zh->reg->dh;
+    retrieveCtrl.res = zh->res;
+    retrieveCtrl.rec_buf = 0;
+    retrieveCtrl.rec_len = -1;
+    
     (*rt->retrieve)(clientData, &retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
     *rec_bufp = (char *) retrieveCtrl.rec_buf;