Changeset 34510

Timestamp:

2020-10-22T17:52:26+13:00 (4 years ago)

Author:

ak19

Message:

Dr Bainbridge didn't want a heuristic test on tilda for checking if a gsdlsourcefilename stored in doc.xml was a Win 8.3 Short filename or not. The idea was to set a flag on the perl end for if the gsdlsourcefilename stored was a shortfilename or not. Unfortunately, the perl code (DirectoryPlugin::read, variable subfile) was set to short filenames when doing a readdir, not by any algorithm. So it's always potentially a short file name on windows, except that only the presence of a tilda would indicate this. Whether we test for this in perl and set a flag or test for this in Java doesn't matter then. So have taken out the test for presence of tilda, though this means the java code will always try to work out a long filename of a gsdlsourcefilename on Windows.

File:

• main/trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -325 +325 @@
         // Next, if Windows, check if dealing with Win 8.3 Short Filename
         // In that case, convert short file name to long filename - works only if the file exists       
-        if(isWin && gsdlsourcefilename_value.indexOf("~") != -1) {
+        if(isWin /*&& gsdlsourcefilename_value.indexOf("~") != -1*/) {
             
             String long_gsdlsourcefilename = gsdlsourcefilename_value;