Subversion Repositories DevTools

Rev

Rev 5355 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5355 Rev 5385
Line 1... Line 1...
1
<%@LANGUAGE="VBSCRIPT"%>
1
<%@LANGUAGE="VBSCRIPT"%>
2
<%
2
<%
3
'=====================================================
3
'=====================================================
4
'|                                                   |
-
 
5
'|				         DIFF					     |
4
'   diffmerge.asp
6
'|                                                   |
-
 
7
'=====================================================
5
'=====================================================
8
%>
6
%>
9
<%
7
<%
10
Option explicit
8
Option explicit
11
' Good idea to set when using redirect
9
' Good idea to set when using redirect
Line 971... Line 969...
971
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
969
	" WHERE br.PROJ_ID = pr.PROJ_ID"&_
972
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_	
970
	" 	AND b.BRANCH_ID = br.BRANCH_ID"&_	
973
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
971
	"   AND b.BOM_ID ="&parSBOMB, cint(0))
974
				
972
				
975
				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
973
				NewTextFile.WriteLine("<title>Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</title>")
976
				NewTextFile.WriteLine("<link rel="shortcut icon" href="<%=FavIcon%>"/>
-
 
977
				NewTextFile.WriteLine("<div align="&chr(34)&"center"&chr(34)&"><font color="&chr(34)&"red"&chr(34)&" size="&chr(34)&"4"&chr(34)&" face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</font></div><br>")
974
				NewTextFile.WriteLine("<div align="&chr(34)&"center"&chr(34)&"><font color="&chr(34)&"red"&chr(34)&" size="&chr(34)&"4"&chr(34)&" face="&chr(34)&"Verdana, Arial, Helvetica, sans-serif"&chr(34)&">Difference Report Between "&rsQryA("branch_name")&" "&rsQryA("location")&" and "&rsQryB("branch_name")&" "&rsQryB("location")&"</font></div><br>")
978
				
975
				
979
				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
976
				While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
980
				errormsg = false
977
				errormsg = false
981
					rowId = rsQry("node_id_a") &"_"& rsQry("os_id_a") &"_"& rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
978
					rowId = rsQry("node_id_a") &"_"& rsQry("os_id_a") &"_"& rsQry("pv_id_a") &"_"& rsQry("pv_id_b")