Changeset 6d955a

Timestamp:

Sep 27, 2014, 4:32:05 PM (6 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

fc272b

Parents:

54ce49

Message:

fixed problem with delimiter detection

File:

• modules/vI_rdfDatasource.js (modified) (4 diffs)

modules/vI_rdfDatasource.js

@@ -58 +58 @@
     _rdfDataSource :    null,
     _rdfFileName :      null,
+    _rdfDelimiter :     null,
     _rdfNS :            "http://virtual-id.absorb.it/",
     _rdfNSStorage :     "vIStorage",
@@ -125 +126 @@
             .getService(Components.interfaces.nsIProperties)
             .get("ProfD", Components.interfaces.nsIFile);
-        var delimiter = (file.path.match(/\\/))?"\\":"/";
-
+        
+//         Log.debug("_openRdfDataSource");
         try {
-            newFile.initWithPath(file.path + delimiter + this._rdfFileName);
+            Log.debug("Filename try linux delimiter: '" + file.path + "/" + this._rdfFileName + "'");
+            newFile.initWithPath(file.path + "/" + this._rdfFileName);
+//             Log.debug("success");
+            this._rdfDelimiter = "/";
         } catch (NS_ERROR_FILE_UNRECOGNIZED_PATH) {
-            var debugMsg = "Filename not valid: '" + file.path + delimiter + this._rdfFileName + "'\n" +
-                "Virtual Identity Storage won't work.\n\n" +
-                "Please report this issue with filename on https://www.absorb.it/virtual-id\n\n" +
-                "You can just copy the lines below in your browser to create a ticket\n\n" +
-                "https://www.absorb.it/virtual-id/newticket?summary=RDF Filename Error&description=Filename " + file.path + delimiter + this._rdfFileName + " for rdf not valid"
-            get3PaneWindow().alert(debugMsg);
-            log.debug("Filename not valid: '" + file.path + delimiter + this._rdfFileName + "'");
-            log.debug("can't open rdfDatasource - storage won't work");
-            return;
+            try {
+                Log.debug("Filename try windows delimiter: '" + file.path + "\\" + this._rdfFileName + "'");
+                newFile.initWithPath(file.path + "\\" + this._rdfFileName);
+//                 Log.debug("success");
+                this._rdfDelimiter = "\\";
+            }
+            catch (NS_ERROR_FILE_UNRECOGNIZED_PATH) {
+                Log.debug("Filename not valid: '" + file.path + "[\\/]" + this._rdfFileName + "'");
+                Log.debug("can't open rdfDatasource - storage won't work");
+                var debugMsg = "Filename not valid: '" + file.path + "\\" + this._rdfFileName + "'\n" +
+                    "Filename not valid: '" + file.path + "/" + this._rdfFileName + "'\n" +
+                    "Virtual Identity Storage won't work.\n\n" +
+                    "Please report this issue with filename on https://www.absorb.it/virtual-id\n\n" +
+                    "You can just copy the lines below in your browser to create a ticket\n\n" +
+                    "https://www.absorb.it/virtual-id/newticket?summary=RDF Filename Error&description=Filename " + file.path + "[\\/]" + this._rdfFileName + " for rdf not valid"
+                get3PaneWindow().alert(debugMsg);
+                return;
+            }
         }
         var fileURI = protoHandler.newFileURI(newFile);
@@ -577 +590 @@
             var file = Components.classes["@mozilla.org/file/directory_service;1"]
                 .getService(Components.interfaces.nsIProperties).get("ProfD", Components.interfaces.nsIFile);
-            var delimiter = (file.path.match(/\\/))?"\\":"/";
-            rdfDataFile.initWithPath(file.path + delimiter + rdfFileName);
+            rdfDataFile.initWithPath(file.path + this._rdfDelimiter + rdfFileName);
 
             rdfDataFile.copyTo(filePicker.file.parent,filePicker.file.leafName);
@@ -1139 +1151 @@
             var file = Components.classes["@mozilla.org/file/directory_service;1"]
                 .getService(Components.interfaces.nsIProperties).get("ProfD", Components.interfaces.nsIFile);
-            var delimiter = (file.path.match(/\\/))?"\\":"/";
-            importRdfDataFile.initWithPath(file.path + delimiter + this._rdfFileName + "_import");
+            importRdfDataFile.initWithPath(file.path + this._rdfDelimiter + this._rdfFileName + "_import");
             filePicker.file.copyTo(importRdfDataFile.parent,importRdfDataFile.leafName);