eas-dev-commit Mailing List for E/AS

Brought to you by: skull_rus, yrashk

eas-dev-commit — Commit Log

You can subscribe to this list here.

2003	_Jan (69)	_Feb (122)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2004	_Jan	_Feb	_Mar (56)	_Apr	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun (237)	_Jul	_Aug	_Sep (1)	_Oct (14)	_Nov (72)	_Dec
2007	_Jan (2)	_Feb (37)	_Mar (5)	_Apr	_May (2)	_Jun	_Jul (1)	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 25 > >> (Page 1 of 25)

[Eas-dev-commit] eas/libeas dbmanager.prg,1.4,1.5

From: Andrey C. <sku...@us...> - 2007-07-02 09:15:52

Update of /cvsroot/eas-dev/eas/libeas
In directory sc8-pr-cvs17:/tmp/cvs-serv27346/libeas

Modified Files:
	dbmanager.prg 
Log Message:
Fix formatting for database query

Index: dbmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/dbmanager.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbmanager.prg	20 Nov 2006 12:57:55 -0000	1.4
+++ dbmanager.prg	2 Jul 2007 09:15:48 -0000	1.5
@@ -84,7 +84,7 @@
 		return array(0)
 	endif
 	if "FORMAT" $ params .and. params:format
-		fmt := CODB_Formatter()
+		fmt := CODBFormatter()
 		res := fmt:show( res )
 	endif	
 return res

[Eas-dev-commit] eas/client main.prg,1.13,1.14

From: Andrey C. <sku...@us...> - 2007-05-22 08:44:31

Update of /cvsroot/eas-dev/eas/client
In directory sc8-pr-cvs17:/tmp/cvs-serv18032/client

Modified Files:
	main.prg 
Log Message:
Show error of form opening. Small fixes.

Index: main.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/main.prg,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- main.prg	12 Mar 2007 17:14:22 -0000	1.13
+++ main.prg	22 May 2007 08:44:27 -0000	1.14
@@ -149,7 +149,7 @@
 	if valtype(vRet) <> 'O' .or. .not. 'ANSWER' $ vRet .or. .not. vRet:answer
 		// Access denied
 		if loginWindow != NIL
-			loginWindow:dialogBox(i18n("ERROR"),i18n("Access denied.&\nPlease, contact your system administratior."),,,NIL, IMG_ERROR)
+			loginWindow:dialogBox(i18n("Error"),i18n("Access denied.&\nPlease, contact your system administrator."),,,NIL, IMG_ERROR)
 		endif
 		eDebug( 1, "Access denied. Program is terminated.")
 		return NIL
@@ -183,7 +183,7 @@
 		
 		eDebug( 1, "Cannot open main form.")
 		if loginWindow != NIL
-			loginWindow:dialogBox(i18n("ERROR"),i18n("Cannot open main form."),,,NIL, IMG_ERROR)
+			loginWindow:dialogBox(i18n("Error"),i18n("Cannot open main form."),,,NIL, IMG_ERROR)
 		endif
 	elseif loginWindow == NIL
 		messages:ui:run()
@@ -203,7 +203,7 @@
 	if loginInProgress == 1
 		eDebug( 1, "Error connect to server" )
 		loginInProgress := 2
-		loginWindow:dialogBox(i18n("ERROR"),i18n("Cannot connect to server!&\nContact your system administratior."),,,NIL, IMG_ERROR)
+		loginWindow:dialogBox(i18n("Error"),i18n("Cannot connect to server!&\nContact your system administrator."),,,NIL, IMG_ERROR)
 		return .F.
 	endif
 	
@@ -422,7 +422,7 @@
 	t:add(UILabel(i18n("Client software for E/AS platform")), "2,1-4+")
 	t:add(UILabel(i18n("Version:")+" "+EASGetVersion()), "3,1-4+")
 	t:add(UILabel(i18n("Driver:")+" "+driver:driver), "4,1-4+")
-	t:add(UILabel(i18n("(c) 2003-2006, E/AS Software Foundation. All rights reserved.")), "5,1-4+")
+	t:add(UILabel(i18n("(c) 2003-2007, E/AS Software Foundation. All rights reserved.")), "5,1-4+")
 	t:add(UILabel(i18n("This software is distributed under the GPL")), "6,1-4+")
 	t:add(UILabel(i18n("Web: http://eas.lrn.ru")), "7,1-4+")

[Eas-dev-commit] eas/libeas protocol_raw.prg, 1.7, 1.8 uimanager.prg, 1.7, 1.8

From: Andrey C. <sku...@us...> - 2007-05-22 08:44:30

Update of /cvsroot/eas-dev/eas/libeas
In directory sc8-pr-cvs17:/tmp/cvs-serv18032/libeas

Modified Files:
	protocol_raw.prg uimanager.prg 
Log Message:
Show error of form opening. Small fixes.

Index: protocol_raw.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/protocol_raw.prg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- protocol_raw.prg	12 Mar 2007 17:14:23 -0000	1.7
+++ protocol_raw.prg	22 May 2007 08:44:27 -0000	1.8
@@ -226,7 +226,7 @@
 	// params: session:N
 	local oData:=map(), cBuf, nSize, nRead, err:=map()
 	local cBuffer:='', nTotal:=0
-	local oErr, sec:=seconds()
+	local oErr, sec
 	self:socket:rTimeout := 6000
 	
 	self:errno := 0
@@ -253,6 +253,7 @@
 
 	cBuf := space(nSize)
 	
+	sec := seconds()
 	self:lock := .T.
 	oErr := ErrorBlock({|e| break(e) })
 	begin sequence
@@ -277,7 +278,6 @@
 		eDebug( 6, "Read error")
 		cBuffer := ''
 		nTotal  := 0
-		
 	end sequence
 	
 	self:lock := .F.
@@ -292,7 +292,7 @@
 static function c_write( self, params )
 	// params: session:N, data:O
 	local nSended, err:=map()
-	local oErr
+	local oErr, sec:=seconds()
 		
 	if self:socket:role != 'server' .and. valtype(params) == 'O'
 		params:session := self:socket:handle
@@ -319,5 +319,5 @@
 		return .F.
 	end sequence
 	
-	eDebug( 26, "Wrote",nSended,"bytes" )
+	eDebug( 26, "Wrote",nSended, "bytes", seconds()-sec, "sec" )
 return .T.

Index: uimanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/uimanager.prg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- uimanager.prg	12 Mar 2007 17:14:23 -0000	1.7
+++ uimanager.prg	22 May 2007 08:44:27 -0000	1.8
@@ -117,11 +117,13 @@
 	
 	if empty(vRet)
 		eDebug( 8, "Cannot open empty form" )
+		dialogBox( i18n("Error"), i18n("Unable to open form:&\nServer returns empty form"),,,NIL, IMG_ERROR )
 		return .F.
 	endif
 	
 	if valtype(vRet) == 'O' .and. 'ERROR' $ vRet
 		eDebug( 8, "Form open:", vRet:error )
+		dialogBox( i18n("Error"), i18n("Unable to open form:&\n")+vRet:error,,,NIL, IMG_ERROR )
 		return .F.
 	endif
 	
@@ -152,6 +154,7 @@
 
 		if win == NIL
 			eDebug( 8, "Error parse form" )
+			dialogBox( i18n("Error"), i18n("Error parse form"),,,NIL, IMG_ERROR )
 			return .F.
 		elseif self:main == NIL
 			self:main := win
@@ -179,6 +182,7 @@
 	
 	recover using oErr
 		eDebug( 8, "Internal error:", errorMessage(oErr) )
+		dialogBox( i18n("Error"), i18n("Internal form error:&\n")+errorMessage(oErr),,,NIL, IMG_ERROR )
 		return .F.
 	end sequence

[Eas-dev-commit] eas/libeas Makefile, 1.3, 1.4 componentmanager.prg, 1.5, 1.6 config.prg, 1.2, 1.3 connection.prg, 1.2, 1.3 execmanager.prg, 1.5, 1.6 functions.prg, 1.6, 1.7 messagemanager.prg, 1.4, 1.5 protocol_raw.prg, 1.6, 1.7 session.prg, 1.4, 1.5 transportmanager.prg, 1.5, 1.6 uimanager.prg, 1.6, 1.7

From: Andrey C. <sku...@us...> - 2007-03-12 17:14:32

Update of /cvsroot/eas-dev/eas/libeas
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5417/libeas

Modified Files:
	Makefile componentmanager.prg config.prg connection.prg 
	execmanager.prg functions.prg messagemanager.prg 
	protocol_raw.prg session.prg transportmanager.prg 
	uimanager.prg 
Log Message:
Fix some bugs. Add sessions support

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2007 14:23:25 -0000	1.3
+++ Makefile	12 Mar 2007 17:14:23 -0000	1.4
@@ -32,7 +32,8 @@
 	mkdir -p $(DESTDIR)$(CLIPROOT)/lib
 	$(CLIPROOT)/bin/clip_cp $(TARGET) $(DESTDIR)$(CLIPROOT)/lib
 	$(CLIPROOT)/bin/clip_cp $(RTARGET) $(DESTDIR)$(CLIPROOT)/lib
-	/sbin/ldconfig -n $(DESTDIR)$(CLIPROOT)/lib
+	test -f $(DESTDIR)/usr/lib/$(TARGET) || ln -s $(DESTDIR)$(CLIPROOT)/lib/$(TARGET) $(DESTDIR)/usr/lib
+	/sbin/ldconfig -n $(DESTDIR)/usr/lib
 
 uninstall:
 	rm -rf $(CLIPROOT)/lib/$(TARGET) $(CLIPROOT)/lib/$(RTARGET)

Index: componentmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/componentmanager.prg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- componentmanager.prg	20 Nov 2006 12:57:55 -0000	1.5
+++ componentmanager.prg	12 Mar 2007 17:14:23 -0000	1.6
@@ -93,7 +93,7 @@
 /** Execute component command found by ::lookup() */
 static function c_execute( self, params )
 	local oErr, component, method, id, q:=map(), obj
-	local fName, f, fBlock, p, ret:=NIL, i, codeFile:=NIL
+	local fName, f, fBlock, p, ret:=NIL, i, codeFile:=NIL, old
 	
 	component := params:receiver
 	method    := params:command
@@ -127,9 +127,11 @@
 		endif
 		
 		if .T. //.not. file(fName) // DEBUG: all occurences
+			old := set(_SET_TRANSLATE_PATH, .F.) // turn DOS mode off
 			f := fcreate(fName, 0)
 			fwrite(f, codeFile:content)
 			fclose(f)
+			set(_SET_TRANSLATE_PATH, old)
 		endif
 		
 		// Use code

Index: config.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/config.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.prg	15 Nov 2006 10:37:18 -0000	1.2
+++ config.prg	12 Mar 2007 17:14:23 -0000	1.3
@@ -97,7 +97,7 @@
 function EASConfig( params, check_load, description )
 	local obj, file:=NIL, i 
 	local driver:=NIL, connection:=NIL, exec:=0, repo:=''
-	local debug:=NIL
+	local debug:=NIL, old
 	
 	// Scan parameters for help
 	if ascan(params, "-h") > 0 .or. ascan(params, "--help") > 0
@@ -126,11 +126,13 @@
 			exec := i+1
 		endif
 	next
-
+	
 	// Inherit from INIFILE class
+	old := set(_SET_TRANSLATE_PATH, .F.) // turn DOS mode off
 	obj := iniFileNew( file )
+	set(_SET_TRANSLATE_PATH, old)
 	obj:file 	:= file
-
+	
 	// Attributes and methods
 	obj:className 	:= "EASConfig"
 	obj:driver		:= driver

Index: connection.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/connection.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- connection.prg	15 Nov 2006 10:37:18 -0000	1.2
+++ connection.prg	12 Mar 2007 17:14:23 -0000	1.3
@@ -12,8 +12,6 @@
 
 /** EASConnection - connection manager */
 
-/* TODO: thread support */
-
 function EASConnection( params )
 	local obj
 

Index: execmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/execmanager.prg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- execmanager.prg	20 Nov 2006 12:57:55 -0000	1.5
+++ execmanager.prg	12 Mar 2007 17:14:23 -0000	1.6
@@ -53,6 +53,7 @@
 static function c_execute( self, params )
 	// params: receiver:C, command:C, args:AO, sender:C
 	local i, j, bCode, vRet, id, slot_list
+	local tmp
 	
 	self:lastError := NIL
 	
@@ -65,6 +66,14 @@
 	if valtype(params:receiver) == 'C'
 		i := ascan( self:commands, {|e| e[1]==params:receiver } )
 		if i > 0
+			/*
+			eDebug(4, "COMMAND:", params:receiver, params:command)
+			for i in self:commands
+				if i[1]==params:receiver
+					eDebug(4, chr(9), i[2])
+				endif
+			next
+			*/
 			i := ascan( self:commands, {|e| e[1]==params:receiver .and. e[2]==params:command } )
 			if i > 0
 				// Execute command
@@ -74,7 +83,7 @@
 				eDebug( 34, "Execute '"+params:receiver+"."+params:command+"' returns:", vRet )
 				return vRet
 			else
-				self:lastError := "ERROR: command '"+params:command+"' for '"+params:receiver+"' not found"
+				self:lastError := "Command '"+params:command+"' for '"+params:receiver+"' is not found"
 				eDebug( 4, self:lastError )
 				return NIL
 			endif
@@ -85,7 +94,7 @@
 			eDebug( 34, "Execute component '"+params:command+"' returns:", vRet )
 			return vRet
 		else
-			self:lastError := iif(empty(self:cManager:lastError),"ERROR: component '"+params:receiver+"' not found",self:cManager:lastError)
+			self:lastError := iif(empty(self:cManager:lastError),"Component '"+params:receiver+"' not found",self:cManager:lastError)
 			eDebug( 4, self:lastError )
 			//eDebug(5, var2log(self:getCommands(),2,.T.))
 			return NIL
@@ -104,7 +113,7 @@
 			eval( bCode, params:args )
 		next
 	else
-		eDebug( 14, "Tthere are no handlers for event '"+params:command+"'" )
+		eDebug( 14, "There are no handlers for event '"+params:command+"'" )
 	endif
 
 return NIL

Index: functions.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/functions.prg,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions.prg	23 Nov 2006 11:24:03 -0000	1.6
+++ functions.prg	12 Mar 2007 17:14:23 -0000	1.7
@@ -161,7 +161,7 @@
 
 /* Network transparent resource retrieving and caching */
 function getResource(name)
-	local oErr, real, content, f, l, lFile
+	local oErr, real, content, f, l, lFile, old
 	
 	// Translate path
 	real := strtran(name, "/", "_")        
@@ -178,6 +178,8 @@
 			if valtype(content) <> 'C' .or. len(content) == 0
 				return NIL
 			endif
+			
+			old := set(_SET_TRANSLATE_PATH, .F.) // turn DOS mode off
 			f := fcreate(real)
 			if f < 0
 				eDebug( 10, "getResource(): Error open file for writing:", ferror(), ferrorstr() )
@@ -186,6 +188,8 @@
 			l := fwrite(f, content)
 			eDebug( 30, "getResource(): wrote", real, l, "bytes" )
 			fclose(f)
+			set(_SET_TRANSLATE_PATH, old)
+
 		else
 			eDebug( 30, "getResource():", real, "(cached)" )
 		endif

Index: messagemanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/messagemanager.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- messagemanager.prg	16 Jan 2007 14:23:25 -0000	1.4
+++ messagemanager.prg	12 Mar 2007 17:14:23 -0000	1.5
@@ -118,7 +118,7 @@
 			ret := map()
 			ret:error := self:exec:lastError
 			
-			if ret:error != "Method 'add' of component 'errorlog' was not found"
+			if at("'errorlog'", ret:error) == 0
 				// Pass error to administrator
 				lcomponent( "errorlog", "add", "error", ret:error )
 			endif

Index: protocol_raw.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/protocol_raw.prg,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- protocol_raw.prg	16 Jan 2007 14:23:25 -0000	1.6
+++ protocol_raw.prg	12 Mar 2007 17:14:23 -0000	1.7
@@ -9,7 +9,7 @@
 /*   published by the Free Software Foundation; either version 2 of the    */
 /*   License, or (at your option) any later version.                       */
 /*-------------------------------------------------------------------------*/
-
+#include <clipcfg.h>
 #include <tcp.ch>
 
 #define TCP_READ_TIMEOUT	6000
@@ -22,24 +22,26 @@
 
 	local obj := map()
 
-	obj:type	:= "raw"
-	obj:socket	:= map()
+	obj:type		:= "raw"
+	obj:socket		:= map()
 	obj:socket:handle := NIL
 	obj:sessions	:= array(0)
 	obj:className 	:= "EASRAWProtocol"
-	obj:params	:= params
-	obj:errno	:= 0
+	obj:params		:= params
+	obj:errno		:= 0
+	obj:lock		:= .F.
+	obj:queue		:= array(0)
 
 	_recover_EASRAWPROTOCOL(obj)
 
 return obj
 
 function _recover_EASRAWPROTOCOL(obj)
-	obj:open	:= @c_open()
-	obj:close	:= @c_close()
+	obj:open		:= @c_open()
+	obj:close		:= @c_close()
 	obj:closeSession := @c_closeSession()
-	obj:read	:= @c_read()
-	obj:write	:= @c_write()
+	obj:read		:= @c_read()
+	obj:write		:= @c_write()
 	obj:serialize	:= @c_serialize()
 	obj:deserialize	:= @c_deserialize()
 return obj
@@ -114,10 +116,10 @@
 			if (session := tcpAccept( self:socket:handle, self:socket:aTimeOut )) != -1
 				// Create new session
 				eDebug( 26, "Start new session: ", session)
-#ifdef SINGLE_CONNECTION
-				threadId := session_open(self, session) 		  // Begin session
-#else
+#ifdef USE_TASKS
 				threadId := start(@session_open(), self, session) // Begin new thread
+#else
+				threadId := session_open(self, session) 		  // Begin session
 #endif
 				eDebug( 26, "Ready for new connection")
 			endif
@@ -142,6 +144,9 @@
 			setCommand(, 'sys.transport.'+params:name, 'write', {|p| self:write(self:serialize(p)) } )
 			setCommand(, 'sys.transport.default', 'read',  {|p| self:deserialize(self:read(p)) } )
 			setCommand(, 'sys.transport.default', 'write', {|p| self:write(self:serialize(p)) } )
+#ifdef USE_TASKS
+			threadId := start(@client_session_open(), self)	
+#endif
 		endif
 	endif
 		
@@ -149,13 +154,26 @@
 
 /* Thread function for session open */
 static function session_open( s, session )
-	local oSession
+	local oSession, old
 	// Set global variables
 	set deleted on
-	set translate path off
+	old := set(_SET_TRANSLATE_PATH, .F.) // turn DOS mode off
 	oSession := EASSession( s, session )
+	set(_SET_TRANSLATE_PATH, old)
 return oSession:open()
 
+/* TODO: Thread function for client session open */
+static function client_session_open( s )
+	local session
+/*	do while( .T. )
+		if (session := tcpAccept( self:socket:handle, self:socket:aTimeOut )) != -1
+		
+		endif
+		sleep(0.01)
+	enddo
+*/
+return NIL
+
 /** Close connection */
 static function c_close( self, params )
 	if self:socket:handle != NIL
@@ -218,6 +236,9 @@
 			params := map()
 		endif
 		params:session := self:socket:handle
+		if self:lock
+			return NIL
+		endif
 	endif
 	
 	eDebug( 36, "Read from socket..." )
@@ -232,6 +253,7 @@
 
 	cBuf := space(nSize)
 	
+	self:lock := .T.
 	oErr := ErrorBlock({|e| break(e) })
 	begin sequence
 		nRead := tcpRead( params:session, @cBuf, nSize, self:socket:rTimeout )
@@ -254,9 +276,12 @@
 	recover using oErr
 		eDebug( 6, "Read error")
 		cBuffer := ''
-		nTotal  := 0 
+		nTotal  := 0
+		
 	end sequence
 	
+	self:lock := .F.
+	
 	oData:data := cBuffer
 	oData:size := nTotal
 	eDebug( 26, "Read", oData:size, "bytes,", seconds()-sec, "sec" )

Index: session.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/session.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- session.prg	15 Nov 2006 10:37:18 -0000	1.4
+++ session.prg	12 Mar 2007 17:14:23 -0000	1.5
@@ -17,6 +17,8 @@
 	local obj := map()
 
 	obj:name		:= "session_"+ltrim(str(handle))
+	obj:user		:= ""
+	obj:role		:= {}
 	obj:connection	:= connection
 	obj:handle		:= handle
 	obj:messages	:= NIL	// TODO: Message manager per session. Only for server
@@ -29,6 +31,8 @@
 	setCommand(, 'sys.transport.'+obj:name, 'login', {|p| obj:login(p) } )
 	setCommand(, 'sys.transport.'+obj:name, 'close', {|p| obj:close(p) } )
 	
+	lcomponent( 'sys.transport', 'addSession', "session", obj )
+	
 return obj
 
 function _recover_EASSESSION(obj)
@@ -73,16 +77,22 @@
 	endif
 	eDebug( 27, "Access for "+self:name+": ",self:access )
 	oWrite:answer := self:access
+	if "NAME" $ params
+		self:user := params:name
+	endif
 
 	eDebug( 27, "Answer:", oWrite:answer )
 return oWrite
 
 /** Close session */
 static function c_close( self, params )
+	// Unregister session in pool
+	lcomponent( 'sys.transport', 'removeSession', "handle", self:handle )
+	
 	removeCommand(, 'sys.transport.'+self:name, 'login' )
 	removeCommand(, 'sys.transport.'+self:name, 'close' )
 	self:connection:closeSession( self )
-	eDebug( 27, "Session closing." )
+	eDebug( 27, "Session closed." )
 return NIL
 
 /** Read data */
@@ -112,11 +122,16 @@
 		
 		eDebug( 27, "Arguments:", obj:args )
 				
-		// Translate session fo sys.transport
+		// Pass session fo sys.transport
 		if lower(obj:receiver) == 'sys.transport.default'
 			obj:receiver := 'sys.transport.'+self:name
 		endif
 		
+		// Pass user name to sendmessage
+		if lower(obj:receiver) == 'sendmessage'
+			obj:args:user := self:user
+		endif
+		
 		// Check for session.close
 		if lower(obj:receiver) == 'session' .and. lower(obj:command) == 'close'
 			//?? "SESSION CLOSE: session.close signal message&\n"
@@ -153,7 +168,7 @@
 	endif
 	
 	if .not. valtype( params ) $ 'AO' .or. ( (oData := self:connection:serialize( params )) == NIL )
-		eDebug( 17, "ERROR preparing data for write. Sending message with data.")
+		eDebug( 17, "Preparing data for write. Sending message with data.")
 		oError := map()
 		oError:data := params
 		oData := self:connection:serialize( oError )

Index: transportmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/transportmanager.prg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- transportmanager.prg	16 Jan 2007 14:23:25 -0000	1.5
+++ transportmanager.prg	12 Mar 2007 17:14:23 -0000	1.6
@@ -9,6 +9,7 @@
 /*   published by the Free Software Foundation; either version 2 of the    */
 /*   License, or (at your option) any later version.                       */
 /*-------------------------------------------------------------------------*/
+#include <clipcfg.h>
 
 /** EASTransportManager - Transport manager */
 static oCurConn
@@ -18,16 +19,20 @@
 	local obj := map(), i, cfg, sections, pkeys, pset, j, c, cstr, a
 
 	obj:connections := array(0)
+	obj:sessions 	:= array(0)
 	obj:connectionNames := array(0)
-	obj:active	:= .F.
-	obj:role	:= iif(valtype(params)=='O' .and. 'ROLE' $ params, params:role, 1)
+	obj:active		:= .F.
+	obj:role		:= iif(valtype(params)=='O' .and. 'ROLE' $ params, params:role, 1)
 	obj:className 	:= "EASTransportManager"
 
 	_recover_EASTRANSPORTMANAGER(obj)
 	
-	setCommand(, 'sys.transport', 'open',  {|p| obj:open(p) } )
-	setCommand(, 'sys.transport', 'close', {|p| obj:close(p) } )
-	setCommand(, 'sys.transport', 'addConnection', {|p| obj:addConnection(p) } )
+	setCommand(, 'sys.transport', 'open',  			{|p| obj:open(p) } )
+	setCommand(, 'sys.transport', 'close', 			{|p| obj:close(p) } )
+	setCommand(, 'sys.transport', 'addConnection', 	{|p| obj:addConnection(p) } )
+	setCommand(, 'sys.transport', 'addSession',    	{|p| obj:addSession(p) } )
+	setCommand(, 'sys.transport', 'removeSession', 	{|p| obj:removeSession(p) } )
+	setCommand(, 'sys.transport', 'sessions',      	{|p| obj:listSessions(p) } )
 
 	// Read from config file
 	cfg := EASGetConfig()
@@ -98,6 +103,9 @@
 	obj:open	  		:= @c_open()
 	obj:addConnection 	:= @c_addConnection()
 	obj:close	  		:= @c_close()
+	obj:addSession		:= @c_addSession()
+	obj:removeSession	:= @c_removeSession()
+	obj:listSessions	:= @c_listSessions()
 return obj
 
 /** Open manager */
@@ -119,10 +127,10 @@
 			// Open each connection
 			for c in self:connections
 				oCurConn := c
-#ifdef SINGLE_CONNECTION
-				threadId := connection_open()  			// Begin connection
-#else
+#ifdef USE_TASKS
 				threadId := start( @connection_open() ) // Begin thread for each connection
+#else
+				threadId := connection_open()  			// Begin connection
 #endif
 			next
 	
@@ -191,3 +199,29 @@
 	
 return NIL
 
+/** Add sesion to pool */
+static function c_addSession( self, params )
+	eDebug(16, "Add session", params)
+	if assertParameters( params, { 'session:O' } )
+		return NIL
+	endif
+	aadd( self:sessions, params:session )
+return NIL
+
+/** Remove sesion from pool */
+static function c_removeSession( self, params )
+	local p
+	eDebug(16, "Remove session", params)
+	if assertParameters( params, { 'handle:N' } )
+		return NIL
+	endif
+	p := ascan(self:sessions, {|e| e:handle == params:handle } )
+	if p > 0
+		adel( self:sessions, p )
+		asize( self:sessions, len(self:sessions) - 1 )
+	endif
+return NIL
+
+/** List all active sesions */
+static function c_listSessions( self, params )
+return self:sessions

Index: uimanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/uimanager.prg,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- uimanager.prg	16 Jan 2007 14:23:25 -0000	1.6
+++ uimanager.prg	12 Mar 2007 17:14:23 -0000	1.7
@@ -116,17 +116,17 @@
 	//eDebug(19, vRet) 
 	
 	if empty(vRet)
-		eDebug( 8, "ERROR: cannot open empty form" )
+		eDebug( 8, "Cannot open empty form" )
 		return .F.
 	endif
 	
 	if valtype(vRet) == 'O' .and. 'ERROR' $ vRet
-		eDebug( 8, "ERROR on form open:", vRet:error )
+		eDebug( 8, "Form open:", vRet:error )
 		return .F.
 	endif
 	
 	if valtype(vRet) <> 'C'
-		eDebug( 8, "ERROR on form open: return value must be string" )
+		eDebug( 8, "Form open: return value must be string" )
 		return .F.
 	endif
 
@@ -249,11 +249,12 @@
 	// Define name and columns
 	name := params:name
 	for i in params:widget:columns
-		fields += i+','
+		fields += i:name+','
 	next
 	fields += 'id'
 	
 	// Get content from server
+	//eDebug( 28, "Open view ", name, fields )
 	d := component('form', 'getView', 'name', name, 'fields', fields)
 	
 	// Apply data to widget

[Eas-dev-commit] eas/server Makefile, 1.9, 1.10 main.prg, 1.4, 1.5 pam-easserver, 1.1, 1.2

From: Andrey C. <sku...@us...> - 2007-03-12 17:14:30

Update of /cvsroot/eas-dev/eas/server
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5417/server

Modified Files:
	Makefile main.prg pam-easserver 
Log Message:
Fix some bugs. Add sessions support

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/server/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	20 Nov 2006 12:57:55 -0000	1.9
+++ Makefile	12 Mar 2007 17:14:24 -0000	1.10
@@ -7,7 +7,7 @@
 include ../Makefile.var
 CLIPINCLUDE= -I$(CLIPROOT)/include
 CLIP = $(CLIPROOT)/bin/clip
-CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat
+CLIPLIBS  = -L../libeas -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat
 EASLIBS   = -leas
 CLIPFLAGS = -aObw $(BUILDFLAGS)
 AUTHLIBS  = -lpam
@@ -24,7 +24,7 @@
 
 OBJS = main.o
 
-all: $(DAEMON) easserver.ini $(AUTH)
+all: $(PRG) $(DAEMON) easserver.ini $(AUTH)
 
 $(DAEMON): easd.in
 	cat easd.in | sed -e 's|BINROOT|$(EASBINDIR)|g;s|SERVERROOT|$(EASLOGDIR)|g;s|CLIPROOT|$(CLIPROOT)|g' >$(DAEMON)
@@ -42,10 +42,11 @@
 clean:
 	rm -f *.o core *.core $(PRG) $(DAEMON) $(AUTH) *.log *.nm *.ex *.exe *.so easserver.ini
 
-install: all $(PRG)
+install: all
 	@../mkinstalldirs $(DESTDIR)$(EASBINDIR)
 	@../mkinstalldirs $(DESTDIR)$(EASDATADIR)/server/
-	../mkinstalldirs $(DESTDIR)$(EASDBPATH)
+	@../mkinstalldirs $(DESTDIR)$(EASDBPATH)
+	@../mkinstalldirs $(DESTDIR)$(CLIPROOT)/bin
 	$(CLIPROOT)/bin/clip_cp $(PRG) $(DESTDIR)$(EASBINDIR)
 	cp $(AUTH) $(DESTDIR)$(CLIPROOT)/bin
 	chown root.root $(DESTDIR)$(CLIPROOT)/bin/$(AUTH)
@@ -82,8 +83,8 @@
 	[ `uname -s` = "Linux" ] && make linuxuninstall
 
 linuxuninstall:
-	userdel easserver >/dev/null 2>&1
-	groupdel easserver >/dev/null 2>&1
+	userdel easserver >/dev/null 2>&1 || echo -n ""
+	groupdel easserver >/dev/null 2>&1 || echo -n ""
 	rm -f  $(DESTDIR)/etc/rc.d/init.d/easd >/dev/null 2>&1
 	rm -rf $(DESTDIR)/etc/eas >/dev/null 2>&1
 	rm -rf $(DESTDIR)$(EASLOGDIR) >/dev/null 2>&1

Index: main.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/server/main.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- main.prg	15 Nov 2006 10:37:18 -0000	1.4
+++ main.prg	12 Mar 2007 17:14:24 -0000	1.5
@@ -26,6 +26,7 @@
 	
 	set macro_in_string off
 	set translate path off
+	
 	begin sequence
 
 		lang := left(getenv("LANG"),2)
@@ -41,7 +42,7 @@
 		for i:=1 to pcount()
 			aadd(params, param(i))
 		next
-	
+		
 		// Set debug level
 		eSetDebugLevel( DEBUG )
 		
@@ -54,6 +55,7 @@
 			eSetDebugLevel( cfg:getValue("SERVER","DEBUG") )
 		endif
 			
+		
 		// Prepare directory for log and cache
 		if .not. checkWorkPlace()
 			eDebug( 1, "Unable to set server root directory" )

Index: pam-easserver
===================================================================
RCS file: /cvsroot/eas-dev/eas/server/pam-easserver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pam-easserver	2 Jun 2006 14:49:00 -0000	1.1
+++ pam-easserver	12 Mar 2007 17:14:24 -0000	1.2
@@ -1,13 +1,6 @@
-#
-# /etc/pam.d/other - specify the PAM fallback behaviour
-#
-
-# We fall back to the pam_unix modules. If this is not secure
-# enough for your purpose, consider specifying pam_deny.so
-# instead.
-# 
-
-auth     required       pam_unix.so
-account  required       pam_unix.so
-password required       pam_unix.so
-session  required       pam_unix.so
+#%PAM-1.0
+# /etc/pam.d/easserver - PAM behaviour for E/AS server
+auth     include        system-auth
+account  include        system-auth
+password include        system-auth
+session  include        system-auth
\ No newline at end of file

[Eas-dev-commit] eas INSTALL, 1.6, 1.7 README, 1.8, 1.9 TODO, 1.5, 1.6 VERSION, 1.10, 1.11 configure, 1.8, 1.9

From: Andrey C. <sku...@us...> - 2007-03-12 17:14:30

Update of /cvsroot/eas-dev/eas
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5417

Modified Files:
	INSTALL README TODO VERSION configure 
Log Message:
Fix some bugs. Add sessions support

Index: INSTALL
===================================================================
RCS file: /cvsroot/eas-dev/eas/INSTALL,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- INSTALL	8 Nov 2006 09:42:35 -0000	1.6
+++ INSTALL	12 Mar 2007 17:14:22 -0000	1.7
@@ -4,8 +4,7 @@
 
 1. Go to http://eas.lrn.ru/index.php?module=download and download latest 
 versions:
-- clip-prg >= 1.2.0
-- ocmng
+- clip-prg with components (from CVS)
 - eas
 
 2. Unpack downloaded packages
@@ -43,15 +42,12 @@
 3. Check if exist libraries in $CLIPROOT/lib:
 libclip-codb.so
 libcodb-query.so
-libclip-gtk.so and/or libclip-gtk2.so
+libclip-gtk2.so
 libclip-ui.so
 libclip-xml.so
+libclip-postscript.so
 If any library is absent, check error messages and rebuild CLIP
 
-4. Set path to CLIP libraries:
-echo "$CLIPROOT/lib" >> /etc/ld.so.conf
-/sbin/ldconfig
-
 
 STEP 3: Install E/AS
 ====================
@@ -73,7 +69,7 @@
 	chkconfig easd off
 	
 	
-STEP 4: Install ocmng and components
+STEP 4: Install components
 ====================================
 
 1. Set path to created CODB databases:
@@ -86,14 +82,15 @@
 Note: if you cannot install system-wide, set CODBROOT to directory in your
 home directory.
 
-2. Go to unpacked ocmng directory and run command:
+2. Go to unpacked CLIP components directory and run command:
 
 	make
+	cd eas
+	make
 	
 3. Install components:
 
-	ocmng install ALL
-	ocmng install EAS/ALL
+	$CLIPROOT/bin/ocmng install ALL
 	
 If you have error to update core ocmng components (ocmng/*.xmo), 
 please remove manually $CLIPROOT/etc/codb.*

Index: README
===================================================================
RCS file: /cvsroot/eas-dev/eas/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- README	16 Jan 2007 14:23:25 -0000	1.8
+++ README	12 Mar 2007 17:14:22 -0000	1.9
@@ -7,8 +7,8 @@
 
 Type:    Software platform
 Name:    E/AS
-Version: 20070116 (snapshot)
-Date:	 16 Jan 2007
+Version: 20070312 (snapshot)
+Date:	 12 Mar 2007
 
 Author:  Andrey (Skull) Cherepanov <sk...@ea...>
 License: GNU General Public License (GPL) v.2
@@ -34,7 +34,7 @@
 
 Requires
 --------
-- CLIP >= 1.2.0 (with clip-gtk, clip-gtk2, clip-ui, clip-xml, clip-codb and codb-query)
+- CLIP >= 1.2.0 (with clip-gtk2, clip-ui, clip-xml, clip-codb, codb-query, clip-postscript)
 - PAM
 
 

Index: TODO
===================================================================
RCS file: /cvsroot/eas-dev/eas/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TODO	8 Nov 2006 09:42:35 -0000	1.5
+++ TODO	12 Mar 2007 17:14:22 -0000	1.6
@@ -2,29 +2,41 @@
 E/AS TODO
 =========
 
-Last change: 08 Nov 2006
+Last change: 15 Feb 2007
 
 ______________________________________________________________________________
 
 
-Plans for eas-0.2.2 (End of 2006)
------------------------------------
+Plans for eas-0.2.2 (May 2007)
+------------------------------
+
+completed:
 + move libcodb_query to CLIP
-- pass error via messages (for example, in db operations)
-- debug levels policy
-+ libcodb_query: support comments, DROP and other TODOs
-- manipulation with table embed in object form
-- visual component manager (in client)
++ pass error via messages (for example, in db operations)
++ debug levels policy
++ editable table widget
 + visual database console (in client)
-- print forms (XPL) support
-- support Glade and QT designer form formats in UIForm
-- download components from project site
++ print forms (XPL) support
++ support Glade and QT designer form formats in UIForm
 + i18n support
++ check success of saved object before closing
++ define format of valued fields in interface forms
+
+processed:
+- popup message from server (like in IM client)
+- libcodb_query: support comments, DROP and other TODOs
+- smart list update
+- component manager with download components from project site
+- visual component manager (in client)
+- adapt R2D2 configuration
 - binary packages: RPM and possible other binary format
-- check success of saved object before closing
-+ libcodb_query: no indent by M attribute width
 ______________________________________________________________________________
 
+Next version:
+-------------
+- accept income connection for client in separate thread (not timer)
+
+______________________________________________________________________________
 
 See http://eas.lrn.ru/module=requires (on Russian) and following issues:
 

Index: VERSION
===================================================================
RCS file: /cvsroot/eas-dev/eas/VERSION,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- VERSION	16 Jan 2007 14:23:25 -0000	1.10
+++ VERSION	12 Mar 2007 17:14:22 -0000	1.11
@@ -1 +1 @@
-20070116
+20070312

Index: configure
===================================================================
RCS file: /cvsroot/eas-dev/eas/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure	16 Jan 2007 14:23:25 -0000	1.8
+++ configure	12 Mar 2007 17:14:22 -0000	1.9
@@ -264,6 +264,21 @@
 fi
 echo "yes" 1>&6
 
+# Check clip-postscript
+echo $ac_n "checking for a clip-postscript library""... $ac_c" 1>&6
+echo "configure:$LINENO: checking for a clip-postscript" >&5
+
+prg=$CLIPROOT/lib/libclip-postscript.so
+if test ! -f "$prg"; then
+	echo "Library '$prg' does not found. Configure and install clip-postscript from CLIPDISTRO/cliplibs/clip-postscript directory or appropriate binary package." 2>&6
+	exit
+fi
+echo "yes"
+
+#
+# Check programs
+#
+
 # Check ocmng
 echo $ac_n "checking for ocmng""... $ac_c" 1>&6
 echo "configure:$LINENO: checking for ocmng" >&5
@@ -275,21 +290,6 @@
 fi
 echo "yes" 1>&6
 
-# Check clip-gtkextra
-#echo $ac_n "checking for a clip-gtkextra library""... $ac_c" 1>&6
-#echo "configure:$LINENO: checking for a clip-gtkextra" >&5
-
-#prg=$CLIPROOT/lib/libclip-gtkextra.so
-#if test ! -f "$prg"; then
-#	echo "Library '$prg' does not found. Configure and install clip-gtkextra from CLIPDISTRO/cliplibs/clip-gtkextra directory or appropriate binary package." 2>&6
-#	exit
-#fi
-#echo "yes"
-
-#
-# Check programs
-#
-
 # TODO Check wget
 #echo $ac_n "checking for wget""... $ac_c" 1>&6
 #echo "configure:$LINENO: checking for wget" >&5
@@ -432,18 +432,18 @@
 echo "BUILDFLAGS=$flags"	>> Makefile.var
 
 # Check libpthread version
-thread=""
-v=`ls --file-type /lib/libpthread-*.so | sed -n '1p' | tr -d '\n' | sed 's|/lib/libpthread-\([0-9.]*\)\.so|\1|'`
-rv=( `echo "$BAD_LIBPTHREAD" | tr '.' ' '` )
-v=( `echo "$v" | tr '.' ' '` )
+#thread=""
+#v=`ls --file-type /lib/libpthread-*.so | sed -n '1p' | tr -d '\n' | sed 's|/lib/libpthread-\([0-9.]*\)\.so|\1|'`
+#rv=( `echo "$BAD_LIBPTHREAD" | tr '.' ' '` )
+#v=( `echo "$v" | tr '.' ' '` )
 # Compare pair of elements in rv and v
-i=0
-for vp in ${rv[@]}; do
-	if test "$vp" -le "${v[$i]}"; then
-		echo -e "\nWARNING!\nYour glibc version does not support CLIP threads correctly.\nSoftware will be build to use only one thread (one connection to server).\n" 2>&6
-		thread="-DSINGLE_CONNECTION"
-		break
-	fi
-	(( i += 1 ))
-done
+#i=0
+#for vp in ${rv[@]}; do
+#	if test "$vp" -le "${v[$i]}"; then
+#		echo -e "\n  WARNING!\n  Your glibc version does not support CLIP threads correctly.\n  Software will be build to use only one thread (one connection to server).\n" 2>&6
+#		thread="-DSINGLE_CONNECTION"
+#		break
+#	fi
+#	(( i += 1 ))
+#done
 echo "THREAD=$thread"		>> Makefile.var

[Eas-dev-commit] eas/doc index.docbook, 1.2, 1.3 index.ru.docbook, 1.1, 1.2

From: Andrey C. <sku...@us...> - 2007-03-12 17:14:29

Update of /cvsroot/eas-dev/eas/doc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5417/doc

Modified Files:
	index.docbook index.ru.docbook 
Log Message:
Fix some bugs. Add sessions support

Index: index.docbook
===================================================================
RCS file: /cvsroot/eas-dev/eas/doc/index.docbook,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.docbook	8 Nov 2006 09:42:35 -0000	1.2
+++ index.docbook	12 Mar 2007 17:14:23 -0000	1.3
@@ -95,7 +95,7 @@
 		<filename>clip-ui</filename>, 
 		<filename>clip-xml</filename>, 
 		<filename>clip-codb</filename>, 
-		<filename>codb_query</filename>.
+		<filename>codb-query</filename>.
 	</para></listitem>
 	<listitem><para><acronym>PAM</acronym> libraries and headers.</para></listitem>
 </itemizedlist>

Index: index.ru.docbook
===================================================================
RCS file: /cvsroot/eas-dev/eas/doc/index.ru.docbook,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.ru.docbook	8 Nov 2006 09:42:35 -0000	1.1
+++ index.ru.docbook	12 Mar 2007 17:14:23 -0000	1.2
@@ -186,7 +186,7 @@
 >, <filename
 >clip-codb</filename
 >, <filename
->codb_query</filename
+>codb-query</filename
 >. </para
 ></listitem>
 	<listitem

[Eas-dev-commit] eas/client Makefile,1.6,1.7 main.prg,1.12,1.13

From: Andrey C. <sku...@us...> - 2007-03-12 17:14:27

Update of /cvsroot/eas-dev/eas/client
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5417/client

Modified Files:
	Makefile main.prg 
Log Message:
Fix some bugs. Add sessions support

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	20 Nov 2006 12:57:55 -0000	1.6
+++ Makefile	12 Mar 2007 17:14:22 -0000	1.7
@@ -7,7 +7,7 @@
 include ../Makefile.var
 CLIPINCLUDE= -I$(CLIPROOT)/include
 CLIP = $(CLIPROOT)/bin/clip
-CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat
+CLIPLIBS  = -L../libeas -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat -lclip-postscript
 EASLIBS   = -leas
 CLIPFLAGS = -aObw $(BUILDFLAGS)
 ICONS = eas-logo.xpm eas.xpm
@@ -20,16 +20,15 @@
 
 OBJS = main.o
 
-all:
+all: $(PRG)
 
 clean:
 	rm -f *.o core *.core $(PRG) *.log *.nm *.ex *.exe *.so
 
 $(PRG): $(OBJS)
-#	export LIBRARY_PATH=
 	$(CLIP) $(CLIPFLAGS) -esl $(CLIPINCLUDE) -o $(PRG) $(OBJS) $(CLIPLIBS) $(EASLIBS)
 
-install: all $(PRG)
+install: all
 	@../mkinstalldirs $(DESTDIR)$(EASBINDIR)
 	@../mkinstalldirs $(DESTDIR)$(EASDATADIR)/client/icons
 	$(CLIPROOT)/bin/clip_cp $(PRG) $(DESTDIR)$(EASBINDIR)

Index: main.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/main.prg,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- main.prg	20 Nov 2006 12:57:55 -0000	1.12
+++ main.prg	12 Mar 2007 17:14:22 -0000	1.13
@@ -18,6 +18,7 @@
 // Default connection values
 #define C_HOST		"localhost"
 #define C_PORT		"3000"
+#define SERVER_TICK	5  // 5 sec
 
 // Main form name
 #define EAS_MAIN_FORM "main"
@@ -68,9 +69,13 @@
 		messages := EASMessageManager() // Run without parameters: client
 	
 		// Sets slots for client interrupts 
+		
 		/* Show connection dialog if transport settings doesn't exist */
 		setSlot(messages, 'sys.transport.failed', {|msg| connectionDialog( msg ) })
 		
+		/* Process server message */
+		setSlot(messages, 'sys.transport.received', {|msg| processServerMessage( msg ) })
+		
 		// Open message manager
 		loginInProgress := 0
 		messages:open()
@@ -279,6 +284,41 @@
 
 return
 
+/* Process server message: show IM message or update lists */
+function processServerMessage( msg )
+	local name, dt, text
+	
+	if valtype(msg) != "O" .or. .not. "TYPE" $ msg
+		return
+	endif
+	
+	eDebug( 21, "Server message:", msg )
+	
+	if lower(msg:type) == "message"
+		
+		// Fill fields
+		name := iif("NAME" $ msg, msg:name, "")
+		dt   := iif("CREATED" $ msg, msg:created, "")
+		text := iif("TEXT" $ msg, msg:text, "")
+		
+		eDebug( 22, "IM message from " + name + " (" + dt + ") " + text )
+		
+		// Show dialog
+		if loginWindow != NIL
+			loginWindow:dialogBox(i18n("New message"), ;
+				i18n("From: ") + name + chr(10) + ;
+				i18n("Sent: ") + dt + chr(10) + chr(10) + ;
+				text ;
+				,,, NIL, IMG_OK)
+		endif
+	
+	elseif lower(msg:type) == "update"
+		// TODO: update message
+		eDebug( 22, "update list" )
+	endif
+	
+return
+
 /* Begin session based on connection dialog */
 function sessionBegin(win)
 	local cfg, cHost, cPort, cUser, cPass, conn:=map()

[Eas-dev-commit] ocmng/tests CORE.xml, 1.1, NONE testclass1.xml, 1.1, NONE testclass2.xml, 1.1, NONE testplugin.prg, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:49:03

Update of /cvsroot/eas-dev/ocmng/tests
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/tests

Removed Files:
	CORE.xml testclass1.xml testclass2.xml testplugin.prg 
Log Message:
Move ocmng to CLIP components directory

--- CORE.xml DELETED ---

--- testclass1.xml DELETED ---

--- testclass2.xml DELETED ---

--- testplugin.prg DELETED ---

[Eas-dev-commit] ocmng/ref2 ALL.xml,1.1,NONE GBL02.xml,1.1,NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:49:03

Update of /cvsroot/eas-dev/ocmng/ref2
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ref2

Removed Files:
	ALL.xml GBL02.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- GBL02.xml DELETED ---

[Eas-dev-commit] ocmng/components/ref1/ru_UDM ALL.xml, 1.1, NONE okato.1, 1.1, NONE okato.2, 1.1, NONE okato.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:49:03

Update of /cvsroot/eas-dev/ocmng/components/ref1/ru_UDM
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ref1/ru_UDM

Removed Files:
	ALL.xml okato.1 okato.2 okato.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- okato.1 DELETED ---

--- okato.2 DELETED ---

--- okato.xml DELETED ---

[Eas-dev-commit] ocmng/components/ref1/ru ALL.xml, 1.1, NONE GBL01.xml, 1.1, NONE _a1, 1.1, NONE country.xml, 1.1, NONE currency.xml, 1.1, NONE taxcause.xml, 1.1, NONE taxcode.xml, 1.1, NONE taxtype.xml, 1.1, NONE unit2unit.prg, 1.1, NONE unit2unit.xml, 1.1, NONE units.xml, 1.1, NONE void.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:49:01

Update of /cvsroot/eas-dev/ocmng/components/ref1/ru
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ref1/ru

Removed Files:
	ALL.xml GBL01.xml _a1 country.xml currency.xml taxcause.xml 
	taxcode.xml taxtype.xml unit2unit.prg unit2unit.xml units.xml 
	void.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- GBL01.xml DELETED ---

--- _a1 DELETED ---

--- country.xml DELETED ---

--- currency.xml DELETED ---

--- taxcause.xml DELETED ---

--- taxcode.xml DELETED ---

--- taxtype.xml DELETED ---

--- unit2unit.prg DELETED ---

--- unit2unit.xml DELETED ---

--- units.xml DELETED ---

--- void.xml DELETED ---

[Eas-dev-commit] ocmng/ref1 ALL.xml, 1.1, NONE README, 1.1, NONE _a1, 1.1, NONE okato.2, 1.1, NONE void.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:58

Update of /cvsroot/eas-dev/ocmng/ref1
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ref1

Removed Files:
	ALL.xml README _a1 okato.2 void.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- README DELETED ---

--- _a1 DELETED ---

--- okato.2 DELETED ---

--- void.xml DELETED ---

[Eas-dev-commit] ocmng/r2d2 ALL.xml, 1.1, NONE ETC01.xml, 1.1, NONE acc_db.xml, 1.1, NONE connection.xml, 1.1, NONE void.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:57

Update of /cvsroot/eas-dev/ocmng/r2d2
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/r2d2

Removed Files:
	ALL.xml ETC01.xml acc_db.xml connection.xml void.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- ETC01.xml DELETED ---

--- acc_db.xml DELETED ---

--- connection.xml DELETED ---

--- void.xml DELETED ---

[Eas-dev-commit] ocmng/components/ref1/ru_UDM ALL.xml, 1.1, NONE okato.1, 1.1, NONE okato.2, 1.1, NONE okato.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:57

Update of /cvsroot/eas-dev/ocmng/components/ref1/ru_UDM
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/components/ref1/ru_UDM

Removed Files:
	ALL.xml okato.1 okato.2 okato.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- okato.1 DELETED ---

--- okato.2 DELETED ---

--- okato.xml DELETED ---

[Eas-dev-commit] ocmng/components/ocmng/security auth.prg, 1.2, NONE auth.xml, 1.2, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:57

Update of /cvsroot/eas-dev/ocmng/components/ocmng/security
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ocmng/security

Removed Files:
	auth.prg auth.xml 
Log Message:
Move ocmng to CLIP components directory

--- auth.prg DELETED ---

--- auth.xml DELETED ---

[Eas-dev-commit] ocmng/components/ocmng/forms create.xpm, 1.1, NONE delete.xpm, 1.1, NONE edit.xpm, 1.1, NONE form.prg, 1.4, NONE form.xml, 1.4, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:56

Update of /cvsroot/eas-dev/ocmng/components/ocmng/forms
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ocmng/forms

Removed Files:
	create.xpm delete.xpm edit.xpm form.prg form.xml 
Log Message:
Move ocmng to CLIP components directory

--- create.xpm DELETED ---

--- delete.xpm DELETED ---

--- edit.xpm DELETED ---

--- form.prg DELETED ---

--- form.xml DELETED ---

[Eas-dev-commit] ocmng/components/ocmng ALL.xml, 1.1, NONE EAS.xml, 1.1, NONE ETC01.xml, 1.3, NONE Makefile, 1.1, NONE author.xml, 1.3, NONE category.xml, 1.2, NONE component.xml, 1.4, NONE dependence.xml, 1.1, NONE vendor.xml, 1.2, NONE void.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:56

Update of /cvsroot/eas-dev/ocmng/components/ocmng
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/ocmng

Removed Files:
	ALL.xml EAS.xml ETC01.xml Makefile author.xml category.xml 
	component.xml dependence.xml vendor.xml void.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- EAS.xml DELETED ---

--- ETC01.xml DELETED ---

--- Makefile DELETED ---

--- author.xml DELETED ---

--- category.xml DELETED ---

--- component.xml DELETED ---

--- dependence.xml DELETED ---

--- vendor.xml DELETED ---

--- void.xml DELETED ---

[Eas-dev-commit] ocmng/equipment ACC00.xml, 1.1, NONE ALL.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:55

Update of /cvsroot/eas-dev/ocmng/equipment
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/equipment

Removed Files:
	ACC00.xml ALL.xml 
Log Message:
Move ocmng to CLIP components directory

--- ACC00.xml DELETED ---

--- ALL.xml DELETED ---

[Eas-dev-commit] ocmng/configs ocmng.xml,1.1,NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:54

Update of /cvsroot/eas-dev/ocmng/configs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/configs

Removed Files:
	ocmng.xml 
Log Message:
Move ocmng to CLIP components directory

--- ocmng.xml DELETED ---

[Eas-dev-commit] ocmng/components/tests CORE.xml, 1.1, NONE testclass1.xml, 1.1, NONE testclass2.xml, 1.1, NONE testplugin.prg, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:54

Update of /cvsroot/eas-dev/ocmng/components/tests
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/components/tests

Removed Files:
	CORE.xml testclass1.xml testclass2.xml testplugin.prg 
Log Message:
Move ocmng to CLIP components directory

--- CORE.xml DELETED ---

--- testclass1.xml DELETED ---

--- testclass2.xml DELETED ---

--- testplugin.prg DELETED ---

[Eas-dev-commit] ocmng/employee ACC00.xml, 1.1, NONE ALL.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:54

Update of /cvsroot/eas-dev/ocmng/employee
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/employee

Removed Files:
	ACC00.xml ALL.xml 
Log Message:
Move ocmng to CLIP components directory

--- ACC00.xml DELETED ---

--- ALL.xml DELETED ---

[Eas-dev-commit] ocmng/components/ref2 ALL.xml, 1.1, NONE GBL02.xml, 1.1, NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:54

Update of /cvsroot/eas-dev/ocmng/components/ref2
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/components/ref2

Removed Files:
	ALL.xml GBL02.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- GBL02.xml DELETED ---

[Eas-dev-commit] ocmng/components/configs ocmng.xml,1.1,NONE

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:53

Update of /cvsroot/eas-dev/ocmng/components/configs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/components/configs

Removed Files:
	ocmng.xml 
Log Message:
Move ocmng to CLIP components directory

--- ocmng.xml DELETED ---

From: Andrey C. <sku...@us...> - 2007-02-13 09:48:52

Update of /cvsroot/eas-dev/ocmng/components/ref1/ru
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30695/components/ref1/ru

Removed Files:
	ALL.xml GBL01.xml _a1 country.xml currency.xml taxcause.xml 
	taxcode.xml taxtype.xml unit2unit.prg unit2unit.xml units.xml 
	void.xml 
Log Message:
Move ocmng to CLIP components directory

--- ALL.xml DELETED ---

--- GBL01.xml DELETED ---

--- _a1 DELETED ---

--- country.xml DELETED ---

--- currency.xml DELETED ---

--- taxcause.xml DELETED ---

--- taxcode.xml DELETED ---

--- taxtype.xml DELETED ---

--- unit2unit.prg DELETED ---

--- unit2unit.xml DELETED ---

--- units.xml DELETED ---

--- void.xml DELETED ---

Flat | Threaded

1 2 3 .. 25 > >> (Page 1 of 25)

2003	Jan (69)	Feb (122)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2004	Jan	Feb	Mar (56)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr	May	Jun (237)	Jul	Aug	Sep (1)	Oct (14)	Nov (72)	Dec
2007	Jan (2)	Feb (37)	Mar (5)	Apr	May (2)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec