fixed filter pattern

NeoSuit/src/main/resources/patterns_puff/TinkerPop-Subpattern/FilterFunctionPipe2AbstractFilter-PPQuery.xml

@@ -43,16 +43,14 @@
         DELETE cfReturn
         
         // Create Configuration nodes								
-        MERGE (assignTemp:Assignment {
-                    operation: "new", 
-				   	var: "%{temp$0}", 
+         MERGE (assignTemp:Assignment {operation: "new", 
+				   	var: "%{temp$}" + id(function), 
 				   	vartype: function.vartype, 
 				   	type: "Assignment", 
 				   	rightValue: function.rightValue, 
-				   	displayname: "%{temp$0} = " + function.rightValue})	
+				   	displayname: "%{temp$}"+ id(function) + " = " + function.rightValue})	
    		-[:CONTROL_FLOW]->					   			
-       		(initNode:MethodCall:ConstructorCall {
-                    caller: "%{temp$0}", 
+       		(initNode:MethodCall:ConstructorCall {caller: assignTemp.var, 
 					fqn: function.vartype + ".<init>()", 
 					name:"<init>", 
 					type:"MethodCall", 
@@ -61,17 +59,16 @@
 					returntype: "void", 
 					displayname: "<init>()"}) 
    		-[:CONTROL_FLOW]->					  				
-       		(assignValue:Assignment {
-                    operation: "value", 
-					var: "%{stage$0}", 
+       		(assignValue:Assignment {operation: "value", 
+					var: "%{stage$}" + id(function), 
 					vartype: function.vartype, 
 					isdeclaration: true,
 					type: "Assignment", 
-					rightValue: "%{temp$0}", 
-					displayname: "%{stage$0} = %{temp$0}"})
+					rightValue: assignTemp.var, 
+					displayname: "%{stage$}"+ id(function) +" = " + assignTemp.var})
 
   		// Create InputPort
-        MERGE (inputPort:Assignment:MethodCall {
+        CREATE (inputPort:Assignment:MethodCall {
                     caller: assignValue.var,
 					fqn: "teetime.framework.AbstractConsumerStage.getInputPort()",
 					operation: "MethodCall",
@@ -94,7 +91,7 @@
 					displayname: "%{temp$6} = (teetime.framework.InputPort) %{temp$5}" })
   		
         // Create OutputPort        
-        MERGE (outputPort:Assignment:MethodCall {
+        CREATE (outputPort:Assignment:MethodCall {
                     caller: assignValue.var,    
 					fqn: functionClass.fqn + ".getOutputPort()",
 					operation: "MethodCall", 
@@ -116,6 +113,9 @@
 				   	nopkind:"Pipe"})
 		-[:CONTROL_FLOW]->
 			(successor)		
+		MERGE (functionPipe)-[:IS_TRANSFORMED_THROUGH_START]->(nopCS)
+		MERGE (endPipe)-[:IS_TRANSFORMED_THROUGH_END]->(nopCS)
+					   	
         MERGE (nopCS)-[:HAS_CONFIGURATION]->(assignTemp)
 		MERGE (nopCS)-[:INPUTPORT_START]->(inputPort)
 		MERGE (nopCS)-[:INPUTPORT_END]->(inputPortCast)
@@ -313,8 +313,10 @@
 			        displayname: "return" }
                                     
         // Delete pipe		
-        WITH functionPipe, endPipe                               
+        WITH functionPipe, endPipe, nopCS, predecessor                                              
         MATCH pipe = (functionPipe)-[*]->(endPipe)
+        OPTIONAL MATCH (predecessor)-[:IS_TRANSFORMED_THROUGH_END]->(preNop)
+        MERGE (preNop)-[:CONTROL_FLOW]->(nopCS)	
         FOREACH (n IN nodes(pipe) | DETACH DELETE n)
     ]]>
 </query>
\ No newline at end of file