[Eas-dev-commit] eas/libeas Makefile, 1.1, 1.2 componentmanager.prg, 1.4, 1.5 dbmanager.prg, 1.3, 1.4 execmanager.prg, 1.4, 1.5 functions.prg, 1.4, 1.5 transportmanager.prg, 1.3, 1.4 uimanager.prg, 1.4, 1.5

[Andrey C. <sku...@us...>]

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

Modified Files:
	Makefile componentmanager.prg dbmanager.prg execmanager.prg 
	functions.prg transportmanager.prg uimanager.prg 
Log Message:
Fix configure for check clip-ui drivers and PAM. By default gtk2 driver is used.

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	2 Jun 2006 14:32:45 -0000	1.1
+++ Makefile	20 Nov 2006 12:57:55 -0000	1.2
@@ -1,20 +1,18 @@
 # This is a part of E/AS library
 #
-# Copyright (C) 2005 by E/AS Software Foundation
+# Copyright (C) 2005-2006 by E/AS Software Foundation
 # Author: Andrey Cherepanov <sk...@ea...>
 include $(CLIPROOT)/include/Makefile.inc
+include ../Makefile.var
 
 CLIPINCLUDE = -I$(CLIPROOT)/include
 CLIP = $(CLIPROOT)/bin/clip
 
 .SUFFIXES: .prg .o .po
 
-# Here you can define appropriate compile settings
-#C_FLAGS=-Wall -g -I. $(CLIPINCLUDE)
-#CC=gcc
 TARGET  = libeas$(DLLSUFF)
 RTARGET = libeas$(DLLREALSUFF)
-
+CLIPFLAGS = -aObw $(BUILDFLAGS)
 OBJS    = componentmanager.o config.o connection.o dbmanager.o execmanager.o \
 	  messagemanager.o protocol_raw.o session.o transportmanager.o \
 	  uimanager.o functions.o
@@ -44,16 +42,4 @@
 dist: distclean
 
 .prg.o: clip-ui.ch
-	$(CLIP) $(CLIPINCLUDE) $<
-
-commit:
-	_cvs commit
-
-update:
-	_cvs update -dP
-
-ucommit:
-	_cvs update -dP && _cvs commit
-
-shell:
-	sh
+	$(CLIP) $(CLIPFLAGS) $(CLIPINCLUDE) $(EASDEF) $<

Index: componentmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/componentmanager.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- componentmanager.prg	15 Nov 2006 10:37:18 -0000	1.4
+++ componentmanager.prg	20 Nov 2006 12:57:55 -0000	1.5
@@ -14,6 +14,7 @@
 
 #define OCMNG_REPOSITORY 		'ETC0101'
 #define OCMNG_COMMANDS_CLASS 	'mng_command'
+#define OCMNG_COMPONENT_CLASS 	'mng_component'
 #define COMPONENT_SECTION		'COMPONENT_MANAGER'
 
 function EASComponentManager( params )
@@ -157,7 +158,7 @@
 	
 	// Query database
 	q:db := OCMNG_REPOSITORY
-	q:query := "select component_name from "+OCMNG_COMPONENT_CLASS+";"
+	q:query := "select component_name from " + OCMNG_COMPONENT_CLASS + ";"
 	a := sendMessage(,'sys.db', 'execute', q )
 	eDebug( 35, "DB returns:", a )
 
@@ -165,12 +166,12 @@
 
 /** Get component commands list */
 static function c_commands( self, params )
-	local q:=map(), a, i, j, name, res:=array(0), cname
+	local q:=map(), a, i, j, name, res:=array(0), cname, obj
 	eDebug( 25, "Component commands" )
 	
 	// Query database
 	q:db := OCMNG_REPOSITORY
-	q:query := "select component_name,name from "+OCMNG_COMMANDS_CLASS+";"
+	q:query := "select component_name,name from " + OCMNG_COMMANDS_CLASS + ";"
 	a := sendMessage(,'sys.db', 'execute', q )
 	eDebug( 35, "DB returns:", a )
 

Index: dbmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/dbmanager.prg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbmanager.prg	15 Nov 2006 10:37:18 -0000	1.3
+++ dbmanager.prg	20 Nov 2006 12:57:55 -0000	1.4
@@ -67,7 +67,7 @@
 
 /** Execute query (return object instead array as in execute()) */
 static function c_executeExt( self, params )
-	local res
+	local res, fmt
 	if assertParameters( params, { 'query:C' } )
 		return res
 	endif

Index: execmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/execmanager.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- execmanager.prg	15 Nov 2006 10:37:18 -0000	1.4
+++ execmanager.prg	20 Nov 2006 12:57:55 -0000	1.5
@@ -52,7 +52,7 @@
 /** Execute command */
 static function c_execute( self, params )
 	// params: receiver:C, command:C, args:AO, sender:C
-	local i, j, bCode, vRet, id
+	local i, j, bCode, vRet, id, slot_list
 	
 	self:lastError := NIL
 	

Index: functions.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/functions.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- functions.prg	15 Nov 2006 10:37:18 -0000	1.4
+++ functions.prg	20 Nov 2006 12:57:55 -0000	1.5
@@ -18,7 +18,7 @@
 	local tm:=seconds(), msg, ret, args, pc:=pcount(), i, params:=NIL, p1, p2
 	
 	if pc == 1 .and. valtype(param(1)) == 'A'
-		params := param[1]
+		params := param(1)
 		pc := len(params)
 	endif
 
@@ -179,7 +179,7 @@
 		endif
 	recover using oErr
 		eDebug( 10, "getResource(): Internal error:",errorMessage(oErr))
-		return o
+		return NIL
 	end sequence
 	
 return real

Index: transportmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/transportmanager.prg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- transportmanager.prg	15 Nov 2006 10:37:18 -0000	1.3
+++ transportmanager.prg	20 Nov 2006 12:57:55 -0000	1.4
@@ -137,7 +137,7 @@
 		
 	recover using oErr
 		eDebug( 6, "Open connection error:", errorMessage(oErr) )
-		return o
+		return .F.
 	end sequence
 	
 return .F.
@@ -153,7 +153,7 @@
 		ret := connection:open()
 	recover using oErr
 		eDebug( 6, "Open connection:", errorMessage(oErr) )
-		return o
+		return NIL
 	end sequence
 return ret
 

Index: uimanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/uimanager.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- uimanager.prg	15 Nov 2006 10:37:18 -0000	1.4
+++ uimanager.prg	20 Nov 2006 12:57:55 -0000	1.5
@@ -51,12 +51,16 @@
 
 /** Init UI manager */
 static function c_init( self, params )
+	local cfg
 	
 	// Check config file
 	cfg := EASGetConfig()
 	if valtype(cfg) == 'O' .and. cfg:className == "EASConfig" .and. .not. empty(cfg:driver)
 		eDebug( 28, "Used driver:", cfg:driver )
 		useDriver( cfg:driver )
+	elseif .not. empty( EAS_UIDRIVER )
+		eDebug( 28, "Used driver:", EAS_UIDRIVER )
+		useDriver( EAS_UIDRIVER )
 	endif
 
 	self:ws  := UIWorkSpace() // TODO: params
@@ -92,7 +96,7 @@
 static function c_openForm( self, params )
 	// params: form:C
 	local oErr, name, vRet, form, parent, t
-	local formType, objId, action, class
+	local formType, objId, action, class, win
 	
 	// Check params
 	if assertParameters( params, { 'name:C' } )
@@ -174,8 +178,8 @@
 		win:show()
 	
 	recover using oErr
-		eDebug( 8, "Internal error:",errorMessage(oErr) )
-		return o
+		eDebug( 8, "Internal error:", errorMessage(oErr) )
+		return .F.
 	end sequence
 
 	eDebug( 28, "End open form" )