eas-dev-commit Mailing List for E/AS (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Log Message:
Directory /cvsroot/eas-dev/ocmng/r2d2 added to the repository





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

Log Message:
Directory /cvsroot/eas-dev/ocmng/ref1 added to the repository





Update of /cvsroot/eas-dev/ocmng/acc-kernel
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2291/acc-kernel

Log Message:
Directory /cvsroot/eas-dev/ocmng/acc-kernel added to the repository





Update of /cvsroot/eas-dev/ocmng/EAS/admin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2262/admin

Log Message:
Directory /cvsroot/eas-dev/ocmng/EAS/admin added to the repository





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

Log Message:
Directory /cvsroot/eas-dev/ocmng/EAS/forms added to the repository





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

Log Message:
Directory /cvsroot/eas-dev/ocmng/EAS added to the repository





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

Added Files:
	Makefile index.docbook index.pot version.sgml 
Log Message:
Add localization and documentation, small fixes.

--- NEW FILE: index.docbook ---
<?xml version="1.0" encoding="utf-8"?>
<!--
    This is a part of E/AS distribution.
    You can find it on the Web: http://eas.lrn.ru

    Copyright (C) 2004 by E/AS Software Foundation.
    Author: Andrey Cherepanov <sib...@ma...>
    Last change: 31 May 2004.

    This program is free software; you can redistribute it and/or modify it 
    under the terms of the GNU General Public License as published by the 
    Free Software Foundation; either version 2 of the License, or (at your 
    option) any later version.
-->
<!--
    TODO:
    	- check optional definition
	- describe ALL fields and methods
	- fix all TODO in this document
[...3415 lines suppressed...]
	<variablelist>&args;
	    <varlistentry><term><parameter>value</parameter> [Type: <type>number|string|date|boolean|NIL</type>]</term>
		<listitem><para>Transformed value.</para></listitem></varlistentry>
	    <varlistentry><term><parameter>format</parameter> &type_num;</term>
		<listitem><para>Format for translation to string. <emphasis>Now is not implemented yet</emphasis>. &optional;</para></listitem></varlistentry>
	</variablelist>
	</listitem></varlistentry>
   <varlistentry><term><function>XMLGetTag(<parameter>root</parameter>, <parameter>path</parameter>)</function></term>
	<listitem><para>Get element by specified hierarchy.</para>
	<variablelist>&args;
	    <varlistentry><term><parameter>root</parameter> [Type: <type>XMLTag</type>]</term>
		<listitem><para>Element from which lookup is begun.</para></listitem></varlistentry>
	    <varlistentry><term><parameter>path</parameter> &type_str;</term>
		<listitem><para>Hierarchy as tag names (in upper case) delimited by dots. For example, if queried <quote><constant>HEAD.VALUE</constant></quote> will be lookup first child element with name 'head' and its child element with name 'value' will be returned. If tag not found in hierarchy NIL is returned.</para></listitem></varlistentry>
	</variablelist>
	</listitem></varlistentry>
</variablelist>
</appendix>

</book>

--- NEW FILE: index.pot ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2004 Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: CREATION_DATE\n"
"PO-Revision-Date: REVISION_DATE\n"
"Last-Translator: AUTHOR\n"
"Language-Team: LANG <mail@list>\n"
"MIME-Version: 1.0\n"
"Content-Type: application/x-xgettext; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#, no-c-format
#. Tag: !ENTITY
msgid "version.sgml"
msgstr ""
[...6512 lines suppressed...]
#, no-c-format
#. Tag: term
msgid "<parameter>root</parameter> [Type: <type>XMLTag</type>]"
msgstr ""

#, no-c-format
#. Tag: para
msgid "Element from which lookup is begun."
msgstr ""

#, no-c-format
#. Tag: term
msgid "<parameter>path</parameter> &type_str;"
msgstr ""

#, no-c-format
#. Tag: para
msgid "Hierarchy as tag names (in upper case) delimited by dots. For example, if queried <quote><constant>HEAD.VALUE</constant></quote> will be lookup first child element with name 'head' and its child element with name 'value' will be returned. If tag not found in hierarchy NIL is returned."
msgstr ""


--- NEW FILE: version.sgml ---
0.1.2




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

Modified Files:
	Makefile main.prg 
Added Files:
	eas.xpm 
Log Message:
Add localization and documentation, small fixes.

--- NEW FILE: eas.xpm ---
/* XPM */
static char *eas[]={
"16 16 167 2",
".g c None",
"aJ c None",
"ag c None",
".q c None",
"#4 c None",
".h c None",
"aK c None",
".i c None",
".# c None",
"Qt c None",
"ah c #afafb0",
".j c #afb6be",
".a c #aeb6be",
"#S c #adadad",
"aC c #acacac",
"#i c #abb4be",
"#v c #1a4165",
"#X c #1a4267",
".6 c #1a456b",
"#t c #1b4360",
"#Y c #1b456d",
"#W c #1c466d",
"#u c #1e4667",
".3 c #1e4c70",
"#Z c #1e5182",
"#P c #1f323f",
"#y c #1f3f55",
".5 c #1f496c",
".4 c #1f4a6c",
"#l c #205077",
"#1 c #213648",
"#G c #222b30",
"#s c #224d6c",
"#w c #225580",
"#o c #232e33",
"#g c #233c4e",
"#V c #23598d",
"#M c #255987",
"#0 c #255e94",
"a# c #2563a2",
"#D c #265e8d",
".7 c #265e8e",
".W c #265f91",
"a. c #2666a6",
"#m c #276091",
"aa c #2767a7",
"ab c #28639f",
".2 c #2a608b",
"#9 c #2a6fb5",
".K c #2c73b6",
"#U c #2c74b8",
"#z c #2e2f2f",
"ac c #2f3e4e",
"am c #2f79c4",
"#8 c #2f7cca",
".y c #2f80d1",
"an c #305b86",
"al c #307ece",
".z c #3080d0",
"ak c #3080d1",
"#7 c #3182d5",
".t c #3184d7",
"#Q c #323333",
".x c #3282cf",
"aj c #3283d5",
"#6 c #3283d6",
".m c #3284d7",
".L c #3381c8",
".w c #3382cf",
".n c #3383d5",
".v c #3384d2",
".u c #3385d5",
".0 c #3486d5",
"aw c #356799",
".P c #3584d5",
".D c #3585d5",
"av c #366ea6",
"#a c #3687d1",
".E c #3688d4",
".l c #3785d4",
"ax c #385675",
"#. c #394043",
"#h c #3d3e3e",
".Z c #3d87d2",
".s c #3e87d2",
"ao c #3f4347",
"au c #3f6e9e",
"ay c #444a51",
"ad c #464646",
".V c #4996bf",
"#L c #4d9ac3",
"#H c #4e4e4e",
"#J c #538dc8",
"ai c #5585b5",
".d c #558ec7",
"#K c #55addd",
"#p c #565656",
"az c #585858",
"#e c #58aed9",
".Y c #5a9fbf",
"ap c #5c5c5c",
".o c #5c86b1",
".9 c #5cb6e0",
"#n c #5cb7e2",
"#O c #5cb8e2",
"#k c #5db6df",
"#C c #5db6e1",
"#F c #5db7e0",
"#N c #5db9e3",
"#x c #5dbae3",
"#B c #5e92c7",
"#E c #5eb9e3",
"#f c #5ebae4",
".J c #5ebae5",
".Q c #5ebbe7",
".F c #5ebbe8",
"#T c #5f90c2",
".M c #5fbae3",
"#2 c #616161",
".T c #61c0e9",
".R c #61c0ea",
".S c #61c1ea",
".c c #6294c6",
"#d c #62c0e8",
".U c #62c0e9",
".G c #62c0ea",
".H c #62c1ea",
".I c #62c1eb",
".8 c #63c3ef",
".X c #63c4ee",
".1 c #63c5f0",
"#b c #63c6f0",
"at c #64798e",
".e c #6492c0",
"#r c #64c5f0",
"## c #6596c8",
".A c #667d8f",
".k c #6797c8",
"ae c #696969",
"#j c #69cffb",
"#c c #6ad0fc",
"aF c #6c6c6c",
".N c #6d93a4",
"aG c #707070",
"aA c #737373",
"#A c #757575",
"#R c #767676",
"#q c #7ea0c3",
"aH c #7f7f7f",
"aq c #818181",
".b c #82a1c2",
".C c #83a3c4",
"#5 c #869db4",
"aE c #888888",
".f c #8ea0b3",
"aB c #929292",
".r c #92aac1",
"#I c #959595",
".O c #95abc1",
"af c #989898",
".B c #9ca1a4",
"#3 c #9e9e9e",
"as c #a0a0a1",
"ar c #a1a1a1",
"aD c #a2a2a2",
".p c #a3a3a4",
"aI c #a5a5a5",
"QtQtQtQtQtQt.#.a.b.c.d.e.f.g.h.i",
"QtQtQtQtQt.j.k.l.m.m.m.m.n.o.p.q",
"QtQtQt.#.r.s.t.u.v.w.w.x.y.z.A.B",
"QtQt.#.C.D.t.E.F.G.H.I.J.K.L.M.N",
"QtQt.O.P.t.E.Q.R.S.T.U.V.W.J.X.Y",
"Qt.j.Z.m.0.F.1.2.3.4.5.6.7.8.9#.",
".i##.m.t#a#b#c.I.T#d#e.W#f.8#g#h",
"#i.D.m.0.Q#j.I.T.U#k#l#m.8#n#o#p",
"#q.m.t#a#b#r#s#t#u#v#w#x.8#y#z#A",
"#B.m.0.Q#c#c.I.T#C#D#E#j#F#G#H#I",
"#J.m.v#K.R.G.G.G#L#M#N#O#P#Q#R#S",
"#T.m.y#U#V#W#v#X#Y#Z#0#1#z#2#3#4",
"#5#6#7#8#9a.a#a#aaabacadaeafagQt",
"ahaiaj#7akalalamanaoapaqarag.#Qt",
"#4asatauavawaxayazaAaBaC.h.#QtQt",
".iagaDaEaAaFaGaHaBaIaJaKQtQtQtQt"};

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	5 Jun 2006 20:54:53 -0000	1.4
+++ Makefile	3 Nov 2006 16:12:06 -0000	1.5
@@ -7,10 +7,10 @@
 include ../Makefile.var
 CLIPINCLUDE= -I$(CLIPROOT)/include
 CLIP = $(CLIPROOT)/bin/clip
-CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lclip-ui -lclip-xml -lexpat
-EASLIBS   = -leas -lcodb_query
+CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat
+EASLIBS   = -leas
 CLIPFLAGS = -a -O -b
-ICONS = eas-logo.xpm
+ICONS = eas-logo.xpm eas.xpm
 
 .SUFFIXES: .prg .o .po
 .PHONY: all clean

Index: main.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/main.prg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.prg	20 Jun 2006 10:25:52 -0000	1.9
+++ main.prg	3 Nov 2006 16:12:06 -0000	1.10
@@ -155,10 +155,6 @@
 		for i=cfg:execute to len(cfg:params)
 			aadd( params, cfg:params[i] )
 		next
-		if cfg:repo != ''
-			aadd( params, 'repository' )
-			aadd( params, cfg:repo )
-		endif
 		if cfg:dbPath != ''
 			aadd( params, 'dbpath' )
 			aadd( params, cfg:dbPath )
@@ -222,6 +218,7 @@
 	
 	// Create window
 	win := UIWindow(i18n("Entrance to system"), NIL, "regWindow", .F. )
+	win:setIcon(UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas.xpm"))
 	loginWindow := win
 	
 	// Grid
@@ -237,7 +234,7 @@
     cap:add( gTitle )
     wIcon := UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas-logo.xpm")
     gTitle:add( wIcon )
-    wVer := UILabel( i18n('Version ')+EASGetVersion() )
+    wVer := UILabel( i18n("Version ")+EASGetVersion() )
     gTitle:addEnd( wVer )
     
     // Set styles
@@ -263,9 +260,9 @@
 	bb:setAlignment( ALIGN_CENTER )
 	t:add(bb,"6,1-4",.T.)
 
-        bD := UIButton( i18n("&Ok"), {|o,e| sessionBegin(win) } )
+	bD := UIButton( i18n("&Ok"), {|o,e| sessionBegin(win) } )
 	bb:add( bD, .T., .T. )
-        bb:add( UIButton( i18n("&Exit"), {|o,e| applicationQuit() } ), .T., .T. )
+    bb:add( UIButton( i18n("&Exit"), {|o,e| applicationQuit() } ), .T., .T. )
 
 	win:setDefault(bD) // TODO: click default on ENTER pressed
 	win:setFocus(pF)
@@ -338,14 +335,71 @@
 
 /* Usage information */
 static function printUsage()
-	?? PRG_NAME+'. Ver. '+EASVERSION+'. Client program for E/AS.'+chr(10)+chr(10)
-	?? "Usage: "+PRG_NAME+" [options]&\n"
-	?? "Options:&\n"
-	?? "    -h, --help                       Print this information&\n"
-	?? "    -c cfg_file                      Read configuration from file cfg_file&\n"
-	?? "    -o RAW://user:password@host:port Connect to server host:port with defined username and password&\n"
-	?? "    -repo path/URL                   Set repository path or URL&\n"
-	?? "    -e component method [args...]    Execute method of component with optional argumens&\n"
-	?? "    -d driver                        Use clip-ui driver&\n"
-	?? "    -debug level                     Set debug output level&\n"
+	?? PRG_NAME+'. '+i18n("Version ")+EASVERSION+'. '+i18n("Client program for E/AS.")+chr(10)+chr(10)
+	?? i18n("Usage: ")+PRG_NAME+i18n(" [options]")+chr(10)
+	?? i18n("Options:")+chr(10)
+	?? i18n("    -h, --help                       Print this information")+chr(10)
+	?? i18n("    -c cfg_file                      Read configuration from file cfg_file")+chr(10)
+	?? i18n("    -o RAW://user:password@host:port Connect to server host:port with defined username and password")+chr(10)
+	?? i18n("    -e component method [args...]    Execute method of component with optional argumens")+chr(10)
+	?? i18n("    -d driver                        Use clip-ui driver")+chr(10)
+	?? i18n("    -debug level                     Set debug output level")+chr(10)
+return NIL
+
+/* About dialog */
+function dialogAbout()
+	local win, t, cap, bb, bD
+	// Create window
+	win := UIWindow(i18n("About"), NIL, "aboutWindow", .F. )
+	win:setIcon(UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas.xpm"))
+	
+	// Grid
+	t := UIGrid(,8,4)
+	t:setSpacing(0)
+	t:setPadding(3)
+	win:userSpace:add(t,.T.,.T.)
+	
+    // Title
+    cap := UIFrame()
+    cap:setType( FRAME_RAISED )
+    gTitle := UIHBox(,3,0)
+    cap:add( gTitle )
+    wIcon := UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas-logo.xpm")
+    gTitle:add( wIcon )
+    wVer := UILabel( i18n("Version ")+EASGetVersion() )
+    gTitle:addEnd( wVer )
+    
+    // Set styles
+    driver := getDriver()
+    driver:setStyle(cap, 'color.bg', 'white')
+    driver:setStyle(wVer, 'color.fg', 'darkred')
+    
+	t:add(cap, "1,1-4+",.T.)
+
+	// Text
+	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("This software is distributed under the GPL")), "6,1-4+")
+	t:add(UILabel(i18n("Web: http://eas.lrn.ru")), "7,1-4+")
+
+	// Close button
+	bb  := UIButtonBar()
+	bb:setAlignment( ALIGN_CENTER )
+	t:add(bb,"8,1-4",.T.)
+
+	bD := UIButton( i18n("&Close"), {|o,e| win:close() } )
+	bb:add( bD, .T., .T. )
+
+	win:setDefault(bD)
+	win:setFocus(bD)
+	
+	// Set keys
+	win:setKeyEvent("Enter", {|o,e| win:close() } )
+	win:setKeyEvent("Esc",   {|o,e| win:close() } )
+	
+	win:setPlacement( .T. )
+	win:show()
+
 return NIL
\ No newline at end of file




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

Modified Files:
	INSTALL Makefile README VERSION configure 
Log Message:
Add localization and documentation, small fixes.

Index: INSTALL
===================================================================
RCS file: /cvsroot/eas-dev/eas/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- INSTALL	20 Oct 2006 12:56:47 -0000	1.4
+++ INSTALL	3 Nov 2006 16:12:06 -0000	1.5
@@ -4,9 +4,9 @@
 
 1. Go to http://eas.lrn.ru/index.php?module=download and download latest 
 versions:
-- eas
-- clip-prg
+- clip-prg >= 1.2.0
 - ocmng
+- eas
 
 2. Unpack downloaded packages
 
@@ -42,7 +42,8 @@
 
 3. Check if exist libraries in $CLIPROOT/lib:
 libclip-codb.so
-libclip-gtk.so
+libcodb-query.so
+libclip-gtk.so and/or libclip-gtk2.so
 libclip-ui.so
 libclip-xml.so
 If any library is absent, check error messages and rebuild CLIP
@@ -87,14 +88,14 @@
 
 2. Go to unpacked ocmng directory and run command:
 
-	make && make install
+	make
 	
 3. Install components:
 
-	ocmng install components/ALL.xmo
-	ocmng install components/ocmng/EAS.xmo
+	ocmng install ALL
+	ocmng install EAS/ALL
 	
-If you have error to update core ocmng components (components/ocmng/*.xmo), 
+If you have error to update core ocmng components (ocmng/*.xmo), 
 please remove manually $CLIPROOT/etc/codb.*
 	
 NOTES

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	20 Oct 2006 12:56:47 -0000	1.5
+++ Makefile	3 Nov 2006 16:12:06 -0000	1.6
@@ -11,7 +11,8 @@
 
 PACKAGE    = "eas"
 DIRVERSION = "$(PACKAGE)"
-SUBDIRS = libeas client server
+#SUBDIRS = libeas client server $(DOCDIR) $(PODIR)
+SUBDIRS = libeas client server $(PODIR)
 
 .PHONY: all clean distclean
 

Index: README
===================================================================
RCS file: /cvsroot/eas-dev/eas/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README	20 Oct 2006 12:56:47 -0000	1.5
+++ README	3 Nov 2006 16:12:06 -0000	1.6
@@ -7,8 +7,8 @@
 
 Type:    Software platform
 Name:    E/AS
-Version: 20061015
-Date:	 15 Oct 2006
+Version: 20061103
+Date:	 03 Nov 2006
 
 Author:  Andrey (Skull) Cherepanov <sk...@ea...>
 License: GNU General Public License (GPL) v.2
@@ -34,7 +34,7 @@
 
 Requires
 --------
-- CLIP (with clip-gtk, clip-ui and clip-xml)
+- CLIP >= 1.2.0 (with clip-gtk, clip-gtk2, clip-ui, clip-xml, clip-codb and codb-query)
 - PAM
 
 

Index: VERSION
===================================================================
RCS file: /cvsroot/eas-dev/eas/VERSION,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VERSION	20 Jun 2006 10:25:52 -0000	1.5
+++ VERSION	3 Nov 2006 16:12:06 -0000	1.6
@@ -1 +1 @@
-0.2.1
+20061103

Index: configure
===================================================================
RCS file: /cvsroot/eas-dev/eas/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure	20 Jun 2006 10:25:52 -0000	1.4
+++ configure	3 Nov 2006 16:12:06 -0000	1.5
@@ -14,6 +14,8 @@
 datadir=$prefix/share/eas
 logdir=$datadir/log
 dbpath=/var/db/eas
+withdoc=YES
+withl10n=YES
 
 for ac_option
 do
@@ -61,6 +63,12 @@
     ac_prev=dbpath ;;
   --dbpath=*)
     dbpath="$ac_optarg" ;;
+  
+  --without-doc)
+    withdoc=NO ;;
+
+  --without-l10n)
+    withl10n=NO ;;
 
   -h | --help)
     cat <<EOF
@@ -72,7 +80,9 @@
   --bindir=DIR      where install executables files [$bindir]
   --datadir=DIR     data location: modules, l10n [$datadir]
   --logdir=DIR      location of program messages [$logdir]
-  --dbpath=DIR      database default path [$dbpath]  
+  --dbpath=DIR      database default path [$dbpath]
+  --without-doc		build without documentation [default=no]
+  --without-l10n	build without localization support [default=no]
 EOF
     exit 0 ;;
   esac
@@ -136,7 +146,7 @@
 	echo "CLIP installation does not found. Install CLIP from http://www.itk.ru or set \$CLIPROOT correct." 2>&6
 	exit
 fi
-echo "$CLIPROOT"
+echo "$CLIPROOT" 1>&6
 
 # Check CLIP compiler
 echo $ac_n "checking for a CLIP compiler""... $ac_c" 1>&6
@@ -148,7 +158,7 @@
 	exit
 fi
 CLIP_version=`$prg --version | sed -n '1p' | tr -d '\n'`
-echo "$CLIP_version"
+echo "$CLIP_version" 1>&6
 
 # Check clip-gtk
 echo $ac_n "checking for a clip-gtk library""... $ac_c" 1>&6
@@ -159,7 +169,7 @@
 	echo "Library '$prg' does not found. Configure and install clip-gtk from CLIPDISTRO/cliplibs/clip-gtk directory or appropriate binary package." 2>&6
 	exit
 fi
-echo "yes"
+echo "yes" 1>&6
 
 # Check clip-gtk2
 echo $ac_n "checking for a clip-gtk2 library""... $ac_c" 1>&6
@@ -170,7 +180,7 @@
 	echo "Library '$prg' does not found. Configure and install clip-gtk2 from CLIPDISTRO/cliplibs/clip-gtk2 directory or appropriate binary package." 2>&6
 #	exit
 fi
-echo "yes"
+echo "yes" 1>&6
 
 # Check clip-ui
 echo $ac_n "checking for a clip-ui library""... $ac_c" 1>&6
@@ -181,7 +191,7 @@
 	echo "Library '$prg' does not found. Configure and install clip-ui from CLIPDISTRO/cliplibs/clip-ui directory or appropriate binary package." 2>&6
 	exit
 fi
-echo "yes"
+echo "yes" 1>&6
 
 # Check clip-xml
 echo $ac_n "checking for a clip-xml library""... $ac_c" 1>&6
@@ -189,21 +199,32 @@
 
 prg=$CLIPROOT/lib/libclip-xml.so
 if test ! -f "$prg"; then
-	echo "Library '$prg' does not found. Configure and install clip-ui from CLIPDISTRO/cliplibs/clip-xml directory or appropriate binary package." 2>&6
+	echo "Library '$prg' does not found. Configure and install clip-xml from CLIPDISTRO/cliplibs/clip-xml directory or appropriate binary package." 2>&6
 	exit
 fi
-echo "yes"
+echo "yes" 1>&6
 
-# Check wget
-echo $ac_n "checking for wget""... $ac_c" 1>&6
-echo "configure:$LINENO: checking for wget" >&5
+# Check clip-codb
+echo $ac_n "checking for a clip-codb library""... $ac_c" 1>&6
+echo "configure:$LINENO: checking for a clip-codb" >&5
 
-prg=`wget --version | head -n 1`
-if test -z "$prg"; then
-	echo "Wget is not installed. Build from http://wget.sunsite.dk/ or install from appropriate binary package." 2>&6
+prg=$CLIPROOT/lib/libclip-codb.so
+if test ! -f "$prg"; then
+	echo "Library '$prg' does not found. Configure and install clip-codb from CLIPDISTRO/clip/codb directory or appropriate binary package." 2>&6
 	exit
 fi
-echo "$prg"
+echo "yes" 1>&6
+
+# Check codb-query
+echo $ac_n "checking for a codb-query library""... $ac_c" 1>&6
+echo "configure:$LINENO: checking for a codb-query" >&5
+
+prg=$CLIPROOT/lib/libcodb-query.so
+if test ! -f "$prg"; then
+	echo "Library '$prg' does not found. Configure and install codb-query from CLIPDISTRO/clip/codb directory or appropriate binary package." 2>&6
+	exit
+fi
+echo "yes" 1>&6
 
 # Check ocmng
 echo $ac_n "checking for ocmng""... $ac_c" 1>&6
@@ -214,7 +235,7 @@
 	echo "Component manager ocmng is not installed. Build from CLIP sources or install from appropriate binary package." 2>&6
 	exit
 fi
-echo "yes"
+echo "yes" 1>&6
 
 # Check clip-gtkextra
 #echo $ac_n "checking for a clip-gtkextra library""... $ac_c" 1>&6
@@ -227,19 +248,63 @@
 #fi
 #echo "yes"
 
+#
+# Check programs
+#
+
+# Check wget
+echo $ac_n "checking for wget""... $ac_c" 1>&6
+echo "configure:$LINENO: checking for wget" >&5
+
+prg=`wget --version | head -n 1`
+if test -z "$prg"; then
+	echo "Wget is not installed. Build from http://wget.sunsite.dk/ or install from appropriate binary package." 2>&6
+	exit
+fi
+echo "$prg" 1>&6
+
+if test "$withdoc" = "YES"; then
+	echo $ac_n "checking for docbook2html""... $ac_c" 1>&6
+	echo "configure:$LINENO: checking for docbook2html" >&5
+	
+	prg_version=`docbook2html --version 2>/dev/null | sed -n '1p' | tr -d '\n'`
+	echo "$prg_version" 1>&6
+	if test -z "$prg_version"; then
+		echo "Program docbook2html is not installed. Install docbook-utils package." 2>&6
+		exit
+	fi
+	docdir="doc"
+else
+	docdir=""
+fi
+
+if test "$withl10n" = "YES"; then
+	echo $ac_n "checking for msgfmt""... $ac_c" 1>&6
+	echo "configure:$LINENO: checking for msgfmt" >&5
+	
+	prg_version=`msgfmt --version 2>/dev/null | sed -n '1p' | tr -d '\n'`
+	echo "$prg_version" 1>&6
+	if test -z "$prg_version"; then
+		echo "Program msgfmt is not installed. Install gettext package." 2>&6
+		exit
+	fi
+	podir="po"
+else
+	podir=""
+fi
+
 #rm -f conftest*
 CXXFLAGS="$ac_cxxflags_safe"
 LDFLAGS="$ac_ldflags_safe"
 LIBS="$ac_libs_safe"
 
-
-echo ""
-echo "Configuration:"
-echo -e "    Executables:  $bindir"
-echo -e "    Data:         $datadir"
-echo -e "    Logs:         $logdir"
-echo -e "    Databases:    $dbpath"
-echo ""
+echo "" 1>&6
+echo "Configuration:" 1>&6
+echo -e "    Executables:  $bindir" 1>&6
+echo -e "    Data:         $datadir" 1>&6
+echo -e "    Logs:         $logdir" 1>&6
+echo -e "    Databases:    $dbpath" 1>&6
+echo "" 1>&6
 
 sedline="s%@SHELL@%$SHELL%"
 echo "Create Makefile.var..." >&6
@@ -253,3 +318,6 @@
 echo "EASDATADIR=$datadir" >>Makefile.var
 echo "EASLOGDIR=$logdir" >>Makefile.var
 echo "EASDBPATH=$dbpath" >>Makefile.var
+
+echo "DOCDIR=$docdir" >>Makefile.var
+echo "PODIR=$podir" >>Makefile.var




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

Modified Files:
	Makefile 
Log Message:
Add localization and documentation, small fixes.

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/server/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	20 Oct 2006 12:56:47 -0000	1.7
+++ Makefile	3 Nov 2006 16:12:09 -0000	1.8
@@ -7,8 +7,8 @@
 include ../Makefile.var
 CLIPINCLUDE= -I$(CLIPROOT)/include
 CLIP = $(CLIPROOT)/bin/clip
-CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lclip-ui -lclip-xml -lexpat
-EASLIBS   = -L../libeas -leas -L../libcodb_query -lcodb_query
+CLIPLIBS  = -L$(CLIPROOT)/lib -lclip-codb -lcodb_query -lclip-ui -lclip-xml -lexpat
+EASLIBS   = -leas
 CLIPFLAGS = -a -O -b
 AUTHLIBS  = -lpam
 CC = gcc




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

Added Files:
	Makefile README_LOCALE eas.pot ru.po 
Log Message:
Add localization and documentation, small fixes.

--- NEW FILE: Makefile ---

# This is a part of E/AS distributive
#
# Copyright (C) 2004 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

# Programs (TODO include in configure)
XGETTEXT = xgettext
MSGMERGE = msgmerge
MSGFMT = msgfmt 
PROGRAM = eas
TEMPLATE = $(PROGRAM).pot

all: template merge format

template:
	cd .. && $(XGETTEXT) -C -ki18n -o po/$(TEMPLATE) `find . -name *.prg`
	make merge
	
merge:
	@echo "Merge with old version:"
	@for i in *.po;do lang=$${i//\.po/}; echo -n "$$i ";  $(MSGMERGE) $$i $(TEMPLATE) -o .tmp; \
	rm -f $$i ; mv .tmp $$i; done

format:
	@echo -n "Compile .po files: "
	@for i in *.po;do lang=$${i//\.po/}; $(MSGFMT) $$i -o $$lang.mo ; \
	echo -n "$$lang" ;done
	@echo ""
	
clean:
	rm -f *.mo *.log

install: all
	../mkinstalldirs $(DESTDIR)$(EASDATADIR)/client
	@for i in *.mo;do \
	lang=$${i//\.mo}; \
	../mkinstalldirs $(DESTDIR)$(EASDATADIR)/client/locale/$$lang ; \
	cp -v $$i $(DESTDIR)$(EASDATADIR)/client/locale/$$lang/$(PROGRAM).mo; done

uninstall:
	rm -rf $(DESTDIR)$(EASDATADIR)/client/locale

distclean: clean
	rm -f $(TEMPLATE)

dist: distclean

--- NEW FILE: README_LOCALE ---

# This is a part of E/AS distributive
#
# Copyright (C) 2004-2006 by E/AS Software Foundation
# Author: Andrey Cherepanov <sk...@ea...>


HOWTO LOCALE
============

This document described how to make E/AS software on your language.

1. Run `make template from this directory for generation for up-to-date 
translation.

Create locale directory under 'locale' subdirectory. Name of this 
directory must be language code for your language. For example, Estonian 
language has language code 'es'.

2. Lookup for file with your language. Name of this file must be language 
code for your language with '.po' extension. For example, Estonian language 
should be placed in file 'es.po'. If this file does not exists, copy template 
file 'eas.pot' to file with language name.

3. Translate messages in this file in favorite editor (for example, kbabel) 
or manually.

4. Run 'make && make install' for add new language to program.
--- NEW FILE: eas.pot ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-11-03 07:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: libeas/uimanager.prg:320
msgid "Document was changed"
msgstr ""

#: libeas/uimanager.prg:321
msgid ""
"There are unsaved changes in current document.&\n"
"Save changes?"
msgstr ""

#: libeas/uimanager.prg:322
msgid "'&amp;Save','&amp;Discard','&amp;Cancel'"
msgstr ""

#: libeas/uimanager.prg:338
msgid "Error"
msgstr ""

#: libeas/uimanager.prg:338
msgid "Error saving document!"
msgstr ""

#: client/main.prg:147 client/main.prg:181 client/main.prg:201
msgid "ERROR"
msgstr ""

#: client/main.prg:147
msgid ""
"Access denied.&\n"
"Please, contact your system administratior."
msgstr ""

#: client/main.prg:181
msgid "Cannot open main form."
msgstr ""

#: client/main.prg:201
msgid ""
"Cannot connect to server!&\n"
"Contact your system administratior."
msgstr ""

#: client/main.prg:220
msgid "Entrance to system"
msgstr ""

#: client/main.prg:237 client/main.prg:338 client/main.prg:369
msgid "Version "
msgstr ""

#: client/main.prg:247
msgid "Login"
msgstr ""

#: client/main.prg:249
msgid "Password"
msgstr ""

#: client/main.prg:254
msgid "Server name"
msgstr ""

#: client/main.prg:256
msgid "Port"
msgstr ""

#: client/main.prg:263
msgid "&Ok"
msgstr ""

#: client/main.prg:265
msgid "&Exit"
msgstr ""

#: client/main.prg:338
msgid "Client program for E/AS."
msgstr ""

#: client/main.prg:339
msgid "Usage: "
msgstr ""

#: client/main.prg:339
msgid " [options]"
msgstr ""

#: client/main.prg:340
msgid "Options:"
msgstr ""

#: client/main.prg:341
msgid "    -h, --help                       Print this information"
msgstr ""

#: client/main.prg:342
msgid ""
"    -c cfg_file                      Read configuration from file cfg_file"
msgstr ""

#: client/main.prg:343
msgid ""
"    -o RAW://user:password@host:port Connect to server host:port with "
"defined username and password"
msgstr ""

#: client/main.prg:344
msgid ""
"    -e component method [args...]    Execute method of component with "
"optional argumens"
msgstr ""

#: client/main.prg:345
msgid "    -d driver                        Use clip-ui driver"
msgstr ""

#: client/main.prg:346
msgid "    -debug level                     Set debug output level"
msgstr ""

#: client/main.prg:353
msgid "About"
msgstr ""

#: client/main.prg:380
msgid "Client software for E/AS platform"
msgstr ""

#: client/main.prg:381
msgid "Version:"
msgstr ""

#: client/main.prg:382
msgid "Driver:"
msgstr ""

#: client/main.prg:383
msgid "(c) 2003-2006, E/AS Software Foundation. All rights reserved."
msgstr ""

#: client/main.prg:384
msgid "This software is distributed under the GPL"
msgstr ""

#: client/main.prg:385
msgid "Web: http://eas.lrn.ru"
msgstr ""

#: client/main.prg:392
msgid "&Close"
msgstr ""

--- NEW FILE: ru.po ---
# eas.po Russian translation
# Copyright (C) 2004 E/AS Software foundation.
# Andrey Cherepanov <sk...@ea...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-11-03 07:29+0300\n"
"PO-Revision-Date: 2006-11-02 14:13+0300\n"
"Last-Translator: Andrey Cherepanov <sib...@ma...>\n"
"Language-Team: Russian <kde...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=KOI8-R\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11\n"
"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#: libeas/uimanager.prg:320
msgid "Document was changed"
msgstr "äÏËÕÍÅÎÔ ÉÚÍÅÎ£Î"

#: libeas/uimanager.prg:321
msgid ""
"There are unsaved changes in current document.&\n"
"Save changes?"
msgstr ""
"÷ ÄÏËÕÍÅÎÔÅ ÅÓÔØ ÎÅÓÏÈÒÁÎ£ÎÎÙÅ ÉÚÍÅÎÅÎÉÑ.&\n"
"óÏÈÒÁÎÉÔØ ÄÏËÕÍÅÎÔ?"

#: libeas/uimanager.prg:322
msgid "'&amp;Save','&amp;Discard','&amp;Cancel'"
msgstr "'&amp;óÏÈÒÁÎÉÔØ','&amp;ïÔËÌÏÎÉÔØ','&amp;ïÔÍÅÎÁ'"

#: libeas/uimanager.prg:338
msgid "Error"
msgstr "ïÛÉÂËÁ"

#: libeas/uimanager.prg:338
msgid "Error saving document!"
msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÄÏËÕÍÅÎÔÁ!"

#: client/main.prg:147 client/main.prg:181 client/main.prg:201
msgid "ERROR"
msgstr "ïûéâëá"

#: client/main.prg:147
msgid ""
"Access denied.&\n"
"Please, contact your system administratior."
msgstr ""
"äÏÓÔÕÐ Ë ÓÅÒ×ÅÒÕ ÚÁÐÒÅÝ£Î.&\n"
"ïÂÒÁÔÉÔÅÓØ Ë ÓÉÓÔÅÍÎÏÍÕ ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ."

#: client/main.prg:181
msgid "Cannot open main form."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÇÌÁ×ÎÏÅ ÏËÎÏ."

#: client/main.prg:201
msgid ""
"Cannot connect to server!&\n"
"Contact your system administratior."
msgstr ""
"îÅ×ÏÚÍÏÖÎÏ ÐÏÄËÌÀÞÉÔØÓÑ Ë ÓÅÒ×ÅÒÕ.&\n"
"ïÂÒÁÔÉÔÅÓØ Ë ÓÉÓÔÅÍÎÏÍÕ ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ."

#: client/main.prg:220
msgid "Entrance to system"
msgstr "÷ÈÏÄ × ÓÉÓÔÅÍÕ"

#: client/main.prg:237 client/main.prg:338 client/main.prg:369
msgid "Version "
msgstr "÷ÅÒÓÉÑ "

#: client/main.prg:247
msgid "Login"
msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"

#: client/main.prg:249
msgid "Password"
msgstr "ðÁÒÏÌØ"

#: client/main.prg:254
msgid "Server name"
msgstr "óÅÒ×ÅÒ"

#: client/main.prg:256
msgid "Port"
msgstr "ðÏÒÔ"

#: client/main.prg:263
msgid "&Ok"
msgstr "&Ok"

#: client/main.prg:265
msgid "&Exit"
msgstr "&÷ÙÈÏÄ"

#: client/main.prg:338
msgid "Client program for E/AS."
msgstr "ëÌÉÅÎÔ ÐÌÁÔÆÏÒÍÙ E/AS."

#: client/main.prg:339
msgid "Usage: "
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"

#: client/main.prg:339
msgid " [options]"
msgstr " [ÐÁÒÁÍÅÔÒÙ]"

#: client/main.prg:340
msgid "Options:"
msgstr "ðÁÒÁÍÅÔÒÙ:"

#: client/main.prg:341
msgid "    -h, --help                       Print this information"
msgstr "    -h, --help                       ðÏËÁÚÁÔØ ÓÐÒÁ×ËÕ"

#: client/main.prg:342
msgid ""
"    -c cfg_file                      Read configuration from file cfg_file"
msgstr ""
"    -c cfg_file                      ðÒÏÞÉÔÁÔØ ÎÁÓÔÒÏÊËÉ ÉÚ ÆÁÊÌÁ cfg_file"

#: client/main.prg:343
msgid ""
"    -o RAW://user:password@host:port Connect to server host:port with "
"defined username and password"
msgstr ""
"    -o RAW://user:password@host:port ðÏÄËÌÀÞÉÔØÓÑ Ë ÓÅÒ×ÅÒÕ host:port Ó "
"ÕËÁÚÁÎÎÙÍ ÉÍÅÎÅÍ ÐÏÌØÚÏ×ÁÔÅÌÑ username É ÐÁÒÏÌÅÍ password"

#: client/main.prg:344
msgid ""
"    -e component method [args...]    Execute method of component with "
"optional argumens"
msgstr ""
"    -e component method [args...]    ÷ÙÐÏÌÎÉÔØ ÍÅÔÏÄ ËÏÍÐÏÎÅÎÔÁ Ó ÕËÁÚÁÎÎÙÍÉ "
"ÁÒÇÕÍÅÎÔÁÍÉ"

#: client/main.prg:345
msgid "    -d driver                        Use clip-ui driver"
msgstr ""
"    -d driver                        éÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÄÒÁÊ×ÅÒ clip-ui"

#: client/main.prg:346
msgid "    -debug level                     Set debug output level"
msgstr "    -debug level                     õÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÏÔÌÁÄËÉ"

#: client/main.prg:353
msgid "About"
msgstr "ï ÐÒÏÇÒÁÍÍÅ"

#: client/main.prg:380
msgid "Client software for E/AS platform"
msgstr "ëÌÉÅÎÔ ÐÌÁÔÆÏÒÍÙ E/AS"

#: client/main.prg:381
msgid "Version:"
msgstr "÷ÅÒÓÉÑ:"

#: client/main.prg:382
msgid "Driver:"
msgstr "äÒÁÊ×ÅÒ:"

#: client/main.prg:383
msgid "(c) 2003-2006, E/AS Software Foundation. All rights reserved."
msgstr "(c) 2003-2006, E/AS Software Foundation. ÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ."

#: client/main.prg:384
msgid "This software is distributed under the GPL"
msgstr "ðÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÐÏ ÕÓÌÏ×ÉÑÍ ÌÉÃÅÎÚÉÉ GPL"

#: client/main.prg:385
msgid "Web: http://eas.lrn.ru"
msgstr "÷ÅÂ-ÓÁÊÔ: http://eas.lrn.ru"

#: client/main.prg:392
msgid "&Close"
msgstr "&úÁËÒÙÔØ"




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

Added Files:
	caution.gif home.gif important.gif next.gif note.gif prev.gif 
	tip.gif toc-blank.gif toc-minus.gif toc-plus.gif up.gif 
	warning.gif 
Log Message:
Add localization and documentation, small fixes.

--- NEW FILE: caution.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: home.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: important.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: next.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: note.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prev.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: tip.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toc-blank.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toc-minus.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toc-plus.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: up.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: warning.gif ---
(This appears to be a binary file; contents omitted.)




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

Modified Files:
	componentmanager.prg dbmanager.prg execmanager.prg 
	functions.prg uimanager.prg 
Log Message:
Add localization and documentation, small fixes.

Index: componentmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/componentmanager.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- componentmanager.prg	5 Jun 2006 14:12:19 -0000	1.2
+++ componentmanager.prg	3 Nov 2006 16:12:08 -0000	1.3
@@ -43,7 +43,7 @@
 return obj
 
 /** Open tables */
-static function c_open( self, params ) // TODO
+static function c_open( self, params )
 	local cfg
 	
 	eDebug(15, "Component manager (CM): open")
@@ -65,9 +65,9 @@
 	component := params:receiver
 	method    := params:command
 
-//	eDebug(5, "COMPONENT LOOKUP","DB" $ params:args, params:args)
+	eDebug(15, "COMPONENT LOOKUP", component, iif("ARGS" $ params, '<'+valtype(params:args)+'>', '<no arguments>') )
 	if .not. "ARGS" $ params .or. valtype(params:args)!="O"
-		return NIL
+		params:args := map()
 	endif
 		
 	eDebug(15, "CM lookup:", component, method)

Index: dbmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/dbmanager.prg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbmanager.prg	2 Jun 2006 14:32:45 -0000	1.1
+++ dbmanager.prg	3 Nov 2006 16:12:08 -0000	1.2
@@ -68,11 +68,14 @@
 /** Execute query (return object instead array as in execute()) */
 static function c_executeExt( self, params )
 	local res
-	if assertParameters( params, { 'query:C', 'db:C' } )
+	if assertParameters( params, { 'query:C' } )
 		return res
 	endif
+	if .not. "DB" $ params .or. params:db == NIL
+		params:db := ''
+	endif
 
-	//eDebug(15, "sys.db.executeExt.db", params:db )
+	eDebug(15, "sys.db.executeExt.db", params:db )
 
 	res := codb_execute( self:db, params:query, params:db )
 	if codb_get_error( res ) != NIL
@@ -80,6 +83,10 @@
 		sendMessage(,,'sys.db.failed', res )
 		return array(0)
 	endif
+	if "FORMAT" $ params .and. params:format
+		fmt := CODB_Formatter()
+		res := fmt:show( res )
+	endif	
 return res
 
 /** Get object from database */

Index: execmanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/execmanager.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- execmanager.prg	16 Jun 2006 15:22:20 -0000	1.2
+++ execmanager.prg	3 Nov 2006 16:12:08 -0000	1.3
@@ -78,7 +78,7 @@
 				eDebug(2, self:lastError)
 				return NIL
 			endif
-		elseif .not. empty (id:=self:cManager:lookup( params ))
+		elseif ascan( self:commands, {|e| e[1]=='sys.db' } ) > 0 .and. .not. empty (id:=self:cManager:lookup( params ))
 			eDebug(15, "EXEC COMPONENT COMMAND:",params:receiver,params:command,"...")
 			params:__id := id
 			vRet := self:cManager:execute( params )

Index: functions.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/functions.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- functions.prg	20 Jun 2006 10:25:53 -0000	1.2
+++ functions.prg	3 Nov 2006 16:12:08 -0000	1.3
@@ -50,7 +50,7 @@
 
 /* Send message to local component */
 function lcomponent()
-	local ret, args, pc:=pcount(), i
+	local ret, args:=map(), pc:=pcount(), i
 	
 	//eDebug(7, "lcomponent() call")	
 	if pc < 2
@@ -108,13 +108,17 @@
 return .F.
 
 /*===========================================================================*/
-/* PREDEFINED COMPONENT CALL						     */
+/* PREDEFINED COMPONENT CALL						     					 */
 /*===========================================================================*/
 
 /* Execute local database query */
 function lquery(params, query)
 return lcomponent('sys.db', 'execute', 'db', iif(valtype(params)=='O' .and. 'DB' $ params, params:db,''), 'query', query)
 
+/* Execute local database query (extended mode) */
+function lqueryExt(params, query)
+return lcomponent('sys.db', 'executeExt', 'db', iif(valtype(params)=='O' .and. 'DB' $ params, params:db,''), 'query', query)
+
 /* Opens form from server */
 function openForm(name, type, id)
 return lcomponent('sys.ui', 'openForm', 'name', name, 'type', type, "id", id)
@@ -215,3 +219,14 @@
 	dep := left( s, i-1 )
 	class := substr( s, i+1 )
 return { dep, class }
+
+/* Return XML-safe string */
+function safeXML( string )
+	//eDebug( 25, "Before XMLization:", string )
+	string := strtran( string, '&', '&amp;' )
+	string := strtran( string, '<', '&lt;' )
+	string := strtran( string, '>', '&gt;' )
+	string := strtran( string, '"', '&quot;' )
+	string := strtran( string, "'", '&apos;' )
+	//eDebug( 25, "After XMLization:", string )
+return string

Index: uimanager.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/uimanager.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- uimanager.prg	16 Jun 2006 15:22:20 -0000	1.2
+++ uimanager.prg	3 Nov 2006 16:12:08 -0000	1.3
@@ -129,13 +129,14 @@
 	oErr := errorBlock({|e| break(e) })
 	
 	begin sequence
-		//eDebug(10, "UI parent:", self:main)
 		if valtype(self:main) == 'O' .and. self:main:className != "UIMainWindow" .and. "PARENT" $ self:main
 			parent := self:main:parent
 		else
 			parent := self:main
 		endif
 	
+		eDebug( 16, "UI: form parsing..." )
+	
 		// Process and show form
 		form := UIForm( name, parent )
 		if SHOW_FORMS
@@ -143,6 +144,7 @@
 		endif
 		win  := form:parseString(vRet)
 	
+		eDebug( 16, "UI: window is created...", valtype(win) )
 
 		if win == NIL
 			eDebug(3, "UI: Error parse form")




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

Added Files:
	1.gif 10.gif 2.gif 3.gif 4.gif 5.gif 6.gif 7.gif 8.gif 9.gif 
Log Message:
Add localization and documentation, small fixes.

--- NEW FILE: 1.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 10.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 4.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 5.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 6.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 7.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 8.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 9.gif ---
(This appears to be a binary file; contents omitted.)




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

Added Files:
	Makefile index.docbook 
Log Message:
Add localization and documentation, small fixes.

--- NEW FILE: Makefile ---

# This is a part of E/AS distributive
#
# Copyright (C) 2004 by E/AS Software Foundation
# Author: Andrey Cherepanov <sib...@ma...>

include $(CLIPROOT)/include/Makefile.inc
include ../../Makefile.var
CLIP = $(CLIPROOT)/bin/clip
CLIPLIBS  = 
#CLIPFLAGS = -a -O -b
CLIPINCLUDE = -I$(CLIPROOT)/include
FLAGS = -V %two-side%=\#f \
	-V %chapter-autolabel%=\#t \
	-V %appendix-autolabel%=\#t \
	-V %section-autolabel%=\#t \
	-V %section-label-includes-component-label%=\#t \
	-V %toc-depth%=2 \
	-V %generate-part-toc%=\#t \
	-V %generate-article-toc%=\#t \
	-V %paper-type%=A4 \
	-V %use-id-as-filename%=\#t \
	-V %always-format-variablelist-as-table%=\#t 
#	-V %indent-programlisting-lines%=\#t 
#	-V %may-format-variablelist-as-table%=\#t \
# TODO:
#	1) include program checking in configure script
#	1) Content creation by manually (only first level must be stayed)
#	3) Custom stylesheet 
#	4) Content in eas chapter
#	-V %stylesheet%=???.css

DOC2HTML = docbook2html $(FLAGS)
DOC2PDF  = docbook2pdf $(FLAGS)

.PHONY: all clean install uninstall distclean

all: html #index.pdf

html: index.docbook
	rm -rf html/stylesheet-images
	SP_ENCODING=xml $(DOC2HTML) -o html index.docbook && \
	cd html && for i in *.html;do \
	mv $$i .temp; sed -e 's|</HEAD|<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"></HEAD|' .temp >$$i; rm -f .temp; done && \
	cp -R ../images stylesheet-images && cd ..

index.pdf: index.docbook
	SP_ENCODING=xml $(DOC2PDF) index.docbook

clean:
	rm -rf html
	rm -f *.pdf *.aux *.log *.out *.tex

install: all


uninstall:


distclean: clean


dist: distclean

--- NEW FILE: index.docbook ---
<?xml version="1.0" encoding="utf-8"?>
<!--
    This is a part of E/AS distribution.
    You can find it on the Web: http://eas.lrn.ru

    Copyright (C) 2004 by E/AS Software Foundation.
    Author: Andrey Cherepanov <sib...@ma...>
    Last change: 31 May 2004.

    This program is free software; you can redistribute it and/or modify it 
    under the terms of the GNU General Public License as published by the 
    Free Software Foundation; either version 2 of the License, or (at your 
    option) any later version.
-->
<!--
    TODO:
    	- check optional definition
	- describe ALL fields and methods
	- fix all TODO in this document
[...3418 lines suppressed...]
	<variablelist>&args;
	    <varlistentry><term><parameter>value</parameter> [Ð¢Ð¸Ð¿: <type>ÑÐ¸ÑÐ»Ð¾|ÑÑÑÐ¾ÐºÐ°|Ð´Ð°ÑÐ°|Ð»Ð¾Ð³Ð¸ÑÐµÑÐºÐ¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ|Ð¿ÑÑÑÐ¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ</type>]</term>
		<listitem><para>ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐµÐ¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ.</para></listitem></varlistentry>
	    <varlistentry><term><parameter>format</parameter> &type_num;</term>
		<listitem><para>Ð¤Ð¾ÑÐ¼Ð°Ñ Ð¿ÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð² ÑÑÑÐ¾ÐºÑ. <emphasis>Ð Ð¿ÑÐ¾ÑÐµÑÑÐµ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ¸</emphasis>. &optional;</para></listitem></varlistentry>
	</variablelist>
	</listitem></varlistentry>
   <varlistentry><term><function>XMLGetTag(<parameter>root</parameter>, <parameter>path</parameter>)</function></term>
	<listitem><para>ÐÐ¾Ð·Ð²ÑÐ°ÑÐ¸ÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð¿Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð¸ÐµÑÐ°ÑÑÐ¸Ð¸.</para>
	<variablelist>&args;
	    <varlistentry><term><parameter>root</parameter> [Ð¢Ð¸Ð¿: <type>XMLTag</type>]</term>
		<listitem><para>ÐÐ»ÐµÐ¼ÐµÐ½Ñ, Ñ ÐºÐ¾ÑÐ¾ÑÐ¾Ð³Ð¾ Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ð¿Ð¾Ð¸ÑÐºÐ¸.</para></listitem></varlistentry>
	    <varlistentry><term><parameter>path</parameter> &type_str;</term>
		<listitem><para>ÐÐµÑÐ°ÑÑÐ¸Ñ Ð² Ð²Ð¸Ð´Ðµ Ð¸Ð¼ÑÐ½ ÑÐµÐ³Ð¾Ð² (Ð² Ð²ÐµÑÑÐ½ÐµÐ¼ ÑÐµÐ³Ð¸ÑÑÑÐµ), ÑÐ°Ð·Ð´ÐµÐ»ÑÐ½Ð½ÑÑ ÑÐ¾ÑÐºÐ°Ð¼Ð¸. ÐÐ°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð¿ÑÐ¸ Ð·Ð°Ð¿ÑÐ¾ÑÐµ <quote><constant>HEAD.VALUE</constant></quote> Ð±ÑÐ´ÐµÑ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð¿ÐµÑÐ²ÑÐ¹ ÑÐµÐ³ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ 'head', Ð° Ð·Ð°ÑÐµÐ¼ Ð²Ð¾Ð·Ð²ÑÐ°ÑÑÐ½ Ð¾Ð±ÑÐµÐºÑ Ð¿ÐµÑÐ²Ð¾Ð³Ð¾ ÑÐµÐ³Ð° 'value' Ð¿Ð¾Ð´ Ð½Ð¸Ð¼. ÐÑÐ»Ð¸ ÑÐµÐ³ Ð² ÑÐ°ÐºÐ¾Ðµ Ð¸ÐµÑÐ°ÑÑÐ¸Ð¸ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½, Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ°ÐµÑÑÑ NIL.</para></listitem></varlistentry>
	</variablelist>
	</listitem></varlistentry>
</variablelist>
</appendix>

</book>




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

Log Message:
Directory /cvsroot/eas-dev/eas/doc/images/callouts added to the repository





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

Log Message:
Directory /cvsroot/eas-dev/eas/doc/ru added to the repository





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

Log Message:
Directory /cvsroot/eas-dev/eas/doc/images added to the repository





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

Log Message:
Directory /cvsroot/eas-dev/eas/po added to the repository





Update of /cvsroot/eas-dev/clip-ui/drivers
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28215/drivers

Modified Files:
	driver-gtk.prg driver-gtk2.prg 
Log Message:
clip-ui-0.1.3:
- UIWindow is resizeable by default
- Widget with suffix + is expanded in XFL forms

Index: driver-gtk.prg
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/drivers/driver-gtk.prg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- driver-gtk.prg	18 Oct 2006 08:49:59 -0000	1.4
+++ driver-gtk.prg	25 Oct 2006 07:46:28 -0000	1.5
@@ -220,10 +220,10 @@
 	vbox := UIVBox()
 	gtk_ContainerAdd( wnd, vbox )
 	wnd:userSpace := vbox
-	if valtype(resizeable) == "L" .and. resizeable
-		gtk_WindowSetPolicy(wnd, .T., .T., .T.)
-	else
+	if valtype(resizeable) == "L" .and. .not. resizeable
 		gtk_WindowSetPolicy(wnd, .F., .F., .T.)
+	else
+		gtk_WindowSetPolicy(wnd, .T., .T., .T.)
 	endif
 	if empty(parent)
 		gtk_SignalConnectAfter( wnd, "delete-event", @ui_quit() )

Index: driver-gtk2.prg
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/drivers/driver-gtk2.prg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- driver-gtk2.prg	6 Jun 2006 07:24:02 -0000	1.3
+++ driver-gtk2.prg	25 Oct 2006 07:46:28 -0000	1.4
@@ -225,10 +225,10 @@
 	vbox := UIVBox()
 	gtk_ContainerAdd( wnd, vbox )
 	wnd:userSpace := vbox
-	if valtype(resizeable) == "L" .and. resizeable
-		gtk_WindowSetResizeable(wnd, .T.)
-	else
+	if valtype(resizeable) == "L" .and. .not. resizeable
 		gtk_WindowSetResizeable(wnd, .F.)
+	else
+		gtk_WindowSetResizeable(wnd, .T.)
 	endif
 	if empty(parent)
 		gtk_SignalConnectAfter( wnd, "delete-event", @ui_quit() )




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

Modified Files:
	ChangeLog clip-ui.ch form.prg utils.prg 
Log Message:
clip-ui-0.1.3:
- UIWindow is resizeable by default
- Widget with suffix + is expanded in XFL forms

Index: ChangeLog
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	18 Oct 2006 08:49:59 -0000	1.3
+++ ChangeLog	25 Oct 2006 07:46:28 -0000	1.4
@@ -1,3 +1,7 @@
+2006-10-25 clip-ui-0.1.3
+	- UIWindow is resizeable by default
+	- Widget with suffix '+' is expanded in XFL forms
+
 2006-10-16
 	- Window now support spacing and padding in form
 	- Pass both id and text for UIChoice

Index: clip-ui.ch
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/clip-ui.ch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- clip-ui.ch	2 Jun 2006 14:12:09 -0000	1.1
+++ clip-ui.ch	25 Oct 2006 07:46:28 -0000	1.2
@@ -11,7 +11,7 @@
 /*-------------------------------------------------------------------------*/
 
 /* Header file for common CLIP-UI definition */
-#define lib_version 	"0.1.2.4"
+#define lib_version 	"0.1.3"
 
 /* Default driver name */
 #define DEFAULT_DRIVER	"gtk"

Index: form.prg
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/form.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- form.prg	18 Oct 2006 08:49:59 -0000	1.2
+++ form.prg	25 Oct 2006 07:46:28 -0000	1.3
@@ -158,13 +158,18 @@
 /* Return created widget from tag */
 static function ui_createWidget(self, tag, parent )
 	local o:=NIL, class, name, label, c, i, a, e, w, box, t:=tag
-	local add:=.F., gCol:=1, gRow:=1, gClass, rule
+	local add:=.F., gCol:=1, gRow:=1, gClass, rule, expanded:=.F.
 
 	class := t:attribute("class","")
 	name  := t:attribute("name","")
 	label := self:i18n( t:attribute("label","") )
 	rule  := t:attribute("rule",NIL)
 
+	if right(name,1) == '+' // Widget should be expanded
+		name := substr(name,1,len(name)-1)
+		expanded := .T.
+	endif
+
 	switch upper(class)
 		/* Grid */
 		case "HBOX"
@@ -369,7 +374,7 @@
 				parent:addEnd( o )
 			endif
 		else
-			if class=="table" .or. o:className=="UISplitter" .or. o:className=="UIEditText"
+			if class=="table" .or. o:className=="UISplitter" .or. o:className=="UIEditText" .or. expanded
 				box:add( o, .T., .T. )
 			else
 				box:add( o, .F., iif(box:className=="UIButtonBar",.T.,.F.) )
@@ -790,7 +795,7 @@
 			endif
 			aadd(params, retAction)
 		otherwise
-			?? "WARNING: unknown tag",p:name,"&\n"
+			?? "WARNING: Illegal tag <"+str(p:name)+">'&\n"
 		endswitch
 	next
 

Index: utils.prg
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/utils.prg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- utils.prg	2 Jun 2006 14:12:09 -0000	1.1
+++ utils.prg	25 Oct 2006 07:46:28 -0000	1.2
@@ -116,7 +116,7 @@
 function getLocaleStrings( parent, locale )
 	local section:=NIL, mStr:=map(), tag, i
 	if empty(locale)
-		locale := substr(getenv("LANG"),1,2)
+		locale := left(getenv("LANG"),2)
 	endif
 
 	// Find appropriate section <locale lang="XX">




Update of /cvsroot/eas-dev/clip-ui/example
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28215/example

Modified Files:
	testWindow.xfl 
Log Message:
clip-ui-0.1.3:
- UIWindow is resizeable by default
- Widget with suffix + is expanded in XFL forms

Index: testWindow.xfl
===================================================================
RCS file: /cvsroot/eas-dev/clip-ui/example/testWindow.xfl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- testWindow.xfl	18 Oct 2006 08:49:59 -0000	1.2
+++ testWindow.xfl	25 Oct 2006 07:46:28 -0000	1.3
@@ -14,20 +14,25 @@
             <!-- Menu -->
             <widget class="menuBar">
                 <widget class="popupMenu" name="journal_menu" label="&amp;Journal">
-			<widget class="menuItem" label="&amp;Payment orders" name="Menu.Bank.PaymentOrder.List">
-				<property name="icon" value="icons/journal_bank_pp.xpm"/>
-			</widget>
-			<widget class="menuItem" label="&amp;Create payment order" name="Menu.Bank.PaymentOrder.Create">
-				<property name="icon" value="icons/doc_bank_pp.xpm"/>
-			</widget>
-			<widget class="menuSeparator"/>
-			<widget class="menuItem" label="&amp;Exit" name="Menu.Quit"/>
+					<widget class="menuItem" label="&amp;Payment orders" name="Menu.Bank.PaymentOrder.List">
+						<property name="icon" value="icons/journal_bank_pp.xpm"/>
+					</widget>
+					<widget class="menuItem" label="&amp;Create payment order" name="Menu.Bank.PaymentOrder.Create">
+						<property name="icon" value="icons/doc_bank_pp.xpm"/>
+					</widget>
+					<widget class="menuSeparator"/>
+					<widget class="menuItem" label="&amp;Exit" name="Menu.Quit">
+						<rule>
+							<event widget="Menu.Quit" signal="activate"/>
+							<action><call widget="mainWindow" method="close"/></action>
+						</rule>
+					</widget>
                 </widget>
                 <widget class="popupMenu" name="cfg_menu" label="&amp;Settings">
-			<widget class="menuCheckedItem" name="showTB" label="Show &amp;toolbar" />
-			<widget class="menuCheckedItem" name="showSB" label="Show &amp;statusbar" />
-			<widget class="menuSeparator"/>
-			<widget name="Settings" class="menuItem" label="&amp;Configure..."/>
+					<widget class="menuCheckedItem" name="showTB" label="Show &amp;toolbar" />
+					<widget class="menuCheckedItem" name="showSB" label="Show &amp;statusbar" />
+					<widget class="menuSeparator"/>
+					<widget name="Settings" class="menuItem" label="&amp;Configure..."/>
                 </widget>
             </widget>
 
@@ -183,7 +188,6 @@
         <actions>
 			<!-- System actions -->
 			<rule>
-				<event widget="Menu.Quit" signal="activate"/>
 				<event widget="close" signal="clicked"/>
 				<action><call widget="mainWindow" method="close"/></action>
 			</rule>
@@ -243,5 +247,11 @@
 			</rule>
 
 	</actions>
+	<locale lang="ru">
+		<string id="Payment order N " value="ðÌÁÔÅÖÎÏÅ ÐÏÒÕÞÅÎÉÅ N " />
+		<string id="Save" value="&amp;óÏÈÒÁÎÉÔØ" />
+		<string id="Print" value="&amp;ðÅÞÁÔØ" />
+		<string id="Close" value="&amp;úÁËÒÙÔØ" />
+	</locale>
 </form>
 




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

Modified Files:
	ChangeLog xpath.prg 
Log Message:
Add descendant search support

Index: ChangeLog
===================================================================
RCS file: /cvsroot/eas-dev/clip-xml/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	2 Jun 2006 14:14:15 -0000	1.1
+++ ChangeLog	25 Oct 2006 07:36:10 -0000	1.2
@@ -1,4 +1,6 @@
+2006-23-10
+	- support search in all descendants
 2006-16-01
-	- create xPath, xmlTree
+	- create XPath, XMLTree
 2006-10-01
 	- create expat.c

Index: xpath.prg
===================================================================
RCS file: /cvsroot/eas-dev/clip-xml/xpath.prg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xpath.prg	2 Jun 2006 14:14:15 -0000	1.1
+++ xpath.prg	25 Oct 2006 07:36:10 -0000	1.2
@@ -31,27 +31,28 @@
 */
 
 /* Print debug information */
-#define XPATH_DEBUG		.F.
+#define XPATH_DEBUG				.F.
 
 /* Tokens */
-#define XPATH_TOKEN_UNDEF	0
-#define XPATH_TOKEN_SYMBOL	1
-#define XPATH_TOKEN_NAME	2
+#define XPATH_TOKEN_UNDEF		0
+#define XPATH_TOKEN_SYMBOL		1
+#define XPATH_TOKEN_NAME		2
 #define XPATH_TOKEN_NODETYPE	3
 #define XPATH_TOKEN_OPERATOR	4
 #define XPATH_TOKEN_FUNCTION	5
-#define XPATH_TOKEN_AXIS	6
-#define XPATH_TOKEN_LITERAL	7
-#define XPATH_TOKEN_NUMBER	8
-#define XPATH_TOKEN_VARREF	9
+#define XPATH_TOKEN_AXIS		6
+#define XPATH_TOKEN_LITERAL		7
+#define XPATH_TOKEN_NUMBER		8
+#define XPATH_TOKEN_VARREF		9
 
 /* Blocks */
-#define XPATH_BLOCK_NODESET	20
-#define XPATH_BLOCK_NODES	21
+#define XPATH_BLOCK_NODESET		20
+#define XPATH_BLOCK_NODES		21
 #define XPATH_BLOCK_FUNCTION	22
 #define XPATH_BLOCK_EXPRESSION	23
 
 static lastError := ""
+static lastFlag  := 0
 
 /* Symbols and operators */
 static _xpath_symbols := { ;
@@ -399,13 +400,19 @@
 	// Check root and abbreviated begin
 	if res[1]:type == XPATH_TOKEN_OPERATOR
 		// TODO: need more abbreviated syntax ( p.9 )
-		if res[1]:token == '/'
+		if left(res[1]:token,1) == '/'
 			b := _xpath_createNode( "root", "" )
 			ce     := b
 			aadd( a, b )
 			i++
 			isNodeset := .T.
+			if res[1]:token == '//'
+				b := _xpath_createNode( "descendant", "" )
+				ce     := b
+				aadd( a, b )
+			endif
 		endif
+		
 	elseif res[1]:type == XPATH_TOKEN_UNDEF
 		isNodeset := .T.
 	endif
@@ -698,6 +705,14 @@
 
 return v
 
+static function _xpath_desc( e, v )
+	local i
+	aadd( v, e )
+	for i in e:getChilds()
+		_xpath_desc( i, @v )
+	next
+return NIL
+
 /* Define nodeset */
 static function _xpath_set( s, a )
 	local v:={}, i, e, cond, c, name
@@ -724,17 +739,30 @@
 				
 				case 'child'
 					name := cond:name
-					for c in e:getChilds()
+					if lastFlag == 1 // descendants on first level
 						if name == '*' .or. name == c:getName()
 							aadd( v, c )
 						endif
-					next
+					else
+						for c in e:getChilds()
+							if name == '*' .or. name == c:getName()
+								aadd( v, c )
+							endif
+						next
+					endif
+				case 'descendant'
+					_xpath_desc( e, @v )
+					lastFlag := 1
+					
 				otherwise
 					lastError := "Axis '"+cond:axis+"' isn't yet implemented."
 					return NIL
 			endswitch
 		next
 	next
+	if lastFlag > 0
+		lastFlag := 0
+	endif
 	if XPATH_DEBUG
 		?? "XPath: list:", chr(10)
 		for c in v
@@ -1041,10 +1069,14 @@
 	endswitch
 return NIL
 
-/* Dump XPatch expression block */
+/* Dump XPath expression block */
 static function _xpath_dumpBlock( b, level )
 	local l, s:='', childs:={}, cN
 	
+	if valtype(b) != 'O' .or. ! 'TYPE' $ b
+		return NIL
+	endif
+	
 	l := replicate( '    ', level )
 	switch b:type
 		case XPATH_BLOCK_NODESET




Update of /cvsroot/eas-dev/clip-xml/example
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23140/example

Modified Files:
	component.xml 
Log Message:
Add descendant search support

Index: component.xml
===================================================================
RCS file: /cvsroot/eas-dev/clip-xml/example/component.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- component.xml	2 Jun 2006 14:15:21 -0000	1.1
+++ component.xml	25 Oct 2006 07:36:10 -0000	1.2
@@ -80,6 +80,7 @@
   </install>
   
   <uninstall> <!-- custom uninstall actions -->
+	<file name="** uninstall" />
   </uninstall>
 
   <locale lang="ru">




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

Removed Files:
	Makefile codb.prg command.prg formatter.prg 
Log Message:
Move libcodb_query to CLIP

--- Makefile DELETED ---

--- codb.prg DELETED ---

--- command.prg DELETED ---

--- formatter.prg DELETED ---





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

eas-dev-commit Mailing List for E/AS (Page 5)

eas-dev-commit — Commit Log