X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..34e3e51456774127d43408b7ab65c24f41373f62:/lib/potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 43be2f8b4..bd2c905fe 100644
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -5,31 +5,33 @@ module Potlatch
 
   # The AMF class is a set of helper functions for encoding and decoding AMF.
   class AMF
-    
+
     # Return two-byte integer
-    def self.getint(s) 
-      s.getc*256+s.getc
+    def self.getint(s)
+      s.getbyte*256+s.getbyte
     end
 
     # Return four-byte long
-    def self.getlong(s) 
-      ((s.getc*256+s.getc)*256+s.getc)*256+s.getc
+    def self.getlong(s)
+      ((s.getbyte*256+s.getbyte)*256+s.getbyte)*256+s.getbyte
     end
 
-    # Return string with two-byte length 
-    def self.getstring(s) 
-      len=s.getc*256+s.getc
-      s.read(len)
+    # Return string with two-byte length
+    def self.getstring(s)
+      len=s.getbyte*256+s.getbyte
+      str=s.read(len)
+      str.force_encoding("UTF-8") if str.respond_to?("force_encoding")
+      str
     end
 
-    # Return eight-byte double-precision float 
-    def self.getdouble(s) 
+    # Return eight-byte double-precision float
+    def self.getdouble(s)
       a=s.read(8).unpack('G')			# G big-endian, E little-endian
       a[0]
     end
 
     # Return numeric array
-    def self.getarray(s) 
+    def self.getarray(s)
       len=getlong(s)
       arr=[]
       for i in (0..len-1)
@@ -38,35 +40,35 @@ module Potlatch
       arr
     end
 
-    # Return object/hash 
-    def self.getobject(s) 
+    # Return object/hash
+    def self.getobject(s)
       arr={}
       while (key=getstring(s))
         if (key=='') then break end
         arr[key]=getvalue(s)
       end
-      s.getc		# skip the 9 'end of object' value
+      s.getbyte		# skip the 9 'end of object' value
       arr
     end
 
     # Parse and get value
-    def self.getvalue(s) 
-      case s.getc
+    def self.getvalue(s)
+      case s.getbyte
       when 0;	return getdouble(s)			# number
-      when 1;	return s.getc				# boolean
+      when 1;	return s.getbyte			# boolean
       when 2;	return getstring(s)			# string
       when 3;	return getobject(s)			# object/hash
-      when 5;	return nil					# null
-      when 6;	return nil					# undefined
-      when 8;	s.read(4)					# mixedArray
-        return getobject(s)			#  |
-      when 10;return getarray(s)			# array
-      else;	return nil					# error
+      when 5;	return nil				# null
+      when 6;	return nil				# undefined
+      when 8;	s.read(4)				# mixedArray
+                return getobject(s)			#  |
+      when 10;  return getarray(s)			# array
+      else;	return nil				# error
       end
     end
 
     # Envelope data into AMF writeable form
-    def self.putdata(index,n) 
+    def self.putdata(index,n)
       d =encodestring(index+"/onResult")
       d+=encodestring("null")
       d+=[-1].pack("N")
@@ -74,7 +76,7 @@ module Potlatch
     end
 
     # Pack variables as AMF
-    def self.encodevalue(n) 
+    def self.encodevalue(n)
       case n.class.to_s
       when 'Array'
         a=10.chr+encodelong(n.length)
@@ -104,18 +106,19 @@ module Potlatch
     end
 
     # Encode string with two-byte length
-    def self.encodestring(n) 
+    def self.encodestring(n)
+      n=n.dup.force_encoding("ASCII-8BIT") if n.respond_to?("force_encoding")
       a,b=n.size.divmod(256)
       a.chr+b.chr+n
     end
 
-    # Encode number as eight-byte double precision float 
-    def self.encodedouble(n) 
+    # Encode number as eight-byte double precision float
+    def self.encodedouble(n)
       [n].pack('G')
     end
 
     # Encode number as four-byte long
-    def self.encodelong(n) 
+    def self.encodelong(n)
       [n].pack('N')
     end
 
@@ -134,7 +137,7 @@ module Potlatch
       # Skip headers
       AMF.getint(@request).times do     # Read number of headers and loop
         AMF.getstring(@request)         #  | skip name
-        req.getc                        #  | skip boolean
+        req.getbyte                     #  | skip boolean
         AMF.getvalue(@request)          #  | skip value
       end
 
@@ -240,7 +243,7 @@ module Potlatch
         }
       end
       icon_list.reverse!
-      
+
       # Read auto-complete
       autotags={}; autotags['point']={}; autotags['way']={}; autotags['POI']={};
       File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|
@@ -259,4 +262,3 @@ module Potlatch
   end
 
 end
-