From 08bc00138bc90f80ed3b9d96c1d072359ea3ab4c Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Sun, 10 Oct 2021 22:16:24 -0500 Subject: [PATCH] Add function zxlookup --- conf.py | 20 ------------- extension/ZAZFunctions_v0.2.0.oxt | Bin 54331 -> 54173 bytes source/CalcAddIn.xcu | 45 ------------------------------ source/XZAZFunctions.idl | 5 ---- source/XZAZFunctions.rdb | Bin 17408 -> 17408 bytes source/ZAZFunctions.py | 8 ++---- 6 files changed, 2 insertions(+), 76 deletions(-) diff --git a/conf.py b/conf.py index e3f61e3..a267b61 100644 --- a/conf.py +++ b/conf.py @@ -186,26 +186,6 @@ FUNCTIONS = { }, }, }, - 'zxylookup': { - 'displayname': {'en': 'zxylookup', 'es': 'zbuscarxy'}, - 'description': { - 'en': 'Find things in a range in first row and first column, get intersection', - 'es': 'Busca en un rango en la primer fila y columna y devuelve la intersección'}, - 'parameters': { - 'lookup_value_x': { - 'displayname': {'en': 'lookup_value_x', 'es': 'valor_buscado_x'}, - 'description': {'en': 'Value to search in first row', 'es': 'Valor buscado en la primer fila'}, - }, - 'lookup_value_y': { - 'displayname': {'en': 'lookup_value_y', 'es': 'valor_buscado_y'}, - 'description': {'en': 'Value to search in first column', 'es': 'Valor buscado en la primer columna'}, - }, - 'return_array': { - 'displayname': {'en': 'return_array', 'es': 'devolver_desde'}, - 'description': {'en': 'Range to return', 'es': 'Rango a devolver'}, - }, - }, - }, } # ~ FUNCTIONS = {} diff --git a/extension/ZAZFunctions_v0.2.0.oxt b/extension/ZAZFunctions_v0.2.0.oxt index 40eca132e9a398d7b9a598962987fd9e928e7e1c..62babb63739439d8e38735b1f1553fd6c37e6981 100644 GIT binary patch delta 3014 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 delta 3178 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 diff --git a/source/CalcAddIn.xcu b/source/CalcAddIn.xcu index b37e440..d5789c9 100644 --- a/source/CalcAddIn.xcu +++ b/source/CalcAddIn.xcu @@ -129,51 +129,6 @@ - - - zxylookup - zbuscarxy - - - Find things in a range in first row and first column, get intersection - Busca en un rango en la primer fila y columna y devuelve la intersección - - - Add-In - - - AutoAddIn.zxylookup - - - - - lookup_value_x - valor_buscado_x - - - Value to search in first row - Valor buscado en la primer fila - - - - lookup_value_y - valor_buscado_y - - - Value to search in first column - Valor buscado en la primer columna - - - - return_array - devolver_desde - - - Range to return - Rango a devolver - - - diff --git a/source/XZAZFunctions.idl b/source/XZAZFunctions.idl index 91bf78c..b5726a0 100644 --- a/source/XZAZFunctions.idl +++ b/source/XZAZFunctions.idl @@ -16,11 +16,6 @@ module net { module elmau { module zaz { module functions { [in] any if_not_found, [in] any match_mode, [in] any search_mode); - any zxylookup( - [in] any lookup_value_x, - [in] any lookup_value_y, - [in] any return_array, - [in] any if_not_found); }; service functions { diff --git a/source/XZAZFunctions.rdb b/source/XZAZFunctions.rdb index f87157b12d8500b7635d947bdae8cb3b00d0cc91..aa4364b3e8e8e61914f3740a77462deca7927df5 100644 GIT binary patch delta 169 zcmZqZU~K4Mv~v#j^{Bo1?G*zH0|O8<0ZA}m1d$F54EW_Y8XjWa#A2Yy;_1mdZL%Y0 z^yC0eUO{G{DL~^G{|T9dRe5rdGb|#?a2}jCKFBKCh@Q= eW-$;Dxt+Id0?0xJ772#`KmcShY?g3%!3+Qv`Y8zj delta 244 zcmZqZU~K4M)N>B@^-vBu7RJEBzyQQdKoSL@%5PRwyU(~W;4|YU76VO=?Ej3G3=Rwo zlN~vuCkJqH3hoAK2b#mQO~@py0z^+bevH8a3_Mj8l{xwO*`);_ zYq%JA67woiS)vR)5C!pNi8-aI@j!!+6{1T|KBH&P$THbkUwe}Qi-3rQAFm(CO$;m& R4F92Ea-P1)W*>(w%mCsoK7;@O diff --git a/source/ZAZFunctions.py b/source/ZAZFunctions.py index 847aa1a..19156dd 100644 --- a/source/ZAZFunctions.py +++ b/source/ZAZFunctions.py @@ -21,14 +21,10 @@ class ZAZFunctions(unohelper.Base, XZAZFunctions): result = eval(value) return result - def zxylookup(self, lookup_value_x, lookup_value_y, return_array, if_not_found): - - return - def zxlookup(self, lookup_value, lookup_array, return_array, if_not_found, match_mode, search_mode): - # The python default value not get in custom functions + # The python default value not set in custom functions if match_mode is None: match_mode = 0 else: @@ -49,7 +45,7 @@ class ZAZFunctions(unohelper.Base, XZAZFunctions): if value is None: if match_mode == -1: index = bisect.bisect_right(source, lookup_value) - value = (return_array[index],) + value = (return_array[index - 1],) elif match_mode == 1: index = bisect.bisect_left(source, lookup_value) value = (return_array[index],)