[Eas-dev-commit] ocmng/components/ocmng/forms form.prg, 1.3, 1.4 form.xml, 1.3, 1.4

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

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

Modified Files:
	form.prg form.xml 
Log Message:
Minor update

Index: form.prg
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/forms/form.prg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- form.prg	21 Jun 2006 07:53:05 -0000	1.3
+++ form.prg	3 Sep 2006 13:44:48 -0000	1.4
@@ -307,16 +307,22 @@
 
 /* Lookup form in database */
 static function get_StoredForm(params)
-	local fClass, fName, r, c:=NIL, id
+	local fClass, fName, r, c:=NIL, id, appendix:=''
+	local q, fType:='', types:={ 'list', 'object' }
 
 	fClass := DEFAULT_FORM_CLASS
 	fName  := params:name
-	params:db := DEFAULT_FORM_DB
-	if "TYPE" $ params
-		fName := params:type+"/"+fName
+	if fName[6] == ':'
+		fName := substr( fName, 7 )
 	endif
 	
-	r := lquery(params, 'select content from '+fClass+' where name=="'+fName+'"')
+	// list, object
+	if "TYPE" $ params .and. ascan( types, {|e| e==params:type } ) > 0
+		fName := fName + '.' + params:type
+	endif
+	
+	q := 'select content from ' + fClass + ' where name=="' + fName + '"'
+	r := lquery(params, q)
 	if valtype(r) == 'A' .and. len(r) > 0
 		c := r[1][1]
 		eDebug(15, "FORM:",fName,len(c))

Index: form.xml
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/components/ocmng/forms/form.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- form.xml	6 Jun 2006 13:30:55 -0000	1.3
+++ form.xml	3 Sep 2006 13:44:48 -0000	1.4
@@ -29,7 +29,7 @@
 		<attribute name="content" type="text" lenType="alltrim" />
 		
 		<index name="name" expression="name"/>
-		
+	
 		<class name="mng_form"
 			   extent="component"
 			   essence="name"