manqod-server 1.269.0 → 1.280.0

data/lib/DrbDB.rb

@@ -25,7 +25,7 @@ class DrbDb
 #		@relations=Hash.new
 #		@server=DRb::DRbServer.new(@connection['uri'],self)
 	end
-	attr_reader :uri, :moditems, :admin, :client, :cache, :connection, :images, :state
+	attr_reader :uri, :moditems, :admin, :client, :cache, :connection, :images, :state, :relation_builder
 	attr_accessor :server, :main_server
 
 	def init
@@ -61,6 +61,8 @@ class DrbDb
 							@moditems[moditem["id"].to_i].update(self)
 						when "form"
 							@moditems[moditem["id"].to_i]=DrbForm.new(self,moditem["id"].to_i).create_skeleton unless @moditems.has_key?(moditem["id"])
+						when "relation_builder"
+							@relation_builder=@moditems[moditem["id"].to_i]=DrbRelationBuilder.new(self,moditem["id"].to_i) unless @moditems.has_key?(moditem["id"])
 						else
 							ewarn("not caching #{moditem['display']}[#{moditem['modname']}]")
 					end
@@ -76,7 +78,7 @@ class DrbDb
 			start_cron
 			@state=SERVING
 		rescue => err
-			eerror("failed to start: #{err}")
+			eexception(err)
 			retry
 		end
 
@@ -90,10 +92,22 @@ class DrbDb
 			begin
 				@client=DRb::DRbObject.new(nil,@connection['client_uri'])
 				einfo("client is alive?(#{@client}): #{@client.alive?}")
+				
+=begin
+				@moditems.each_value{|mi| 
+					ecode(mi.class.name)
+					mi.update if mi.class == DrbRelationBuilder
+				}
+=end
 			rescue
 				@client=nil
 				einfo("no client.")
 			end
+			begin
+				@relation_builder.update if @relation_builder && @client
+			rescue => err
+				eexception(err)
+			end
 		end
 	end
 	def name
@@ -141,7 +155,7 @@ class DrbDb
 					edebug("#{new_model} created")
 					new_model.update(self)
 					unless @moditems[moditem_id.to_i].nil?
-						@moditems[moditem_id.to_i].clients.each{|c| new_model.subscribe(c)}
+						@moditems[moditem_id.to_i].clients.each_pair{|client_id,client| new_model.subscribe(client_id,client)}
 						edebug("#{@moditems[moditem_id.to_i]} abandoned")
 					end
 					@moditems[moditem_id.to_i]=new_model
@@ -158,41 +172,63 @@ class DrbDb
 	end
 	
 	def reload_client_images
-		main_server.connected_clients.each_pair{|cc,cdb|
-			if cdb == client.name
-				einfo("sending reload images to #{cc}")
-				cc.rpc("DrbImages.instance.load_images")
+		dead=Array.new
+		main_server.connected_clients.each_pair{|client_id,cdb|
+			if cdb[:db] == client.name
+				begin
+					einfo("sending reload images to #{client_id}")
+					sdb[:object].rpc("DrbImages.instance.load_images")
+				rescue => err
+					ewarn("cannot send reload images to #{client_id}")
+					dead.push(client_id)
+				end
 			end
 		}
+		dead.each{|client_id|
+			ewarn("killing dead client: #{client_id}")
+			remove_client(client_id)
+		}
 	end
 	
 	def reload_client_attributes
 		client.load_all_attributes
-		main_server.connected_clients.each_pair{|cc,cdb|
-			if cdb == client.name
+		dead=Array.new
+		main_server.connected_clients.each_pair{|client_id,cdb|
+			if cdb[:db] == client.name
 				begin
-					einfo("sending reload attribute to #{cc}")
-					cc.rpc("GtkAttributeStorage.instance.load_all")
+					einfo("sending reload attribute to #{client_id}")
+					cdb[:object].rpc("GtkAttributeStorage.instance.load_all")
 				rescue => err
-					ewarn("cannot send reload attributes #{err}")
+					ewarn("cannot send reload attributes to #{client_id}")
+					dead.push(client_id)
 				end
 			end
 		}
+		dead.each{|client_id|
+			ewarn("killing dead client: #{client_id}")
+			remove_client(client_id)
+		}
 	end
 
 	def reload_client_events(goid)
 		einfo("changed client event: #{goid}")
 		client.events(goid,true)
-		main_server.connected_clients.each_pair{|cc,cdb|
-			if cdb == client.name
+		dead=Array.new
+		main_server.connected_clients.each_pair{|client_id,cdb|
+			if cdb[:db] == client.name
 				begin
-					einfo("sending reload event to #{cc}")
-					cc.rpc("EventCache.instance.reload_events(\"#{goid}\")")
+					einfo("sending reload event to #{client_id}")
+					cdb[:object].rpc("EventCache.instance.reload_events(\"#{goid}\")")
 				rescue => err
-					ewarn("cannot send reload events #{err}")
+					ewarn("cannot send reload events to #{client_id}")
+					dead.push(client_id)
 				end
 			end
 		}
+		dead.each{|client_id|
+			ewarn("killing dead client: #{client_id}")
+			remove_client(client_id)
+		}
 	end
 
 	def auth?(nick,password)
@@ -248,6 +284,10 @@ class DrbDb
 		cnt
 	end
 
+	def remove_client(client_id)
+		@moditems.each_value{|m| m.clients.delete(client_id) if m.mod_type == "list"}
+	end
+
 	def alive?
 		true
 #		server.alive?

data/lib/DrbDB/DrbListModel.rb

@@ -17,7 +17,7 @@ class DrbListModel
 		@fetch_filter_value=nil
 		@fetch_filter_negate=false
 		@archive_key=nil
-		@clients=Array.new
+		@clients=Hash.new
 		@base=nil
 		@last_seq=Hash.new
 		@buttons=Array.new
@@ -205,7 +205,10 @@ class DrbListModel
 		@column_of_fetch_filter=if @fetch_filter_key then headers[@fetch_filter_key]["model_col"] else nil end
 		@column_of_archive=if @archive_key then headers[@archive_key]["model_col"] else nil end
 		hdebug="#{hdebug}\nheadertypes: #{@headertypes.inspect}\nheaders:\n"
-		
+
+		@background_legend=Hash.new
+		@foreground_legend=Hash.new
+
 		@headers.each_value{|val| hdebug="#{hdebug} #{val['data']} #{val['model_col']}\n"}
 #		print "#{self} #{hdebug}\n"
 		@column_of_tree=nil
@@ -343,6 +346,18 @@ class DrbListModel
 								else
 									row[header['data']]
 							end
+						#prepare background color
+						if @column_of_background == header['model_col'] && iter[@column_of_background].class == String
+							cl=iter[@column_of_background].split(":")
+							iter[@column_of_background]=cl[0]
+							@background_legend[cl[0]]=cl[1]
+						end
+						#prepare foreground color
+						if @column_of_foreground == header['model_col'] && iter[@column_of_foreground].class == String
+							cl=iter[@column_of_foreground].split(":") 
+							iter[@column_of_foreground]=cl[0]
+							@foreground_legend[cl[0]]=cl[1]
+						end
 						#history
 						unless row_backup.nil?
 							if header.has_key?("id") && row_backup[header['model_col']] != iter[header['model_col']]
@@ -360,6 +375,10 @@ class DrbListModel
 				@rowcount+=1 unless ids
 			}
 			
+			#store fore and background legends
+			cache.set("#{@my_id}foreground",@foreground_legend)
+			cache.set("#{@my_id}background",@background_legend)
+			
 			if ids and qres.size == 0
 				edebug("removed #{ids.inspect}")
 				#we were called to load_data of a non existing id, which means it was deleted
@@ -582,41 +601,41 @@ class DrbListModel
 	end
 =end
   
-  def subscribe(client)
-		if @clients.include?(client)
+  def subscribe(client_id,client)
+		if @clients.has_key?(client_id)
 			false
-			else
-#  		ecode("subscribing: #{client}, #{client.inspect}")
-  		@clients.push(client)
+		else
+  		edebug("subscribing: #{client_id}")
+  		@clients[client_id]=client
   		true
   	end
   end
   
-  def unsubscribe(client)
-#  	ecode("unsubscribing: #{client}, #{client.inspect}")
-		@clients.delete(client)
+  def unsubscribe(client_id)
+		edebug("unsubscribing: #{client_id}")
+		@clients.delete(client_id)
   end
   
   def notify_clients(*args)
   		to_remove=Array.new
   		th=Array.new
 			edebug("notifying #{@clients.size} clients for #{args.inspect}") unless @drbdb.main_server.starting_up || @clients.size==0
-  		@clients.each{|client|
+  		@clients.each_pair{|client_id,client|
   			th << Thread.new{
   			begin
   				if client.alive?
   					client.update(self.class.name,*args)
   				end
   			rescue =>err
-  				ecode("#{err.inspect}\n\t#{err.backtrace.join("\n\t")}")
-  				to_remove.push(client)
+  				eexception(err)
+  				to_remove.push(client_id)
   			end
   			}
   		}
   		th.each{|t| t.join}
   		to_remove.each{|dead|
  				@clients.delete(dead)
-  			edebug("dead client deleted")
+  			edebug("dead client deleted: #{dead}")
   		}
   end
   
@@ -649,19 +668,18 @@ class DrbListModel
 	
 	def remove_dead_clients
 		alive_clients=0
-		to_remove=Array.new
-		clients.each{|client|
+		clients.delete_if{|client_id,client|
 			begin
-				client.alive?
-				alive_clients+=1
-			rescue
-				to_remove.push(client)
+				Timeout.timeout(3){
+					client.alive?
+					alive_clients+=1
+					false
+				}
+			rescue 
+				ewarn("removing dead subscription: #{client_id.inspect}")
+				true
 			end
 		}
-		to_remove.each{|dead|
-			ewarn("removed dead subscription: #{dead.inspect}")
-			clients.delete(dead)
-		}
 		alive_clients
 	end
 

data/lib/DrbDB/DrbRelationBuilder.rb

@@ -0,0 +1,97 @@
+#this file is part of manqod
+#manqod is distributed under the CDDL licence
+#the owner of manqod is Dobai-Pataky Balint(dpblnt@gmail.com)
+
+class DrbRelationBuilder
+	include Eprint
+	include DRbUndumped
+	
+	def initialize(drbdb,my_id)
+		@my_id=my_id.to_i
+		@drbdb=drbdb
+		@title="Relation Builder"
+		@relations=Hash.new
+		@tables=Hash.new
+
+	end
+	attr_reader :moditem
+	
+	def update
+		@relations.clear
+		@tables.clear
+		@drbdb.rows("select * from tables").each{|row|
+			@tables[row["name"]]={
+				"id" => row["id"],
+				"name" => row["name"],
+				"rbx" => row["rbx"].to_f,
+				"rby" => row["rby"].to_f
+			}
+			#indexes
+			begin
+				@tables[row["name"]]["indexes"]=Array.new
+				@drbdb.client.rows("show indexes from #{row['name']}").each{|index|
+					@tables[row["name"]]["indexes"].push({
+						"name"=>index["Key_name"],
+						"unique"=>index["Non_unique"]=="0", 
+						"field"=>index["Column_name"]
+					}
+					)
+				}
+			rescue => err
+				eerror(err)
+			end
+
+			#is view?
+			is_view=false
+			begin
+				@drbdb.client.fields("show create table `#{row['name']}`").each{|f| is_view=true if f["name"].include?("View")}
+				@tables[row["name"]]["view"]=is_view
+			rescue => err
+				eerror(err)
+			end
+				
+			#fields
+			@tables[row["name"]]["fields"]=Hash.new
+			begin
+				@drbdb.client.rows("show fields from #{row['name']}").each{|field|
+					fi=field.rehash
+					if f=field["Type"].index("(")
+						fi["Size"]=field["Type"][f+1 .. field["Type"].index(")") -1]
+						fi["Type"]=field["Type"][0 .. f-1]
+					end
+					@tables[row["name"]]["fields"][field["Field"]]=fi
+				}
+			rescue => err
+				eerror(err)
+			end
+
+		}
+		@drbdb.rows("select * from relations").each{|row|
+			@relations[row["id"]]={
+				"id" => row["id"],
+				"src_table" => row["src_table"],
+				"src_field" => row["src_field"],
+				"dst_table" => row["dst_table"],
+				"dst_field" => row["dst_field"],
+				"rel_name" => row['rel_name'],
+				"rel_type" => row["rel_type"],
+				"rbx" => row["rbx"].to_f,
+				"rby" => row["rby"].to_f,
+				"rel_custom" => row['rel_custom']
+			}
+		}
+		@drbdb.cache.set("tables",@tables)
+		einfo("#{@tables.size} tables")
+		@drbdb.cache.set("relations",@relations)
+		einfo("#{@relations.size} relations")
+		self
+	end
+
+	def mod_type
+		"relation_builder"
+	end
+
+	def to_s
+		"#{@drbdb}.RelationBuilder"
+	end
+end

data/lib/DrbDB/Messaging.rb

@@ -7,7 +7,7 @@ module Messaging
 		nick=[nick] unless nick.class == Array
 		Thread.new{
 			nick.each{|n|
-				admin.query("insert into messages (sender,recipient,subject,body,state,`date`) values('#{sender || "system"}','#{n}','#{subject}','#{body}','n',now())")
+				admin.query("insert into messages (sender,recipient,subject,body,state,`date`) values('#{sender || "system"}','#{n}','#{admin.escape_string(subject)}','#{admin.escape_string(body)}','n',now())")
 				send_check_messages(n)
 			}
 		}

data/lib/HeartBeat.rb

@@ -12,18 +12,25 @@ module HeartBeat
 					sleep 10
 					to_remove=Array.new
 					alive_clients=0
-					@connected_clients.each_pair{|cc,db|
+					@connected_clients.delete_if{|client_id,cdb|
 						begin
-							cc.alive?
-							alive_clients+=1
-						rescue
-							to_remove.push(cc)
+							Timeout.timeout(3){
+								#ecode("#{cc}.alive?:#{cc.alive?}")
+								cdb[:object].alive?
+								alive_clients+=1
+								false
+							}
+						rescue Timeout::Error
+							ewarn("client timed out, removing a dead client #{client_id}")
+							true
+						rescue => err
+							ewarn("removing a dead client #{client_id}")
+							@dbs.each_value{|db|
+								db.remove_client(client_id) unless db.serving?
+							}
+							true
 						end
 					}
-					to_remove.each{|dead|
-						ewarn("removed dead client: #{dead.inspect}")
-			 			@connected_clients.delete(dead)
-					}
 
 					alive_client_lists=0
 					@dbs.each_value{|db|
@@ -33,14 +40,14 @@ module HeartBeat
 						#check for alive client list subscriptions
 						alive_client_lists+=db.remove_dead_clients
 					}
-					einfo("#{alive_clients} clients  #{alive_client_lists} subscriptions alive") unless alive_clients==lalive_clients && alive_client_lists==lalive_client_lists
+					einfo("#{alive_clients} clients, #{alive_client_lists} subscriptions") unless alive_clients==lalive_clients && alive_client_lists==lalive_client_lists
 
 					lalive_clients=alive_clients
 					lalive_client_lists=alive_client_lists
 				rescue ECONNREFUSED => err
 					eerror("HeartBeat: #{err}")
 				rescue =>err
-					eerror("HeartBeat error: #{err}\n#{err.backtrace.join("\n")}")
+					eexception(err)
 				end
 			end
 		}

data/lib/ManqodServer.rb

@@ -49,16 +49,16 @@ class ManqodServer
 	def setup_clients
 		#wait for all clients to start up
 		begin
-		begin
-			found=false
-			@dbs.each_value{|drbdb|
-				unless drbdb.serving?
-					found = true 
-					sleep 1
-				end
-			}
-		end while found
-		@dbs.each_pair{|conn_name,drbdb| drbdb.setup_client unless drbdb.client and drbdb.client.alive?}
+			begin
+				found=false
+				@dbs.each_value{|drbdb|
+					unless drbdb.serving?
+						found = true 
+						sleep 1
+					end
+				}
+			end while found
+			@dbs.each_pair{|conn_name,drbdb| drbdb.setup_client unless drbdb.client and drbdb.client.alive?}
 		rescue
 		end
 	end
@@ -143,13 +143,13 @@ class ManqodServer
 		exit
 	end
 
-	def register_client(client,db)
-		@connected_clients[client]=db unless @connected_clients.has_key?(client)
-		einfo("#{client} registered to [#{db}]")
+	def register_client(client_id,client_object,client_db)
+		@connected_clients[client_id.clone]={:object => client_object, :db => client_db} unless @connected_clients.has_key?(client_id)
+		einfo("#{client_id} registered to [#{client_db}]")
 	end
-	def unregister_client(client)
-		@connected_clients.delete(client)
-		einfo("#{client} unregistered")
+	def unregister_client(client_id)
+		@connected_clients.delete(client_id)
+		einfo("#{client_id} unregistered")
 	end
 
 	def alive?