Changeset 241 for trunk/lingosource/castlib2/FileIOFunktionen.ls

Timestamp:

12/18/09 15:27:43 (2 years ago)

Author:

alex

Message:

enclosed path to svn application and editor application in quotes, because that fails otherwise, if the path has spaces. what a fun it is to be able to have spaces in file and foldernames... :-(

File:

• trunk/lingosource/castlib2/FileIOFunktionen.ls (modified) (8 diffs)

trunk/lingosource/castlib2/FileIOFunktionen.ls

@@ -7 +7 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mGetTextFromFile me, pfad
+on mGetTextFromFile me, pfad, readByteArray, useCharSet
   retval = ""
-  
   if the runmode contains "Plugin" then return retval
   
   fio = new(xtra "fileio")
-  
   if not objectP(fio) then return retval
+  
+  useCharSet = string(useCharSet)
+  if length(useCharSet) > 0 then
+    if xscr().mGetVersionNumber() > 11.4 then
+      ------------- don't need to check whether the given charset is supported
+      ------------- as it is simply ignored, if it isn't
+      ------------- and it also gets reset so that the next instance of fileio
+      ------------- uses the default utf-8 again
+      --      installedCharSets = _system.getInstalledCharSets()
+      --      if installedCharSets.getPos(useCharSet) > 0 then fio.setCharSet(useCharSet)
+      fio.setCharSet(useCharSet)
+    end if
+  end if
   
   if (voidP(pfad) or (pfad = "")) then pfad = mGetFilePathFromUser(me)
@@ -20 +31 @@
   if ilk(pfad) = #string then
     if pfad.length > 0 then
-      
       fio.openFile(pfad, 1)
       if fio.status() = 0 then
-        
-        retval = fio.readFile()
+        if readByteArray = 1 then retval = fio.readByteArray(fio.getlength())
+        else retval = fio.readFile()
         fio.closeFile()
       end if
@@ -33 +43 @@
 end
 
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetByteArrayFromFile me, thePath
+  return mGetTextFromFile(me, thePath, (xscr().mGetVersionNumber() > 11.49))
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -44 +59 @@
 -- paramList[#target] = instance
 -- -- optional:
--- params[#theTimeOut] = 4000 -- milliseconds until operation times out
--- params[#progressHandler] = #progresscallbackFromGetText -- event sent whenever the percent done changes
+-- paramList[#theTimeOut] = 4000 -- milliseconds until operation times out
+-- paramList[#progressHandler] = #progresscallbackFromGetText -- event sent whenever the percent done changes
+-- paramList[#isByteArray] = 0 -- boolean value, only D11
+-- paramList[#charset] = "windows-1252" -- string, only D11
 -- -- paramList[#customdata] = "whatever you need"
+-- xscr(#FileIOFunktionen).mGetTextFromFileAsync(paramList)
+
 --
 --on callbackFromGetText me, paramList
@@ -63 +82 @@
   if not(internetLink) then internetLink = (fname starts "www.")
   if the runmode contains "plugin" or internetLink then
-    --    scr = xscr().mGetInstance("NetLingoManagerPS__")
+    
+    --    scr = xscr().mGetInstance("NetLingoManagerPS")
     --    if ilk(scr) = #instance then
     --      scr.mStartNetOP(paramList)
@@ -77 +97 @@
     --    end if
   else
-    paramList.setaprop(#theTextResult, mGetTextFromFile(me, paramList.getaprop(#theURL)))
+    paramList.setaprop(#theTextResult, mGetTextFromFile(me, paramList.getaprop(#theURL), paramList[#isByteArray], paramList[#charset]))
     call(paramList.getaprop(#handler), [paramList.getaprop(#target)], paramList)
   end if
@@ -83 +103 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetByteArrayFromFileAsync me, paramList
+  paramList[#isByteArray] = 1
+  mGetTextFromFileAsync me, paramList
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 -- xxxxxxxxxxxxxxxxxx Write text out to a file
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSaveToTextFile me, theText, pfad, theTitle, theDefaultName, startfolder
+on mSaveToTextFile me, theText, pfad, theTitle, theDefaultName, startfolder, useCharSet
   retval = 0
   
@@ -98 +125 @@
     fio = new(xtra "fileio")
     if not objectP(fio) then return retval
+    
+    useCharSet = string(useCharSet)
+    if length(useCharSet) > 0 then
+      if xscr().mGetVersionNumber() > 11.4 then
+        ------------- don't need to check whether the given charset is supported
+        ------------- as it is simply ignored, if it isn't
+        ------------- and it also gets reset so that the next instance of fileio
+        ------------- uses the default utf-8 again
+        --      installedCharSets = _system.getInstalledCharSets()
+        --      if installedCharSets.getPos(useCharSet) > 0 then fio.setCharSet(useCharSet)
+        fio.setCharSet(useCharSet)
+      end if
+    end if
+    
     
     if ilk(theTitle) <> #string then theTitle = "Save File"