Changeset 90 for branches

Timestamp:

12/09/07 12:59:45 (4 years ago)

Author:

alex

Message:

fixed bugs in beta

Location:

branches/beta

Files:

• HandlerMenu_OSC.dcr (modified) (previous)
• HandlerMenu_OSC.dir (modified) (previous)
• castlib1/OSCmenu_Utilities.ls (modified) (1 diff)
• castlib1/alexUtilities.ls (modified) (4 diffs)
• castlib1/bbdiff.ls (deleted)
• castlib1/bbedit_Utilities.ls (modified) (2 diffs)
• castlib1/svn_Utilities.ls (modified) (1 diff)

branches/beta/castlib1/OSCmenu_Utilities.ls

@@ -362 +362 @@
     
     subli.add("Convert path from HFS to UNIX")
-    pLookUpCommandList.setaprop("Convert path from HFS to UNIX", ["mConvertHFS2Unix me, string_HFSPath", "alexUtilities"])
+    pLookUpCommandList.setaprop("Convert path from HFS to UNIX", ["mConvertHFS2Unix me", "alexUtilities"])
     subli.add("Convert path from UNIX to HFS")
-    pLookUpCommandList.setaprop("Convert path from UNIX to HFS", ["mConvertUnix2HFS me, string_UnixPath", "alexUtilities"])
+    pLookUpCommandList.setaprop("Convert path from UNIX to HFS", ["mConvertUnix2HFS me", "alexUtilities"])
     
   end if

branches/beta/castlib1/alexUtilities.ls

@@ -208 +208 @@
   
   return retval
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+-- xxxxxxxxxxxxxxxxxx Write text out to a file
+--------------------- helper for the bbdiff and svn handler
+
+on mSaveTextToTempFile me, theText, pfad
+  
+  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)
+  
 end
 
@@ -847 +864 @@
 
 on mDeleteMembersByName me, praefix
-  
-  searchParams = mProcessSearchString(me, praefix)
-  searchString = searchParams.getaprop(#searchString)
-  
   repeat with n = 1 to the number of castlibs
     repeat with z = 1 to the number of members of castlib n
-      
-      case searchParams.getaprop(#searchMode) of
-          
-        #startsWith:
-          if member(z, n).name starts searchString then
-            member(z, n).erase()
-          end if
-          
-        #endsWith:
-          theName = member(z, n).name
-          len = length(theName)
-          startchar = len - length(searchString) + 1
-          if theName.char[startchar .. len] = searchString then
-            member(z, n).erase()
-          end if
-          
-        #equals:
-          if member(z, n).name = searchString then
-            member(z, n).erase()
-          end if
-          
-        otherwise:
-          if member(z, n).name contains searchString then
-            member(z, n).erase()
-          end if
-          
-      end case
-      
+      if member(z, n).name starts praefix then
+        member(z, n).erase()
+      end if
     end repeat
   end repeat
 end
 
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mProcessSearchString me, srchString
-  
-  searchmode = #contains
-  
-  if char 1 of srchString = "^" then
-    if the last char of srchString <> "$" then
-      searchmode = #startsWith
-    else
-      searchmode = #equals
-      delete the last char of srchString
-    end if
-    delete char 1 of srchString
-  else
-    if the last char of srchString = "$" then
-      searchmode = #endsWith
-      delete the last char of srchString
-    end if
-  end if
-  
-  return [#searchString:srchString, #searchMode:searchmode]
-end
 
 
@@ -1031 +996 @@
 
 on mSelectInScore me, startfr, endfr
-  
-  
-  ------------------------------
-  -- this allows to enter anything other than an integer or an integer < 1 in order to search all frames
-  if not(voidP(startfr)) then
-    startfr = integer(startfr)
-    if voidP(startfr) then
-      startfr = 1
-      endfr = 0
-    end if
-    if startfr < 1 then
-      startfr = 1
-      endfr = 0
-    end if
-  end if
-  ------------------------------
   
   cl = the activecastlib
@@ -1553 +1502 @@
   
   created = 0
-  
-  if mCheckForXtra(me, "BudAPI") then
-    theResult = baMsgBox("Create new index ?", "New index", "Yesno", "Question", 1)
-    if theResult = "Yes" then
-      theResult = baPrompt("Enter new title", "Enter new title", "New index", 0, -2, -2)
-      if length(theResult) then
-        tell helpwindow to mCreateIndexMember theResult
-      end if
-    end if
-  end if
   
   repeat with n = 1 to anz

branches/beta/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 Write text out to a file
---------------------- helper for the above bbdiff handler
-
-on mSaveTextToTempFile me, theText, pfad
-  
-  retval = 0
-  
-  if ilk(theText) <> #string then return retval
-  
-  fio = new(xtra "fileio")
-  if not objectP(fio) then return retval
-  
-  if ilk(pfad) = #string then
-    if pfad.length > 0 then
-      
-      fio.openFile(pfad, 0)
-      if fio.status() = 0 then fio.delete()
-      
-      fio.createFile(pfad)
-      if fio.status() = 0 then
-        
-        fio.openFile(pfad, 2)
-        if fio.status() = 0 then
-          
-          fio.writeString(theText)
-          
-          if fio.status() = 0 then retval = pfad
-          
-          fio.closeFile()
-        end if
-      end if
-    end if
-  end if
-  
-  fio = 0
-  
-  return retval
-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
 
 

branches/beta/castlib1/svn_Utilities.ls

@@ -143 +143 @@
             
             -------- now write the results of the BBEdit diff back into the script members
-            scrText = mGetTextFromTempFile(me, tempSrcHFSPath)
+            scrText = mGetTextFromFile(me, tempSrcHFSPath)