X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-p.h;h=2763d5675d16412f8d8b68f6103594fe95ff54c4;hb=74682526ffcdc625f5d8e7adec296b0d6d23a8b5;hp=6a95040b03999205049d600c9fd2bb33f2c4a756;hpb=b7ac19e96f5e53975064b3dec2be6cbd2c1eccb8;p=yaz-moved-to-github.git

diff --git a/src/zoom-p.h b/src/zoom-p.h
index 6a95040..2763d56 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -33,7 +33,6 @@
 #include <yaz/comstack.h>
 #include <yaz/wrbuf.h>
 #include <yaz/zoom.h>
-#include <yaz/sortspec.h>
 #include <yaz/srw.h>
 #include <yaz/mutex.h>
 
@@ -42,14 +41,6 @@
 
 typedef struct ZOOM_Event_p *ZOOM_Event;
 
-struct ZOOM_query_p {
-    Z_Query *z_query;
-    Z_SortKeySpecList *sort_spec;
-    int refcount;
-    ODR odr;
-    char *query_string;
-};
-
 typedef enum {
     zoom_sru_error,
     zoom_sru_soap,
@@ -177,23 +168,6 @@ struct ZOOM_resultset_p {
     char **facets_names;
 };
 
-struct ZOOM_record_p {
-    ODR odr;
-#if SHPTR
-    struct WRBUF_shptr *record_wrbuf;
-#else
-    WRBUF wrbuf;
-#endif
-
-    Z_NamePlusRecord *npr;
-    const char *schema;
-
-    const char *diag_uri;
-    const char *diag_message;
-    const char *diag_details;
-    const char *diag_set;
-};
-
 struct facet_term_p {
     char *term;
     int frequency;
@@ -205,16 +179,6 @@ struct ZOOM_facet_field_p {
     struct facet_term_p *facet_terms;
 };
 
-
-struct ZOOM_record_cache_p {
-    struct ZOOM_record_p rec;
-    char *elementSetName;
-    char *syntax;
-    char *schema;
-    int pos;
-    ZOOM_record_cache next;
-};
-
 struct ZOOM_scanset_p {
     int refcount;
     ODR odr;
@@ -320,6 +284,14 @@ void ZOOM_record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
                            const char *schema,
                            Z_SRW_diagnostic *diag);
 
+Z_Query *ZOOM_query_get_Z_Query(ZOOM_query s);
+Z_SortKeySpecList *ZOOM_query_get_sortspec(ZOOM_query s);
+char *ZOOM_query_get_query_string(ZOOM_query s);
+
+const char *ZOOM_npr_format(Z_NamePlusRecord *npr, const char *schema,
+                            WRBUF wrbuf,
+                            const char *type_spec, int *len);
+int ZOOM_uri_to_code(const char *uri);
 
 /*
  * Local variables: