Commit 881f2bc1 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade script de búsqueda para entorno de tests

parent 264f5841
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@
            {
              "script" : {
                "script" : {
                  "id" : "search-by-z-range",
                  "source" : "def valuePropery = \"z\";\ndef deviationProperty = \"deviation\";\n\nif (doc[params.basePath + \".\" + valuePropery].empty)\n\treturn false;\n\ndef value = doc[params.basePath + \".\" + valuePropery].value;\ndef deviation = doc[params.basePath + \".\" + deviationProperty].value;\n\nif (deviation == null)\n\tdeviation = 0;\n\ndef lowerLimit = value-deviation;\ndef upperLimit = value+deviation;\n\n// Límites de query a null, no se permite query\nif (params.minValue == null && params.maxValue == null)\n\treturn false;\n// Límites de query not null, se tiene en cuenta la desviación\nif (params.minValue != null && params.maxValue != null) {\n\tif (value >= params.minValue && value <= params.maxValue)\n\t\treturn true;\n\tif (upperLimit >= params.maxValue && lowerLimit <= params.minValue)\n\t\treturn true;\n\tif (upperLimit <= params.maxValue && upperLimit >= params.minValue)\n\t\treturn true;\n\tif (lowerLimit <= params.maxValue && lowerLimit >= params.minValue)\n\t\treturn true;\n\treturn false;\n}\n// Algún límite de query a null\nif (params.maxValue != null && upperLimit <= params.maxValue)\n\treturn true;\nif (params.minValue != null && lowerLimit >= params.minValue)\n\treturn true;\nreturn false;\n",
                  "params" : {
                    "zMin" : -5000.0,
                    "zMax" : 5000.0,
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@
            {
              "script" : {
                "script" : {
                  "id" : "search-by-z-range",
                  "source" : "def valuePropery = \"z\";\ndef deviationProperty = \"deviation\";\n\nif (doc[params.basePath + \".\" + valuePropery].empty)\n\treturn false;\n\ndef value = doc[params.basePath + \".\" + valuePropery].value;\ndef deviation = doc[params.basePath + \".\" + deviationProperty].value;\n\nif (deviation == null)\n\tdeviation = 0;\n\ndef lowerLimit = value-deviation;\ndef upperLimit = value+deviation;\n\n// Límites de query a null, no se permite query\nif (params.minValue == null && params.maxValue == null)\n\treturn false;\n// Límites de query not null, se tiene en cuenta la desviación\nif (params.minValue != null && params.maxValue != null) {\n\tif (value >= params.minValue && value <= params.maxValue)\n\t\treturn true;\n\tif (upperLimit >= params.maxValue && lowerLimit <= params.minValue)\n\t\treturn true;\n\tif (upperLimit <= params.maxValue && upperLimit >= params.minValue)\n\t\treturn true;\n\tif (lowerLimit <= params.maxValue && lowerLimit >= params.minValue)\n\t\treturn true;\n\treturn false;\n}\n// Algún límite de query a null\nif (params.maxValue != null && upperLimit <= params.maxValue)\n\treturn true;\nif (params.minValue != null && lowerLimit >= params.minValue)\n\treturn true;\nreturn false;\n",
                  "params" : {
                    "zMin" : -5000.0,
                    "zMax" : 5000.0,
+3 −1
Original line number Diff line number Diff line
@@ -53,12 +53,14 @@
            {
              "script" : {
                "script" : {
                  "id" : "search-by-z-range",
                  "source" : "def valuePropery = \"z\";\ndef deviationProperty = \"deviation\";\n\nif (doc[params.basePath + \".\" + valuePropery].empty)\n\treturn false;\n\ndef value = doc[params.basePath + \".\" + valuePropery].value;\ndef deviation = doc[params.basePath + \".\" + deviationProperty].value;\n\nif (deviation == null)\n\tdeviation = 0;\n\ndef lowerLimit = value-deviation;\ndef upperLimit = value+deviation;\n\n// Límites de query a null, no se permite query\nif (params.minValue == null && params.maxValue == null)\n\treturn false;\n// Límites de query not null, se tiene en cuenta la desviación\nif (params.minValue != null && params.maxValue != null) {\n\tif (value >= params.minValue && value <= params.maxValue)\n\t\treturn true;\n\tif (upperLimit >= params.maxValue && lowerLimit <= params.minValue)\n\t\treturn true;\n\tif (upperLimit <= params.maxValue && upperLimit >= params.minValue)\n\t\treturn true;\n\tif (lowerLimit <= params.maxValue && lowerLimit >= params.minValue)\n\t\treturn true;\n\treturn false;\n}\n// Algún límite de query a null\nif (params.maxValue != null && upperLimit <= params.maxValue)\n\treturn true;\nif (params.minValue != null && lowerLimit >= params.minValue)\n\treturn true;\nreturn false;\n",
                  "lang" : "painless",
                  "params" : {
                    "zMin" : -5000.0,
                    "zMax" : 5000.0,
                    "basePath" : "properties.inTrack"
                  }

                },
                "boost" : 1.0
              }
+36 −0
Original line number Diff line number Diff line
def valuePropery = "z";
def deviationProperty = "deviation";

if (doc[params.basePath + "." + valuePropery].empty)
	return false;

def value = doc[params.basePath + "." + valuePropery].value;
def deviation = doc[params.basePath + "." + deviationProperty].value;

if (deviation == null)
	deviation = 0;

def lowerLimit = value-deviation;
def upperLimit = value+deviation;

// Límites de query a null, no se permite query
if (params.minValue == null && params.maxValue == null)
	return false;
// Límites de query not null, se tiene en cuenta la desviación
if (params.minValue != null && params.maxValue != null) {
	if (value >= params.minValue && value <= params.maxValue)
		return true;
	if (upperLimit >= params.maxValue && lowerLimit <= params.minValue)
		return true;
	if (upperLimit <= params.maxValue && upperLimit >= params.minValue)
		return true;
	if (lowerLimit <= params.maxValue && lowerLimit >= params.minValue)
		return true;
	return false;
}
// Algún límite de query a null
if (params.maxValue != null && upperLimit <= params.maxValue)
	return true;
if (params.minValue != null && lowerLimit >= params.minValue)
	return true;
return false;