개정판 9294fed6
issue #932: [SNI] 페이지 경로를 구하는 부분에서 오류 발생하여 수정
Change-Id: If8d7684a31ec7da1f18501f83f10d0c7ccf90215
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 106 | 106 |
} |
| 107 | 107 |
} |
| 108 | 108 |
|
| 109 |
|
|
| 109 |
/// <summary> |
|
| 110 |
/// Compare 결과를 받아 화면에 표시한다 |
|
| 111 |
/// </summary> |
|
| 112 |
/// <param name="sender"></param> |
|
| 113 |
/// <param name="e"></param> |
|
| 110 | 114 |
private void BaseClient_GetCompareRectCompleted(object sender, GetCompareRectCompletedEventArgs e) |
| 111 | 115 |
{
|
| 112 |
Logger.sendResLog("GetCompareRectCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 113 |
|
|
| 114 | 116 |
if (e.Error != null || e.Result == null) |
| 115 | 117 |
{
|
| 116 |
DialogMessage_Alert("Compare 기능을 원활히 실행하기 위한 데이터가 부족합니다", "안내");
|
|
| 118 |
if (e.Error != null) |
|
| 119 |
{
|
|
| 120 |
DialogMessage_Alert(e.Error.ToString(), "Error"); |
|
| 121 |
} |
|
| 122 |
else |
|
| 123 |
{
|
|
| 124 |
DialogMessage_Alert("Compare 기능을 원활히 실행하기 위한 데이터가 부족합니다", "안내");
|
|
| 125 |
} |
|
| 117 | 126 |
} |
| 118 | 127 |
else |
| 119 | 128 |
{
|
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 217 | 217 |
} |
| 218 | 218 |
} |
| 219 | 219 |
|
| 220 |
|
|
| 220 |
/// <summary> |
|
| 221 |
/// 두 페이지를 비교하여 결과를 리턴한다 |
|
| 222 |
/// </summary> |
|
| 223 |
/// <param name="projectNo"></param> |
|
| 224 |
/// <param name="originDocItem_ID"></param> |
|
| 225 |
/// <param name="targetDocItem_ID"></param> |
|
| 226 |
/// <param name="originPageNo"></param> |
|
| 227 |
/// <param name="targetPageNo"></param> |
|
| 228 |
/// <param name="isInternalAddress"></param> |
|
| 229 |
/// <returns></returns> |
|
| 221 | 230 |
[OperationContract] |
| 222 | 231 |
public List<Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo, string isInternalAddress) |
| 223 | 232 |
{
|
| 224 |
//string originFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.cmp", projectNo, (Convert.ToInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo);
|
|
| 225 |
//string targetFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.cmp", projectNo, (Convert.ToInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo);
|
|
| 226 |
|
|
| 227 | 233 |
string originFile = ""; |
| 228 | 234 |
string targetFile = ""; |
| 229 | 235 |
|
| 236 |
string sFolder = originDocItem_ID.All(char.IsDigit) ? (Convert.ToUInt32(originDocItem_ID) / 100).ToString() : (originDocItem_ID.Length >= 5 ? originDocItem_ID.Substring(0, 5) : originDocItem_ID); |
|
| 230 | 237 |
if (Boolean.Parse(isInternalAddress)) |
| 231 | 238 |
{
|
| 232 |
originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, (Convert.ToUInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo);
|
|
| 233 |
targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, (Convert.ToUInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo);
|
|
| 239 |
originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, sFolder, originDocItem_ID, originPageNo);
|
|
| 240 |
targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, sFolder, targetDocItem_ID, targetPageNo);
|
|
| 234 | 241 |
} |
| 235 | 242 |
else |
| 236 | 243 |
{
|
| ... | ... | |
| 239 | 246 |
} |
| 240 | 247 |
|
| 241 | 248 |
CompareLib compareLib = new CompareLib(); |
| 242 |
//System.IO.Stream resultOrigin = compareLib.ChangeCmpUrlToPng(originFile); |
|
| 243 |
//System.IO.Stream resultTarget = compareLib.ChangeCmpUrlToPng(targetFile); |
|
| 244 | 249 |
|
| 245 | 250 |
var resultOrigin = compareLib.ChangeCmpUrlToPng_File(originFile); |
| 246 | 251 |
var resultTarget = compareLib.ChangeCmpUrlToPng_File(targetFile); |
| ... | ... | |
| 252 | 257 |
} |
| 253 | 258 |
|
| 254 | 259 |
|
| 255 |
|
|
| 256 | 260 |
#region Final PDF |
| 257 | 261 |
private string _ChanID = null; |
| 258 | 262 |
TcpChannel chan = null; |
| Site/SNI/FinalService.ini | ||
|---|---|---|
| 1 | 1 |
[PDFMovePath] |
| 2 |
URL=http://10.11.132.77/finalpdf/move/
|
|
| 2 |
URL=D:\finalpdf\move\
|
|
| 3 | 3 |
[ApprovedImgPath] |
| 4 |
URL=http://10.11.132.77/finalpdf/Approved.png
|
|
| 4 |
URL=D:\finalpdf\Approved.png
|
|
| 5 | 5 |
[CheckmarkImgPath] |
| 6 |
URL=http://10.11.132.77/finalpdf/checkmark.png
|
|
| 6 |
URL=D:\finalpdf\checkmark.png
|
|
| 7 | 7 |
[DebugSavePath] |
| 8 | 8 |
URL=D:\\Develop\\Ensemble\\{0}_app\\VPCS_DOCLIB\\{1}\\{2}\\ToVendor\\
|
| 9 | 9 |
[DebugResultUrlPath] |
| ... | ... | |
| 11 | 11 |
[FinalServiceName] |
| 12 | 12 |
NAME=FinalService |
| 13 | 13 |
[UpLoadServiceUrl] |
| 14 |
URL=http://165.244.178.139/Service/MarkUpServices.asmx
|
|
| 14 |
URL=http://10.11.132.106/Service/MarkUpServices.asmx
|
|
| 15 | 15 |
[FinalPDFRootUrl] |
| 16 |
URL=http://10.11.132.77/finalpdf/move/ |
|
| 16 |
URL=http://10.11.132.77:5977/finalpdf/move/
|
|
| 17 | 17 |
[ConnectionString] |
| 18 |
STRING=EVCOYxwadMNh7qzjMvRTwOacwyFatXgWjx//sssrSKTsvMkdvpdBa3Sj3mmhwABTiweSqNnWYgsIxUWXaBe8XE8G1CLaux2zPbyBWvqxJruTX0H5MqABZSEXXG82XaGL
|
|
| 18 |
STRING=oGKAXlIgXfRDRXGeHEn8ECdlS2EOSoS2gQpP8ONKUyGU6Q/ifJjTOAagjlWZnH0X2tyPdCXmrbpbV4svIY03SQ3/Txox1nlpsI3Sshf1T8c=
|
|
| 19 | 19 |
[MARKUS_API] |
| 20 | 20 |
URL=http://www.devdoftech.co.kr:5979/ServiceDeepView.svc |
내보내기 Unified diff
