[frontierkernel-commits] odbs/frontierRoot/suites/webEditServer/rpcHandlers/webEdit sendToServer,1.1.1.1,1.2

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

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/webEditServer/rpcHandlers/webEdit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2648

Modified Files:
	sendToServer 
Log Message:
pop file from adrObject for user display

Index: sendToServer
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/suites/webEditServer/rpcHandlers/webEdit/sendToServer,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sendToServer	26 Mar 2005 19:41:18 -0000	1.1.1.1
--- sendToServer	25 Dec 2005 01:44:05 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:suites.webEditServer.rpcHandlers.webEdit.sendToServer
  
! on sendToServer (userName, password, adrObject, data, objectType, note="") {
	ÇThe client is sending us an object that's checked out, but it shouldn't be checked back in yet. The client is not giving up custody.
		ÇTue, Mar 9, 1999 at 3:40:53 PM by PBS
	
	local (adrPreCallback = @user.webEditServer.callbacks.preSendToServer);
	local (adrCallback = @user.webEditServer.callbacks.sendToServer);
	local (now = clock.now ());
	
	if not (people.authenticateUser (userName, password, "WebEdit")) {
		scriptError ("Can't replace " + adrObject + " because an invalid username or password was supplied.")};
	
	adrObject = webEditServer.fixGuestDbAdr (adrObject);
	
	ÇMake sure the object is checked out by this user, if the object already exists.
	if defined (adrObject^) {
		if not (custody.isCheckedOutByUser (adrObject, userName)) {
			return ("Can't replace " + adrObject + " because " + userName + " has not checked it out.")}};
	
	data = fatPages.decode (@data);
	setBinaryType (@data, string4 (objectType));
	unpack (@data, @data);
	
	webEditServer.callbackLoop (adrPreCallback, adrObject, userName, now, "");
	
	table.assign (address (adrObject), data);
	
	webEditServer.callbackLoop (adrCallback, adrObject, userName, now, note);
	
	ÇAdd to the imported objects log.
	export.addToLog (adrObject, notes:"From " + username);
	
	filemenu.saveMyRoot (adrobject);
	
	return (adrObject + " has been replaced on the server.")}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:suites.webEditServer.rpcHandlers.webEdit.sendToServer
  
! on sendToServer (userName, password, adrObject, data, objectType, note="") {
	ÇChanges
		Ç12/24/05; 2:19:11 PM by TAC
			Çpop file from adrObject for user display
		ÇTue, Mar 9, 1999 at 3:40:53 PM by PBS
			ÇThe client is sending us an object that's checked out, but it shouldn't be checked back in yet. The client is not giving up custody.
	
	local (adrPreCallback = @user.webEditServer.callbacks.preSendToServer);
	local (adrCallback = @user.webEditServer.callbacks.sendToServer);
	local (now = clock.now ());
	
	if not (people.authenticateUser (userName, password, "WebEdit")) {
		scriptError ("Can't replace " + string.popFileFromAddress (adrObject) + " because an invalid userName or password was supplied.")};
	
	adrObject = webEditServer.fixGuestDbAdr (adrObject);
	
	ÇMake sure the object is checked out by this user, if the object already exists.
	if defined (adrObject^) {
		if not (custody.isCheckedOutByUser (adrObject, userName)) {
			return ("Can't replace " + string.popFileFromAddress (adrObject) + " because " + userName + " has not checked it out.")}};
	
	data = fatPages.decode (@data);
	setBinaryType (@data, string4 (objectType));
	unpack (@data, @data);
	
	webEditServer.callbackLoop (adrPreCallback, adrObject, userName, now, "");
	
	table.assign (address (adrObject), data);
	
	webEditServer.callbackLoop (adrCallback, adrObject, userName, now, note);
	
	ÇAdd to the imported objects log.
	export.addToLog (adrObject, notes: "From " + userName);
	
	filemenu.saveMyRoot (adrobject);
	
	return (string.popFileFromAddress (adrObject) + " has been replaced on the server.")}
\ No newline at end of file