fixed transform pattern when multiple transform pipes are directly corrected with each other

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

@@ -44,13 +44,13 @@
         
         // Create Configuration nodes								
         MERGE (assignTemp:Assignment {operation: "new", 
-				   	var: "%{temp$0}", 
+				   	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", 
@@ -60,22 +60,22 @@
 					displayname: "<init>()"}) 
    		-[:CONTROL_FLOW]->					  				
        		(assignValue:Assignment {operation: "value", 
-					var: "%{stage$0}", 
+					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 {caller: assignValue.var,
+  		CREATE (inputPort:Assignment:MethodCall {caller: assignValue.var,
 					fqn: "teetime.framework.AbstractConsumerStage.getInputPort()",
 					operation: "MethodCall",
 					var: "%{temp$5}",
 					name: "getInputPort",
 					vartype: "teetime.framework.InputPort", 
 					type: "Assignment",
-					rightValue: "virtualinvoke %{stage$0}.<" + functionClass.fqn + ": teetime.framework.InputPort getInputPort()>()",
+					rightValue: "virtualinvoke "+ assignValue.var + ".<" + functionClass.fqn + ": teetime.framework.InputPort getInputPort()>()",
 					args: [],
 					argumentscount: "0",
 					displayname: "%{temp$5} = getInputPort()",
@@ -89,7 +89,7 @@
 					displayname: "%{temp$6} = (teetime.framework.InputPort) %{temp$5}" })
   		
         // Create OutputPort        
-        MERGE (outputPort:Assignment:MethodCall {caller: assignValue.var,    
+        CREATE (outputPort:Assignment:MethodCall {caller: assignValue.var,    
 					fqn: functionClass.fqn + ".getOutputPort()",
 					operation: "MethodCall", 
 					var: "%{temp$7}",
@@ -110,6 +110,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)
@@ -267,8 +270,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>