Changeset 29815 for main/trunk/gli/src
- Timestamp:
- 2015-03-30T13:08:18+13:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/metadata/FilenameEncoding.java
r29793 r29815 347 347 348 348 String filename_ascii = filename_uri.toASCIIString(); 349 DebugStream.println("ascii = "+filename_ascii);350 349 String filename_raw_bytes = URLDecoder.decode(filename_ascii,"ISO-8859-1"); 351 DebugStream.println("raw = "+filename_raw_bytes);352 350 filename_url_encoded = iso_8859_1_filename_to_url_encoded(filename_raw_bytes); 353 351 … … 358 356 filename_url_encoded = file.getAbsolutePath(); 359 357 } 360 DebugStream.println("returning "+filename_url_encoded);361 358 return filename_url_encoded; 362 359 } … … 372 369 { 373 370 String urlEncoded = ""; 374 DebugStream.println("in iso 8859 to url encoded, "+raw_bytes_filename); 371 375 372 try { 376 373 // By this point we have a UTF-8 encoded string that captures … … 390 387 String unicode_filename = new String(raw_bytes,"UTF-8"); 391 388 392 //urlEncoded = URLEncoder.encode(unicode_filename, "UTF-8");393 389 for(int i = 0; i < unicode_filename.length(); i++) { 394 390 char charVal = unicode_filename.charAt(i); 395 391 if ((int)charVal > 255) { 396 392 urlEncoded += String.format("&#x%02X;", (int)charVal); 397 //urlEncoded += String.format("\\u%04X", (int)charVal);398 393 } 399 394 else if((int)charVal > 127) { 400 395 urlEncoded += String.format("%%%02X", (int)charVal); 401 //urlEncoded += Integer.toHexString((int)charVal);402 396 } else { 403 397 urlEncoded += String.format("%c", (char)charVal); … … 409 403 throw(e); 410 404 } 411 DebugStream.println("returning "+urlEncoded); 405 412 406 return urlEncoded; 413 407 }
Note:
See TracChangeset
for help on using the changeset viewer.