Changeset 93 for trunk/lingosource

Timestamp:

12/09/07 15:55:41 (4 years ago)

Author:

alex

Message:

various fixes in beta

Location:

trunk/lingosource/castlib1

Files:

• alexUtilities.ls (modified) (7 diffs)
• bbedit_Utilities.ls (modified) (2 diffs)
• svn_Utilities.ls (modified) (3 diffs)

trunk/lingosource/castlib1/alexUtilities.ls

@@ -210 +210 @@
 end
 
-
-
-
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 -- xxxxxxxxxxxxxxxxxx Write text out to a file
@@ -219 +216 @@
 on mSaveTextToTempFile me, theText, pfad
   
-  if ilk(pfad) <> #string then return 0
-  if length(pfad) < 1 then return 0
+  if ilk(pfad) <> #string then
+    pfad = mConvertUnix2HFS("/tmp/tmpfile.txt")
+  end if
+  if length(pfad) < 1 then
+    pfad = mConvertUnix2HFS("/tmp/tmpfile.txt")
+  end if
   
   return mSaveToTextFile(me, theText, pfad)
@@ -406 +407 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mGetFolderPathFromUser me
+on mGetFolderPathFromUser me, startFolder, theTitle, flags, instruction, offsx, offsy
   retval = ""
   
@@ -419 +420 @@
     end if
     
-    retval = baGetFolder( "", "Select a folder", 3, "", 50, 50 )
+    startFolder = string(startFolder)
+    instruction = string(instruction)
+    flags = integer(flags)
+    if ilk(flags) <> #integer then flags = 0
+    theTitle = string(theTitle)
+    
+    offsx = integer(offsx)
+    if ilk(offsx) <> #integer then offsx = -1
+    
+    offsy = integer(offsy)
+    if ilk(offsy) <> #integer then offsy = -1
+    
+    retval = baGetFolder(startFolder, theTitle, flags, instruction, offsx, offsy )
     
     if resetUNames = 1 then baReturnUnixNames(1)
@@ -2355 +2368 @@
   if not(the platform contains "mac") then return fname
   
+  if fname starts "/" then return fname -- huh? must already be an absolute unix path
+  
   offs = offset(":", fname)
   repeat while offs
@@ -2371 +2386 @@
   if not(the platform contains "mac") then return fname
   
+  if fname starts "/Volumes/" then
+    olddelim = the itemdelimiter
+    the itemdelimiter = "/"
+    delete item 1 to 3 of fname
+    the itemdelimiter = olddelim
+    put "/" before fname
+  end if
+  
+  if not(fname starts "/") then return fname -- huh? doesn't seem to be an absolute unix path 
+  
   offs = offset("/", fname)
   repeat while offs
@@ -2376 +2401 @@
     offs = offset("/", fname)
   end repeat
+  
   osDir = getOsDirectory()
   olddelim = the itemdelimiter

trunk/lingosource/castlib1/bbedit_Utilities.ls

@@ -510 +510 @@
     
     -------- now write the results of the BBEdit diff back into the script members
-    memref1.scripttext = mGetTextFromTempFile(me, tempSrcHFSPath)
+    memref1.scripttext = mGetTextFromFile(me, tempSrcHFSPath)
     
     if ilk(memref2) = #member then
-      memref2.scripttext = mGetTextFromTempFile(me, tempSrcHFSPath2)
+      memref2.scripttext = mGetTextFromFile(me, tempSrcHFSPath2)
     end if
     
@@ -545 +545 @@
 end
 
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--- xxxxxxxxxxxxxxxxxx Read text from file
---------------------- helper for the above bbdiff handler
-
-on mGetTextFromTempFile me, pfad
-  retval = ""
-  
-  if the runmode contains "Plugin" then return retval
-  
-  fio = new(xtra "fileio")
-  
-  if not objectP(fio) then return retval
-  if (voidP(pfad) or (pfad = "")) then return retval
-  
-  if ilk(pfad) = #string then
-    if pfad.length > 0 then
-      fio.openFile(pfad, 1)
-      if fio.status() = 0 then
-        retval = fio.readFile()
-        fio.closeFile()
-      end if
-    end if
-  end if
-  fio = void
-  
-  return retval
-  
-end
 
 

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -138 +138 @@
           
           if count(theResult) > 0 then
-            put "No differences found for member: " & memref.name && "(" & memref & ")"
-            
+            if theResult[1] contains "no such file or directory" then
+              put theResult[1]
+            else
+              put "No differences found for member: " & memref.name && "(" & memref & ")"
+            end if
           else
             
             -------- now write the results of the BBEdit diff back into the script members
-            scrText = mGetTextFromTempFile(me, tempSrcHFSPath)
+            scrText = mGetTextFromFile(me, tempSrcHFSPath)
             
             
@@ -2963 +2966 @@
   
   if chooseNewPath = 1 then
-    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
+    workingFolder = mGetFolderPathFromUser(me, the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if
   
@@ -2973 +2976 @@
     alert selectMsg
     
-    workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
+    workingFolder = mGetFolderPathFromUser(me, the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if