Towards 1.3.15

[idzebra-moved-to-github.git] / perl / IDZebra.i

diff --git a/perl/IDZebra.i b/perl/IDZebra.i
index 6a9c75d..8cd8382 100644 (file)
--- a/perl/IDZebra.i
+++ b/perl/IDZebra.i
@@ -149,10 +149,21 @@ void DESTROY (void);
 
 /* == Logging facilities (yaz/log.h) ======================================= */
 
-void logLevel (int level);
-void logFile (const char *fname);
+%name(logLevel) 
+void yaz_log_init_level (int level);
+
+%name(logFile)
+void yaz_log_init_file (const char *fname);
+
+%name(logMsg)
 void logMsg  (int level, const char *message);
 
+%name(logPrefix)   
+void yaz_log_init_prefix (const char *prefix);
+
+%name(logPrefix2)   
+void yaz_log_init_prefix2 (const char *prefix);
+
 #define LOG_FATAL  0x0001
 #define LOG_DEBUG  0x0002
 #define LOG_WARN   0x0004
@@ -278,11 +289,12 @@ void zebra_repository_show (ZebraHandle zh);
    If not, and match_criteria is provided, then sysno is guessed
    If not, and a record is provided, then sysno is got from there */
 
+%apply int *REFERENCE { int *sysno };
 %name(insert_record)       
 int zebra_insert_record (ZebraHandle zh, 
                         recordGroup *rGroup, 
                         const char *recordType,
-                        int sysno, 
+                        int *sysno, 
                         const char *match, 
                         const char *fname,
                         const char *buf, 
@@ -293,7 +305,7 @@ int zebra_insert_record (ZebraHandle zh,
 int zebra_update_record (ZebraHandle zh, 
                         recordGroup *rGroup, 
                         const char *recordType,
-                        int sysno, 
+                        int *sysno, 
                         const char *match, 
                         const char *fname,
                         const char *buf, 
@@ -304,7 +316,7 @@ int zebra_update_record (ZebraHandle zh,
 int zebra_delete_record (ZebraHandle zh, 
                         recordGroup *rGroup, 
                         const char *recordType,
-                        int sysno, 
+                        int *sysno, 
                         const char *match, 
                         const char *fname,
                         const char *buf, 
@@ -312,14 +324,14 @@ int zebra_delete_record (ZebraHandle zh,
                         int force_update);
 
 
-/* == Search (zebra_api_ext.c) ============================================= */
-
+/* == Search (zebraapi.c) ================================================== */
+%include "typemaps.i"
+%apply int *REFERENCE { int *hits };
 %name(search_PQF) 
 int zebra_search_PQF (ZebraHandle zh, 
-                     ODR odr_input, ODR odr_output, 
                      const char *pqf_query,
-                     const char *setname);
-
+                     const char *setname,
+                     int *hits);
 
 /* == YAZ - query tools ==================================================== */
 
@@ -361,8 +373,15 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
                          int *statuses);
 
 
+/* Resultset terms */
+%name(resultSetTerms)
+int zebra_resultSetTerms (ZebraHandle zh, const char *setname, 
+                          int no, int *REFERENCE, 
+                          int *REFERENCE, char *out, int *REFERENCE);
+
 /* == Sort ================================================================= */
-int sort (ZebraHandle zh, 
+%name(sort)
+int zebra_sort_by_specstr (ZebraHandle zh, 
          ODR stream,
          const char *sort_spec,
          const char *output_setname,
@@ -378,6 +397,10 @@ void zebra_scan_PQF (ZebraHandle zh,
 
 scanEntry *getScanEntry(ScanObj *so, int pos);
 
+%typemap(in) int * (int dvalue);
+%typemap(argout) int *;
+
+
 /* Admin functionality */
 /*
 %name(admin_start)         void zebra_admin_start (ZebraHandle zh);