Changeset 169 for trunk

Timestamp:

04/07/08 08:27:22 (4 years ago)

Author:

alex

Message:

version checking online only if an url is in comments field of field 'subversion_version_field'

Location:

trunk/lingosource/castlib1

Files:

• subversion_version_field.txt (modified) (1 diff)
• svn_Utilities.ls (modified) (12 diffs)

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r169
+r170

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -1976 +1976 @@
         if length(ident) < 1 then ident = the moviename
         
+        thePassword = ""
         placeholder = "%%password:"
         offs = offset(placeholder, VersionCheckUrl)
@@ -1986 +1987 @@
         VersionCheckUrl = word 1 to VersionCheckUrl.word.count of VersionCheckUrl & "?movieName=" & ident
         
-        updateurl = 0
-        repeat with cl in castlibList
-          versmem = member("subversion_version_field", cl)
-          if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
-            if updateurl = 0 then updateurl = 1
-            curr = versmem.text
-            if char 1 of curr = "r" then delete char 1 of curr
-            curr = integer(curr)
-            if not(integerP(curr)) then curr = 0
-            if curr < versionNumber then
-              versmem.text = "r" & versionNumber
+      end if
+      
+      updateurl = 0
+      repeat with cl in castlibList
+        versmem = member("subversion_version_field", cl)
+        if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+          if updateurl = 0 then updateurl = 1
+          curr = versmem.text
+          if char 1 of curr = "r" then delete char 1 of curr
+          curr = integer(curr)
+          if not(integerP(curr)) then curr = 0
+          if curr < versionNumber then
+            versmem.text = "r" & versionNumber
+            if length(VersionCheckUrl) > 0 then
               versmem.comments = VersionCheckUrl
-            else
-              updateurl = 2
             end if
+          else
+            updateurl = 2
           end if
-        end repeat
-        
+        end if
+      end repeat
+      
+      if length(VersionCheckUrl) > 0 then
         if updateurl = 1 then
           if length(thePassword) then
@@ -2009 +2015 @@
           end if
         end if
-        
       end if
+      
     end if
     --------------------- // version number
@@ -2252 +2258 @@
         if length(ident) < 1 then ident = the moviename
         
+        thePassword = ""
         placeholder = "%%password:"
         offs = offset(placeholder, VersionCheckUrl)
@@ -2261 +2268 @@
         
         VersionCheckUrl = word 1 to VersionCheckUrl.word.count of VersionCheckUrl & "?movieName=" & ident
-        
-        updateurl = 0
-        repeat with cl = the number of castlibs down to 1
-          versmem = member("subversion_version_field", cl)
-          if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
-            if updateurl = 0 then updateurl = 1
-            curr = versmem.text
-            if char 1 of curr = "r" then delete char 1 of curr
-            curr = integer(curr)
-            if not(integerP(curr)) then curr = 0
-            if curr < versionNumber then
-              versmem.text = "r" & versionNumber
+      end if
+      updateurl = 0
+      repeat with cl = the number of castlibs down to 1
+        versmem = member("subversion_version_field", cl)
+        if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+          if updateurl = 0 then updateurl = 1
+          curr = versmem.text
+          if char 1 of curr = "r" then delete char 1 of curr
+          curr = integer(curr)
+          if not(integerP(curr)) then curr = 0
+          if curr < versionNumber then
+            versmem.text = "r" & versionNumber
+            if length(VersionCheckUrl) > 0 then
               versmem.comments = VersionCheckUrl
-            else
-              updateurl = 2
             end if
+          else
+            updateurl = 2
           end if
-        end repeat
-        
+        end if
+      end repeat
+      
+      if length(VersionCheckUrl) > 0 then
         if updateurl = 1 then
           if length(thePassword) then
@@ -2285 +2295 @@
           end if
         end if
-        
       end if
+      
     end if
     --------------------- // version number
@@ -2801 +2811 @@
       if length(ident) < 1 then ident = the moviename
       
+      thePassword = ""
       placeholder = "%%password:"
       offs = offset(placeholder, VersionCheckUrl)
@@ -2892 +2903 @@
       -------------------- get version number:
       
-      if length(VersionCheckUrl) > 0 then
-        versmem = member("subversion_version_field", n)
-        if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
-          if updateurl = 0 then updateurl = 1
-          curr = versmem.text
-          if char 1 of curr = "r" then delete char 1 of curr
-          curr = integer(curr)
-          if not(integerP(curr)) then curr = 0
-          if curr < versionNumber then
-            versmem.text = "r" & versionNumber
+      
+      versmem = member("subversion_version_field", n)
+      if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+        if updateurl = 0 then updateurl = 1
+        curr = versmem.text
+        if char 1 of curr = "r" then delete char 1 of curr
+        curr = integer(curr)
+        if not(integerP(curr)) then curr = 0
+        if curr < versionNumber then
+          versmem.text = "r" & versionNumber
+          if length(VersionCheckUrl) > 0 then
             versmem.comments = VersionCheckUrl
-          else
-            updateurl = 2
           end if
+        else
+          updateurl = 2
         end if
       end if
+      
       --------------------- // version number
       
@@ -2929 +2942 @@
     
     -------------------- get version number:
-    if updateurl = 1 then
-      if length(thePassword) then
-        id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
+    if length(VersionCheckUrl) > 0 then
+      if updateurl = 1 then
+        if length(thePassword) then
+          id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
+        end if
       end if
     end if
@@ -2947 +2962 @@
     -------------------- get version number:
     updateurl = 0
+    
+    repeat with cl = the number of castlibs down to 1
+      versmem = member("subversion_version_field", cl)
+      if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+        if updateurl = 0 then updateurl = 1
+        curr = versmem.text
+        if char 1 of curr = "r" then delete char 1 of curr
+        curr = integer(curr)
+        if not(integerP(curr)) then curr = 0
+        if curr < versionNumber then
+          versmem.text = "r" & versionNumber
+          if length(VersionCheckUrl) > 0 then
+            versmem.comments = VersionCheckUrl
+          end if
+        else
+          updateurl = 2
+        end if
+      end if
+    end repeat
+    
     if length(VersionCheckUrl) > 0 then
-      repeat with cl = the number of castlibs down to 1
-        versmem = member("subversion_version_field", cl)
-        if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
-          if updateurl = 0 then updateurl = 1
-          curr = versmem.text
-          if char 1 of curr = "r" then delete char 1 of curr
-          curr = integer(curr)
-          if not(integerP(curr)) then curr = 0
-          if curr < versionNumber then
-            versmem.text = "r" & versionNumber
-            versmem.comments = VersionCheckUrl
-          else
-            updateurl = 2
-          end if
+      if updateurl = 1 then
+        if length(thePassword) then
+          id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
         end if
-      end repeat
-    end if
-    
-    if updateurl = 1 then
-      if length(thePassword) then
-        id = getnettext(VersionCheckUrl & "&version=" & thePassword & versionNumber)
       end if
     end if
@@ -3212 +3230 @@
   versionCheckUrl = string(versionCheckUrlList.getaprop(movieIdentifier))
   
-  if versionCheckUrl = "" then
+  if length(versionCheckUrl) > 0 then return versionCheckUrl
+  
+  
+  repeat with n = the number of castlibs down to 1
+    versmem = member("subversion_version_field", n)
+    if [#field, #text].getPos(mGetMemType(me, versmem)) > 0 then
+      versionCheckUrl = string(versmem.comments)
+      if length(versionCheckUrl) then exit repeat
+    end if
+  end repeat
+  
+  if length(versionCheckUrl) > 0 then
+    
     selectMsg = string(selectMsg)
     if length(selectMsg) < 1 then selectMsg = "No update check URL is specified for this movie. Please enter an URL."
@@ -3220 +3250 @@
     --    else
     muiobj = new(xtra "Mui")
-    versionCheckUrl = muiobj.GetUrl("http://www.farbflash.de/cgi-bin/versionChecker.pl %%password: secretpassword", 1)
+    --     versionCheckUrl = muiobj.GetUrl("http://www.farbflash.de/cgi-bin/versionChecker.pl %%password: secretpassword", 1)
+    versionCheckUrl = muiobj.GetUrl(versionCheckUrl && "%%password: secretpassword", 1)
     muiobj = 0
     --    end if