summary refs log tree commit diff stats
path: root/lib/wrappers/sphinx.nim
diff options
context:
space:
mode:
Diffstat (limited to 'lib/wrappers/sphinx.nim')
-rw-r--r--lib/wrappers/sphinx.nim104
1 files changed, 53 insertions, 51 deletions
diff --git a/lib/wrappers/sphinx.nim b/lib/wrappers/sphinx.nim
index e4a282968..d9e98faa8 100644
--- a/lib/wrappers/sphinx.nim
+++ b/lib/wrappers/sphinx.nim
@@ -96,18 +96,18 @@ const
   SPH_GROUPBY_ATTRPAIR* = 5
 
 type
-  TSphinxBool* {.size: sizeof(cint).} = enum
+  SphinxBool* {.size: sizeof(cint).} = enum
     SPH_FALSE = 0,
     SPH_TRUE = 1
 
-  Tclient {.pure, final.} = object
-  PClient* = ptr TClient
-  Twordinfo*{.pure, final.} = object
+  Client {.pure, final.} = object
+  PClient* = ptr Client
+  Wordinfo*{.pure, final.} = object
     word*: cstring
     docs*: cint
     hits*: cint
 
-  Tresult*{.pure, final.} = object
+  Result*{.pure, final.} = object
     error*: cstring
     warning*: cstring
     status*: cint
@@ -122,9 +122,9 @@ type
     total_found*: cint
     time_msec*: cint
     num_words*: cint
-    words*: ptr array [0..100_000, TWordinfo]
+    words*: ptr array [0..100_000, Wordinfo]
 
-  Texcerpt_options*{.pure, final.} = object
+  Excerpt_options*{.pure, final.} = object
     before_match*: cstring
     after_match*: cstring
     chunk_separator*: cstring
@@ -135,24 +135,26 @@ type
     limit_words*: cint
     around*: cint
     start_passage_id*: cint
-    exact_phrase*: TSphinxBool
-    single_passage*: TSphinxBool
-    use_boundaries*: TSphinxBool
-    weight_order*: TSphinxBool
-    query_mode*: TSphinxBool
-    force_all_words*: TSphinxBool
-    load_files*: TSphinxBool
-    allow_empty*: TSphinxBool
-    emit_zones*: TSphinxBool
+    exact_phrase*: SphinxBool
+    single_passage*: SphinxBool
+    use_boundaries*: SphinxBool
+    weight_order*: SphinxBool
+    query_mode*: SphinxBool
+    force_all_words*: SphinxBool
+    load_files*: SphinxBool
+    allow_empty*: SphinxBool
+    emit_zones*: SphinxBool
 
-  Tkeyword_info*{.pure, final.} = object
+  Keyword_info*{.pure, final.} = object
     tokenized*: cstring
     normalized*: cstring
     num_docs*: cint
     num_hits*: cint
+{.deprecated: [TSphinxBool: SphinxBool,
+              Tclient: Client, Twordinfo: Wordinfo, Tresult: Result,
+              Texcerpt_options: Excerpt_options, Tkeyword_info: Keyword_info].}
 
-
-proc create*(copy_args: TSphinxBool): PClient{.cdecl, importc: "sphinx_create",
+proc create*(copy_args: SphinxBool): PClient{.cdecl, importc: "sphinx_create",
     dynlib: sphinxDll.}
 proc cleanup*(client: PClient){.cdecl, importc: "sphinx_cleanup",
                                     dynlib: sphinxDll.}
@@ -162,87 +164,87 @@ proc error*(client: PClient): cstring{.cdecl, importc: "sphinx_error",
     dynlib: sphinxDll.}
 proc warning*(client: PClient): cstring{.cdecl, importc: "sphinx_warning",
     dynlib: sphinxDll.}
-proc set_server*(client: PClient, host: cstring, port: cint): TSphinxBool{.cdecl,
+proc set_server*(client: PClient, host: cstring, port: cint): SphinxBool{.cdecl,
     importc: "sphinx_set_server", dynlib: sphinxDll.}
-proc set_connect_timeout*(client: PClient, seconds: float32): TSphinxBool{.cdecl,
+proc set_connect_timeout*(client: PClient, seconds: float32): SphinxBool{.cdecl,
     importc: "sphinx_set_connect_timeout", dynlib: sphinxDll.}
-proc open*(client: PClient): TSphinxBool{.cdecl, importc: "sphinx_open",
+proc open*(client: PClient): SphinxBool{.cdecl, importc: "sphinx_open",
                                         dynlib: sphinxDll.}
-proc close*(client: PClient): TSphinxBool{.cdecl, importc: "sphinx_close",
+proc close*(client: PClient): SphinxBool{.cdecl, importc: "sphinx_close",
     dynlib: sphinxDll.}
 proc set_limits*(client: PClient, offset: cint, limit: cint,
-                 max_matches: cint, cutoff: cint): TSphinxBool{.cdecl,
+                 max_matches: cint, cutoff: cint): SphinxBool{.cdecl,
     importc: "sphinx_set_limits", dynlib: sphinxDll.}
-proc set_max_query_time*(client: PClient, max_query_time: cint): TSphinxBool{.
+proc set_max_query_time*(client: PClient, max_query_time: cint): SphinxBool{.
     cdecl, importc: "sphinx_set_max_query_time", dynlib: sphinxDll.}
-proc set_match_mode*(client: PClient, mode: cint): TSphinxBool{.cdecl,
+proc set_match_mode*(client: PClient, mode: cint): SphinxBool{.cdecl,
     importc: "sphinx_set_match_mode", dynlib: sphinxDll.}
-proc set_ranking_mode*(client: PClient, ranker: cint): TSphinxBool{.cdecl,
+proc set_ranking_mode*(client: PClient, ranker: cint): SphinxBool{.cdecl,
     importc: "sphinx_set_ranking_mode", dynlib: sphinxDll.}
-proc set_sort_mode*(client: PClient, mode: cint, sortby: cstring): TSphinxBool{.
+proc set_sort_mode*(client: PClient, mode: cint, sortby: cstring): SphinxBool{.
     cdecl, importc: "sphinx_set_sort_mode", dynlib: sphinxDll.}
 proc set_field_weights*(client: PClient, num_weights: cint,
-                        field_names: cstringArray, field_weights: ptr cint): TSphinxBool{.
+                        field_names: cstringArray, field_weights: ptr cint): SphinxBool{.
     cdecl, importc: "sphinx_set_field_weights", dynlib: sphinxDll.}
 proc set_index_weights*(client: PClient, num_weights: cint,
-                        index_names: cstringArray, index_weights: ptr cint): TSphinxBool{.
+                        index_names: cstringArray, index_weights: ptr cint): SphinxBool{.
     cdecl, importc: "sphinx_set_index_weights", dynlib: sphinxDll.}
-proc set_id_range*(client: PClient, minid: int64, maxid: int64): TSphinxBool{.
+proc set_id_range*(client: PClient, minid: int64, maxid: int64): SphinxBool{.
     cdecl, importc: "sphinx_set_id_range", dynlib: sphinxDll.}
 proc add_filter*(client: PClient, attr: cstring, num_values: cint,
-                 values: ptr int64, exclude: TSphinxBool): TSphinxBool{.cdecl,
+                 values: ptr int64, exclude: SphinxBool): SphinxBool{.cdecl,
     importc: "sphinx_add_filter", dynlib: sphinxDll.}
 proc add_filter_range*(client: PClient, attr: cstring, umin: int64,
-                       umax: int64, exclude: TSphinxBool): TSphinxBool{.cdecl,
+                       umax: int64, exclude: SphinxBool): SphinxBool{.cdecl,
     importc: "sphinx_add_filter_range", dynlib: sphinxDll.}
 proc add_filter_float_range*(client: PClient, attr: cstring, fmin: float32,
-                             fmax: float32, exclude: TSphinxBool): TSphinxBool{.cdecl,
+                             fmax: float32, exclude: SphinxBool): SphinxBool{.cdecl,
     importc: "sphinx_add_filter_float_range", dynlib: sphinxDll.}
 proc set_geoanchor*(client: PClient, attr_latitude: cstring,
-                    attr_longitude: cstring, latitude: float32, longitude: float32): TSphinxBool{.
+                    attr_longitude: cstring, latitude: float32, longitude: float32): SphinxBool{.
     cdecl, importc: "sphinx_set_geoanchor", dynlib: sphinxDll.}
 proc set_groupby*(client: PClient, attr: cstring, groupby_func: cint,
-                  group_sort: cstring): TSphinxBool{.cdecl,
+                  group_sort: cstring): SphinxBool{.cdecl,
     importc: "sphinx_set_groupby", dynlib: sphinxDll.}
-proc set_groupby_distinct*(client: PClient, attr: cstring): TSphinxBool{.cdecl,
+proc set_groupby_distinct*(client: PClient, attr: cstring): SphinxBool{.cdecl,
     importc: "sphinx_set_groupby_distinct", dynlib: sphinxDll.}
-proc set_retries*(client: PClient, count: cint, delay: cint): TSphinxBool{.cdecl,
+proc set_retries*(client: PClient, count: cint, delay: cint): SphinxBool{.cdecl,
     importc: "sphinx_set_retries", dynlib: sphinxDll.}
 proc add_override*(client: PClient, attr: cstring, docids: ptr int64,
-                   num_values: cint, values: ptr cint): TSphinxBool{.cdecl,
+                   num_values: cint, values: ptr cint): SphinxBool{.cdecl,
     importc: "sphinx_add_override", dynlib: sphinxDll.}
-proc set_select*(client: PClient, select_list: cstring): TSphinxBool{.cdecl,
+proc set_select*(client: PClient, select_list: cstring): SphinxBool{.cdecl,
     importc: "sphinx_set_select", dynlib: sphinxDll.}
 proc reset_filters*(client: PClient){.cdecl,
     importc: "sphinx_reset_filters", dynlib: sphinxDll.}
 proc reset_groupby*(client: PClient){.cdecl,
     importc: "sphinx_reset_groupby", dynlib: sphinxDll.}
 proc query*(client: PClient, query: cstring, index_list: cstring,
-            comment: cstring): ptr Tresult{.cdecl, importc: "sphinx_query",
+            comment: cstring): ptr Result{.cdecl, importc: "sphinx_query",
     dynlib: sphinxDll.}
 proc add_query*(client: PClient, query: cstring, index_list: cstring,
                 comment: cstring): cint{.cdecl, importc: "sphinx_add_query",
     dynlib: sphinxDll.}
-proc run_queries*(client: PClient): ptr Tresult{.cdecl,
+proc run_queries*(client: PClient): ptr Result{.cdecl,
     importc: "sphinx_run_queries", dynlib: sphinxDll.}
 proc get_num_results*(client: PClient): cint{.cdecl,
     importc: "sphinx_get_num_results", dynlib: sphinxDll.}
-proc get_id*(result: ptr Tresult, match: cint): int64{.cdecl,
+proc get_id*(result: ptr Result, match: cint): int64{.cdecl,
     importc: "sphinx_get_id", dynlib: sphinxDll.}
-proc get_weight*(result: ptr Tresult, match: cint): cint{.cdecl,
+proc get_weight*(result: ptr Result, match: cint): cint{.cdecl,
     importc: "sphinx_get_weight", dynlib: sphinxDll.}
-proc get_int*(result: ptr Tresult, match: cint, attr: cint): int64{.cdecl,
+proc get_int*(result: ptr Result, match: cint, attr: cint): int64{.cdecl,
     importc: "sphinx_get_int", dynlib: sphinxDll.}
-proc get_float*(result: ptr Tresult, match: cint, attr: cint): float32{.cdecl,
+proc get_float*(result: ptr Result, match: cint, attr: cint): float32{.cdecl,
     importc: "sphinx_get_float", dynlib: sphinxDll.}
-proc get_mva*(result: ptr Tresult, match: cint, attr: cint): ptr cint{.
+proc get_mva*(result: ptr Result, match: cint, attr: cint): ptr cint{.
     cdecl, importc: "sphinx_get_mva", dynlib: sphinxDll.}
-proc get_string*(result: ptr Tresult, match: cint, attr: cint): cstring{.cdecl,
+proc get_string*(result: ptr Result, match: cint, attr: cint): cstring{.cdecl,
     importc: "sphinx_get_string", dynlib: sphinxDll.}
-proc init_excerpt_options*(opts: ptr Texcerpt_options){.cdecl,
+proc init_excerpt_options*(opts: ptr Excerpt_options){.cdecl,
     importc: "sphinx_init_excerpt_options", dynlib: sphinxDll.}
 proc build_excerpts*(client: PClient, num_docs: cint, docs: cstringArray,
-                     index: cstring, words: cstring, opts: ptr Texcerpt_options): cstringArray{.
+                     index: cstring, words: cstring, opts: ptr Excerpt_options): cstringArray{.
     cdecl, importc: "sphinx_build_excerpts", dynlib: sphinxDll.}
 proc update_attributes*(client: PClient, index: cstring, num_attrs: cint,
                         attrs: cstringArray, num_docs: cint,
@@ -253,7 +255,7 @@ proc update_attributes_mva*(client: PClient, index: cstring, attr: cstring,
                             values: ptr cint): cint{.cdecl,
     importc: "sphinx_update_attributes_mva", dynlib: sphinxDll.}
 proc build_keywords*(client: PClient, query: cstring, index: cstring,
-                     hits: TSphinxBool, out_num_keywords: ptr cint): ptr Tkeyword_info{.
+                     hits: SphinxBool, out_num_keywords: ptr cint): ptr Keyword_info{.
     cdecl, importc: "sphinx_build_keywords", dynlib: sphinxDll.}
 proc status*(client: PClient, num_rows: ptr cint, num_cols: ptr cint): cstringArray{.
     cdecl, importc: "sphinx_status", dynlib: sphinxDll.}