Deferenciacion Uris

exploitation/EldaLoader/src/main/java/com/ucuenca/pentaho/plugin/step/EldaPDIStep.java

@@ -510,6 +510,12 @@ private void createmapping(EldaPDIStepMeta meta,String FileName) {
 
 
 ;
+//nested
+Resource rnoNested = fModel
+.createResource( meta.getServicio());
+rnoNested.addProperty(elda.supportsNestedSelect, "false");
+//rnoNested.
+
 //crear viewerMedium
 Resource rvierwerMedium = fModel
 .createResource( URLconfiguracion+"viewerMedium");
@@ -856,7 +862,7 @@ private String crearApiWhere(ArrayList<String> filtrosEndpoint,
 			 if(band==0){
 				 resp+=simboloSeparar+"{s1}";  //resp+="/{s1}";  
 				 }
-			resp += ", \"i\" )) \'" ;   //", \"i\"  \39 )) \' " ;
+			resp += "), \"i\" )) \'" ;   //", \"i\"  \39 )) \' " ;
 
 			System.out.println(resp);
 			//resp = resp.replace('\', "");//limpiar string
@@ -939,7 +945,12 @@ private ArrayList<String> obtenerParametrosFiltros( ArrayList<String> listaMuest
 			}*/
 		}
 		String entidadUri = listaMuestreo.get(0);
-		System.out.println(" /////////PALABRAS FILTROS  PARTE IGUAL  /// "+entidadUri.substring(posBaseUri, ultimaPosicionIgual));
+
+		//System.out.println(" /////////PALABRAS FILTROS  PARTE IGUAL  /// "+entidadUri.substring(posBaseUri, ultimaPosicionIgual));
+		int ultIndexPartigual=0;  //para poder separar la parte para el match de la Uri , es decir la ultima palabra comun
+		ultIndexPartigual = entidadUri.substring(0, ultimaPosicionIgual-2).lastIndexOf("/") +1;
+		System.out.println(" /////////PENULTIMO SLASH  ultIndexPartigual "+ultIndexPartigual);
+		System.out.println(" /////////PALABRAS FILTROS  PARTE IGUAL  /// "+entidadUri.substring(ultIndexPartigual, ultimaPosicionIgual));
 
 		ArrayList<String> resp = new ArrayList<String>() ;
 		//String entidadUri = listaMuestreo.get(0);
@@ -956,17 +967,28 @@ private ArrayList<String> obtenerParametrosFiltros( ArrayList<String> listaMuest
 		int posAntesId = listaMuestreo.get(0).lastIndexOf(simboloSeparar) ; //posicion antes ultimo /
 		ArrayList<Integer> indices = new ArrayList<Integer>();   //indices para separar
 
-		if (posBaseUri < posAntesId){ //validacion
-
+		if (ultIndexPartigual < posAntesId){ //validacion
+			
 			//separar
-			String parteAnalizar = entidadUri.substring(posBaseUri, posAntesId);
+			String parteAnalizar = entidadUri.substring(ultIndexPartigual, posAntesId);
 			if (!parteAnalizar.contains("/")){simboloSeparar = "#";}else{simboloSeparar = "/";}
 			List<String> myList = new ArrayList<String>(Arrays.asList(parteAnalizar
 					.split(simboloSeparar)));
 
 			System.out.println(" /////////PALABRAS FILTROS   /// "+myList.toString());
 			resp =  (ArrayList<String>) myList;
-		}	
+		}
+//		if (posBaseUri < posAntesId){ //VERSION POS base uri para separar
+//		
+//			//separar
+//			String parteAnalizar = entidadUri.substring(posBaseUri, posAntesId);
+//			if (!parteAnalizar.contains("/")){simboloSeparar = "#";}else{simboloSeparar = "/";}
+//			List<String> myList = new ArrayList<String>(Arrays.asList(parteAnalizar
+//					.split(simboloSeparar)));
+//			
+//			System.out.println(" /////////PALABRAS FILTROS   /// "+myList.toString());
+//			resp =  (ArrayList<String>) myList;
+//		}	
 
 
 		return resp;

exploitation/EldaLoader/src/main/java/com/ucuenca/pentaho/plugin/step/elda.java

@@ -35,6 +35,7 @@ public static Property li( int i )
    public static final Property textSearchOperand = property("textSearchOperand");
    public static final Property velocityTemplate = property("velocityTemplate");
    public static final Property graphTemplate = property("graphTemplate");
+   public static final Property supportsNestedSelect = property("supportsNestedSelect");
    /**
        The same items of vocabulary, but at the Node level, parked inside a
        nested class so that there's a simple way to refer to them.
@@ -50,6 +51,7 @@ nested class so that there's a simple way to refer to them.
        public static final Node textSearchOperand  = elda.textSearchOperand .asNode();
        public static final Node velocityTemplate  = elda.velocityTemplate .asNode();
        public static final Node graphTemplate  = elda.graphTemplate .asNode();
+       public static final Node supportsNestedSelect  = elda.supportsNestedSelect .asNode();
        }
 
 }