[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/fatPages unpackOdbObject,1.1.1.1,1.2

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/fatPages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23530

Modified Files:
	unpackOdbObject 
Log Message:
fix for top level items in guest databases

Index: unpackOdbObject
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/fatPages/unpackOdbObject,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** unpackOdbObject	26 Mar 2005 19:42:45 -0000	1.1.1.1
--- unpackOdbObject	13 Jun 2005 23:58:26 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.fatPages.unpackOdbObject
  
! on unpackOdbObject (adrAtts, adrDest, path=nil, flRunnable=false, flEdit=true) {
	local (data, objectType);
	objectType = fatPages.getObjectType (adrAtts);
	if not objectType {
		fatPages.noObjectError (path)};
	data = fatPages.decode (@adrAtts^.pageData);
	delete (@adrAtts^.pageData); //we're done with it, free memory now
	setBinaryType (@data, objectType);
	table.surePath (adrDest);
	unpack (@data, adrDest); //unpack the data
	delete (@data); //we're done with it, free memory
	if flRunnable { //it's a desktop script
		local (wasDefined);
		system.deskscripts.path = path; //make path available to the script
		wasDefined = defined (adrDest^);
		adrDest^ (); //It's runnable. Run the script.
		if not wasDefined {
			delete (adrDest)}}
	else { //it's not a desktop script
		if parentOf (adrDest^) == @suites {
			system.menus.buildSuitesSubMenu ()};
		if flEdit {
			edit (adrDest)}};
	return (true)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.fatPages.unpackOdbObject
  
! on unpackOdbObject (adrAtts, adrDest, path=nil, flRunnable=false, flEdit=true) {
	ÇChanges
		Ç12/12/04; 4:58:05 PM by TAC
			Çfix for top level items in guest databases
	
	local (data, objectType);
	objectType = fatPages.getObjectType (adrAtts);
	if not objectType {
		fatPages.noObjectError (path)};
	data = fatPages.decode (@adrAtts^.pageData);
	delete (@adrAtts^.pageData); //we're done with it, free memory now
	setBinaryType (@data, objectType);
	if defined (adrAtts^.guestDatabaseName) { // 12/12/04; 4:58:05 PM by TAC - top level item from a guest database that isn't a table
		adrDest = address (@[window.getFile (adrAtts^.guestDatabaseName)] + "." + adrDest)};
	table.surePath (adrDest);
	unpack (@data, adrDest); //unpack the data
	delete (@data); //we're done with it, free memory
	if flRunnable { //it's a desktop script
		local (wasDefined);
		system.deskscripts.path = path; //make path available to the script
		wasDefined = defined (adrDest^);
		adrDest^ (); //It's runnable. Run the script.
		if not wasDefined {
			delete (adrDest)}}
	else { //it's not a desktop script
		if parentOf (adrDest^) == @suites {
			system.menus.buildSuitesSubMenu ()};
		if flEdit {
			edit (adrDest)}};
	return (true)}
\ No newline at end of file