Based on patch from Dave Stubbs.
def sqlescape(a)
- a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr,92.chr+92.chr)
+ a.gsub(/[\000-\037]/,"").gsub("'","''").gsub(92.chr) {92.chr+92.chr}
end
def tag2array(a)
tags={}
- a.gsub(';;;','#%').split(';').each do |b|
- b.gsub!('#%',';;;')
- b.gsub!('===','#%')
- k,v=b.split('=')
- if k.nil? then k='' end
- if v.nil? then v='' end
- tags[k.gsub('#%','=').gsub(':','|')]=v.gsub('#%','=')
+ Tags.split(a) do |k, v|
+ tags[k.gsub(':','|')]=v
end
tags
end
def array2tag(a)
- str=''
+ tags = []
a.each do |k,v|
if v=='' then next end
if v[0,6]=='(type ' then next end
- if str!='' then str+=';' end
- str+=k.gsub(';',';;;').gsub('=','===').gsub('|',':')+'='+v.gsub(';',';;;').gsub('=','===')
+ tags << [k.gsub('|',':'), v]
end
- str
+ return Tags.join(tags)
end
def getuserid(token)
tags << [tag['k'],tag['v']]
end
- tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
- tags = '' if tags.nil?
-
- node.tags = tags
+ node.tags = Tags.join(tags)
end
rescue
node = nil
el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
- Node.split_tags(el1, self.tags)
+ Tags.split(self.tags) do |k,v|
+ el2 = XML::Node.new('tag')
+ el2['k'] = k.to_s
+ el2['v'] = v.to_s
+ el1 << el2
+ end
+
el1['visible'] = self.visible.to_s
el1['timestamp'] = self.timestamp.xmlschema
return el1
end
-
- def self.split_tags(el, tags)
- tags.split(';').each do |tag|
- parts = tag.split('=')
- key = ''
- val = ''
- key = parts[0].strip unless parts[0].nil?
- val = parts[1].strip unless parts[1].nil?
- if key != '' && val != ''
- el2 = XML::Node.new('tag')
- el2['k'] = key.to_s
- el2['v'] = val.to_s
- el << el2
- end
- end
- end
end
--- /dev/null
+module Tags
+ def self.join(tags)
+ joined = tags.collect { |k,v| "#{escape_string(k)}=#{escape_string(v)}" }.join(';')
+ joined = '' if joined.nil?
+ return joined
+ end
+
+ def self.escape_string(tag)
+ return tag.gsub(/[;=\\]/) { |v| escape_char(v) }
+ end
+
+ def self.escape_char(v)
+ case v
+ when ';' then return '\\s'
+ when '=' then return '\\e'
+ end
+ return '\\\\'
+ end
+
+ def self.split(tags)
+ tags.split(';').each do |tag|
+ key,val = tag.split('=').collect { |s| s.strip }
+ key = '' if key.nil?
+ val = '' if val.nil?
+ if key != '' && val != ''
+ yield unescape_string(key),unescape_string(val)
+ end
+ end
+ end
+
+ def self.unescape_string(tag)
+ return tag.gsub(/\\[se\\]/) { |v| unescape_char(v) }
+ end
+
+ def self.unescape_char(v)
+ case v
+ when '\\s' then return ';'
+ when '\\e' then return '='
+ end
+ return '\\'
+ end
+end