[frontierkernel-commits] odbs/prefsRoot/prefsSuite displayPicture,1.1,1.2

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

Update of /cvsroot/frontierkernel/odbs/prefsRoot/prefsSuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17467

Modified Files:
	displayPicture 
Log Message:
removed return at end of script after scriptError return

changed adrString to the more commonly used partialAddress

Index: displayPicture
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/prefsRoot/prefsSuite/displayPicture,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** displayPicture	28 Jul 2005 06:53:22 -0000	1.1
--- displayPicture	5 Sep 2005 15:57:42 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:prefsSuite.displayPicture
  
! on displayPicture (adrString = nil, adrMemberInfo = nil, pta = nil) {
	ÇChanges
		Ç7/27/05; 8:14:55 PM by TAC
			Çcreated
	
	if pta == nil {
		pta = html.getPageTableAddress ()};
	
	if adrMemberInfo == nil {
		try {
			adrMemberInfo = pta^.adrMemberInfo}};
	
	if adrString == nil {
		adrString = pta^.pathArgs};
	
	on error () { // this block needs to be updated, intregrate text into mainResponder language table
		local (replacementTable); new (tableType, @replacementTable);
		replacementTable.picAddress = pta^.pathArgs;
		local (languageTable); new (tableType, @languageTable); new (tableType, @languageTable.strings); new (tableType, @languageTable.strings.prefs);
		languageTable.strings.prefs.pictureDoesntExistError = "Can't display picture at [[picAddress]] because it doesn't exist.";
		scriptError (mainResponder.getString ("prefs.pictureDoesntExistError", @replacementTable, @languageTable, pta))};
	
	adrString = "[\"" + string.replaceAll (adrString, ".", "\"].[\"") + "\"]";
	
	local (adrImageTable);
	
	try {
		adrImageTable = address (adrMemberInfo + adrString)}
	else {
		error ()};
	
	if not (defined (adrImageTable^)) {
		error ()};
	
	if not (defined (adrImageTable^.height) or defined (adrImageTable^.width)) { // ideally we wouldn't need this, it should be taken care of when the picture is uploaded.  folks may have uploaded some pictures already so this is defensive
		local (hwList);
		case string.lower (adrImageTable^.["Content-Type"]) { // is it a GIF or a JPEG?
			"image/gif" {
				hwList = html.getGifHeightWidth (@adrImageTable^.data)};
			"image/jpeg";
			"image/pjpeg" {
				hwList = html.getJpegHeightWidth (@adrImageTable^.data)}};
		if hwList != nil {
			adrImageTable^.height = hwList [1];
			adrImageTable^.width = hwList [2]}};
	
	pta^.responseHeaders.["Content-Type"] = adrImageTable^.["Content-Type"];
	pta^.responseBody= adrImageTable^.data;
	scriptError ("!return"); // return now, don't do any more processing
	
	return ("")}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:prefsSuite.displayPicture
  
! on displayPicture (partialAddress = nil, adrMemberInfo = nil, pta = nil) {
	ÇChanges
		Ç7/30/05; 9:36:44 AM by TAC
			Çremoved return at end of script after scriptError return
			Çchanged adrString to the more commonly used partialAddress, it's early on so this change shouldn't cause too much trouble
		Ç7/27/05; 8:14:55 PM by TAC
			Çcreated
	
	if pta == nil {
		pta = html.getPageTableAddress ()};
	
	if adrMemberInfo == nil {
		try {
			adrMemberInfo = pta^.adrMemberInfo}};
	
	if partialAddress == nil {
		partialAddress = pta^.pathArgs};
	
	on error () { // this block needs to be updated, intregrate text into mainResponder language table
		local (replacementTable); new (tableType, @replacementTable);
		replacementTable.picAddress = pta^.pathArgs;
		local (languageTable); new (tableType, @languageTable); new (tableType, @languageTable.strings); new (tableType, @languageTable.strings.prefs);
		languageTable.strings.prefs.pictureDoesntExistError = "Can't display picture at [[picAddress]] because it doesn't exist.";
		scriptError (mainResponder.getString ("prefs.pictureDoesntExistError", @replacementTable, @languageTable, pta))};
	
	partialAddress = "[\"" + string.replaceAll (partialAddress, ".", "\"].[\"") + "\"]";
	
	local (adrImageTable);
	
	try {
		adrImageTable = address (adrMemberInfo + partialAddress)}
	else {
		error ()};
	
	if not (defined (adrImageTable^)) {
		error ()};
	
	if not (defined (adrImageTable^.height) or defined (adrImageTable^.width)) { // ideally we wouldn't need this, it should be taken care of when the picture is uploaded.  folks may have uploaded some pictures already so this is defensive
		local (hwList);
		case string.lower (adrImageTable^.["Content-Type"]) { // is it a GIF or a JPEG?
			"image/gif" {
				hwList = html.getGifHeightWidth (@adrImageTable^.data)};
			"image/jpeg";
			"image/pjpeg" {
				hwList = html.getJpegHeightWidth (@adrImageTable^.data)}};
		if hwList != nil {
			adrImageTable^.height = hwList [1];
			adrImageTable^.width = hwList [2]}};
	
	pta^.responseHeaders.["Content-Type"] = adrImageTable^.["Content-Type"];
	pta^.responseBody= adrImageTable^.data;
	scriptError ("!return")} // return now, don't do any more processing
\ No newline at end of file