개정판 4d009db9
issue #000: wcf 수정
Change-Id: I24a7ee1030556acc6c9a801acbc66c13d5a5dd35
| ConvertService/ServiceBase/ConvertionWebService/Conversion.asmx.cs | ||
|---|---|---|
| 159 | 159 |
//Omsk 는 웹서비스 호출 시 인코딩 |
| 160 | 160 |
//Omsk 제외는 Markus 에서 인코딩 |
| 161 | 161 |
document_Url = Base64Decode(document_Url); |
| 162 |
document_Url = HttpUtility.UrlEncodeUnicode(document_Url); |
|
| 162 | 163 |
} |
| 163 | 164 |
var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault(); |
| 164 | 165 |
if (doc != null) |
| ... | ... | |
| 326 | 327 |
{
|
| 327 | 328 |
try |
| 328 | 329 |
{
|
| 330 |
if(data.Contains("http://"))
|
|
| 331 |
{
|
|
| 332 |
return data; |
|
| 333 |
}else |
|
| 334 |
{
|
|
| 335 |
System.Text.UTF8Encoding encoder = new System.Text.UTF8Encoding(); |
|
| 336 |
System.Text.Decoder utf8Decode = encoder.GetDecoder(); |
|
| 329 | 337 |
|
| 330 |
System.Text.UTF8Encoding encoder = new System.Text.UTF8Encoding(); |
|
| 331 |
System.Text.Decoder utf8Decode = encoder.GetDecoder(); |
|
| 332 |
|
|
| 333 |
byte[] todecode_byte = Convert.FromBase64String(data); |
|
| 338 |
byte[] todecode_byte = Convert.FromBase64String(data); |
|
| 334 | 339 |
|
| 335 |
int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length); |
|
| 340 |
int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length);
|
|
| 336 | 341 |
|
| 337 |
char[] decoded_char = new char[charCount]; |
|
| 342 |
char[] decoded_char = new char[charCount];
|
|
| 338 | 343 |
|
| 339 |
utf8Decode.GetChars(todecode_byte, 0, todecode_byte.Length, decoded_char, 0); |
|
| 344 |
utf8Decode.GetChars(todecode_byte, 0, todecode_byte.Length, decoded_char, 0);
|
|
| 340 | 345 |
|
| 341 |
string result = new String(decoded_char); |
|
| 346 |
string result = new String(decoded_char);
|
|
| 342 | 347 |
|
| 343 |
return result; |
|
| 348 |
return result; |
|
| 349 |
} |
|
| 350 |
|
|
| 344 | 351 |
|
| 345 | 352 |
} |
| 346 | 353 |
|
| ... | ... | |
| 491 | 498 |
//Omsk 는 웹서비스 호출 시 인코딩 |
| 492 | 499 |
//Omsk 제외는 Markus 에서 인코딩 |
| 493 | 500 |
document_Url = Base64Decode(document_Url); |
| 501 |
document_Url = HttpUtility.UrlEncodeUnicode(document_Url); |
|
| 494 | 502 |
} |
| 495 | 503 |
var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault(); |
| 496 | 504 |
if(doc != null) |
| 497 | 505 |
{
|
| 498 |
doc.REVISION = rev_No; |
|
| 499 |
doc.ORIGINAL_FILE = document_Url; |
|
| 506 |
doc.REVISION = rev_No; |
|
| 500 | 507 |
doc.GROUP_NO = group_No; |
| 501 | 508 |
doc.DOCUMENT_NO = document_No; |
| 502 |
doc.DOCUMENT_NAME = document_Name; |
|
| 503 |
}else |
|
| 504 |
{
|
|
| 509 |
doc.DOCUMENT_NAME = document_Name; |
|
| 510 |
doc.ORIGINAL_FILE = document_Url; |
|
| 511 |
} |
|
| 512 |
else |
|
| 513 |
{
|
|
| 505 | 514 |
_entity.AddToDOCUMENT_ITEM(new DOCUMENT_ITEM |
| 506 | 515 |
{
|
| 507 | 516 |
ID = document_Id, |
내보내기 Unified diff
