[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/fatPages getFileData,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-serv26945

Modified Files:
	getFileData 
Log Message:
added table.surePath call before coercing adrPageData to address

Index: getFileData
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/fatPages/getFileData,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** getFileData	26 Mar 2005 19:42:45 -0000	1.1.1.1
--- getFileData	5 Sep 2005 16:21:43 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.fatPages.getFileData
  
! on getFileData (path) {
	ÇThis script is called from the FATP file clicker script.
	local (flRunnable = false, flOdb = false, adrDest);
	local (pageSource = fatPages.readSourceFile (path));
	
	bundle { //fill in atts table
		if not fatPages.getPageAtts (@pageSource, @atts) {
			fatPages.noObjectError (path)};
		if not defined (atts.pageData) {
			fatPages.noObjectError (path)};
		atts.path = path};
	
	bundle { //is this a runnable desktop script?
		if string.lower (file.type (path)) == "ftds" {
			ÇDesktop scripts are of type ftds.
			flRunnable = true};
		if defined (atts.runnable) and atts.runnable {
			flRunnable = true};
		if kb.cmdKey () {
			flRunnable = false}};
	
	if defined (atts.adrPageData) { //is this an odb object?
		flOdb = true};
	
	if (window.isOpen (path)) and (not flRunnable) and (not flOdb) {
		window.bringToFront (path);
		return (true)};
	
	if flOdb and !flRunnable { //if it's an odb object, confirm the destination adr
		adrDest = fatPages.confirmAddress (atts.adrPageData);
		if not adrDest {
			return (false)}};
	
	bundle { //move the data into a new file window or the odb
		if flOdb {
			if flRunnable { //no user confirmation
				adrDest = address (atts.adrPageData)};
			fatPages.unpackOdbObject (@atts, adrDest, path, flRunnable)}
		else {
			fatPages.unpackFileObject (@atts, path, flRunnable)}};
	return (true)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.fatPages.getFileData
  
! on getFileData (path) {
	ÇThis script is called from the FATP file clicker script.
	ÇChanges
		Ç8/14/05; 10:00:38 AM by TAC
			Çadded table.surePath call before coercing adrPageData to address
	local (flRunnable = false, flOdb = false, adrDest);
	local (pageSource = fatPages.readSourceFile (path));
	
	bundle { //fill in atts table
		if not fatPages.getPageAtts (@pageSource, @atts) {
			fatPages.noObjectError (path)};
		if not defined (atts.pageData) {
			fatPages.noObjectError (path)};
		atts.path = path};
	
	bundle { //is this a runnable desktop script?
		if string.lower (file.type (path)) == "ftds" {
			ÇDesktop scripts are of type ftds.
			flRunnable = true};
		if defined (atts.runnable) and atts.runnable {
			flRunnable = true};
		if kb.cmdKey () {
			flRunnable = false}};
	
	if defined (atts.adrPageData) { //is this an odb object?
		flOdb = true};
	
	if (window.isOpen (path)) and (not flRunnable) and (not flOdb) {
		window.bringToFront (path);
		return (true)};
	
	if flOdb and !flRunnable { //if it's an odb object, confirm the destination adr
		adrDest = fatPages.confirmAddress (atts.adrPageData);
		if not adrDest {
			return (false)}};
	
	bundle { //move the data into a new file window or the odb
		if flOdb {
			if flRunnable { //no user confirmation
				table.surePath (atts.adrPageData); // 8/14/05; 9:59:06 AM by TAC - may need to be more robust
				adrDest = address (atts.adrPageData)};
			fatPages.unpackOdbObject (@atts, adrDest, path, flRunnable)}
		else {
			fatPages.unpackFileObject (@atts, path, flRunnable)}};
	return (true)}
\ No newline at end of file