From c65c92ebf5bc7aec9284b170898164ee798f9f4b Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 7 Oct 2002 00:41:36 +0000
Subject: [PATCH] Made some efficiency improvements in wobject save.

---
 lib/WebGUI/Wobject.pm                   | 3 ++-
 lib/WebGUI/Wobject/Article.pm           | 4 ++--
 lib/WebGUI/Wobject/EventsCalendar.pm    | 3 +--
 lib/WebGUI/Wobject/ExtraColumn.pm       | 3 +--
 lib/WebGUI/Wobject/FAQ.pm               | 9 ++++-----
 lib/WebGUI/Wobject/FileManager.pm       | 3 +--
 lib/WebGUI/Wobject/Item.pm              | 4 ++--
 lib/WebGUI/Wobject/LinkList.pm          | 3 +--
 lib/WebGUI/Wobject/MailForm.pm          | 3 +--
 lib/WebGUI/Wobject/MessageBoard.pm      | 3 +--
 lib/WebGUI/Wobject/Poll.pm              | 3 +--
 lib/WebGUI/Wobject/Product.pm           | 4 ++--
 lib/WebGUI/Wobject/SQLReport.pm         | 4 +---
 lib/WebGUI/Wobject/SiteMap.pm           | 3 +--
 lib/WebGUI/Wobject/SyndicatedContent.pm | 3 +--
 lib/WebGUI/Wobject/USS.pm               | 5 ++---
 lib/WebGUI/Wobject/WobjectProxy.pm      | 3 +--
 17 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index 08a83e8b4..a4f6cd9b3 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -995,7 +995,8 @@ sub www_editSave {
 		groupToPost=>$session{form}{groupToPost},
 		groupToModerate=>$session{form}{groupToModerate},
 		editTimeout=>$session{form}{editTimeout},
-		moderationType=>$session{form}{moderationType}
+		moderationType=>$session{form}{moderationType},
+		%{$_[1]}
 	});
 	return "";
 }
diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm
index 6b8ca3f0f..2041748b7 100644
--- a/lib/WebGUI/Wobject/Article.pm
+++ b/lib/WebGUI/Wobject/Article.pm
@@ -122,7 +122,7 @@ sub www_edit {
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
         my ($image, $attachment, %property);
-	$_[0]->SUPER::www_editSave();
+	$_[0]->SUPER::www_editSave() if ($_[0]->get("wobjectId") eq "new");
         $image = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
 	$image->save("image");
         $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
@@ -134,7 +134,7 @@ sub www_editSave {
 	$property{linkTitle} = $session{form}{linkTitle};
 	$property{linkURL} = $session{form}{linkURL};
 	$property{allowDiscussion} = $session{form}{allowDiscussion};
-	$_[0]->set(\%property);
+	$_[0]->SUPER::www_editSave(\%property);
         return "";
 }
 
diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm
index 8c3afdc07..d0ad042cb 100644
--- a/lib/WebGUI/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Wobject/EventsCalendar.pm
@@ -170,8 +170,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		calendarLayout=>$session{form}{calendarLayout},
 		paginateAfter=>$session{form}{paginateAfter}
 		});
diff --git a/lib/WebGUI/Wobject/ExtraColumn.pm b/lib/WebGUI/Wobject/ExtraColumn.pm
index ef065fca8..c8dced208 100644
--- a/lib/WebGUI/Wobject/ExtraColumn.pm
+++ b/lib/WebGUI/Wobject/ExtraColumn.pm
@@ -86,8 +86,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		spacer=>$session{form}{spacer},
 		width=>$session{form}{width},
 		class=>$session{form}{class}
diff --git a/lib/WebGUI/Wobject/FAQ.pm b/lib/WebGUI/Wobject/FAQ.pm
index 526d9644b..8c8863663 100644
--- a/lib/WebGUI/Wobject/FAQ.pm
+++ b/lib/WebGUI/Wobject/FAQ.pm
@@ -103,11 +103,10 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
         if (WebGUI::Privilege::canEditPage()) {
-		$_[0]->SUPER::www_editSave();
-		$_[0]->set({
-			tocOn=>$session{form}{tocOn},
-			topOn=>$session{form}{topOn},
-			qaOn=>$session{form}{qaOn}
+		$_[0]->SUPER::www_editSave({
+                        tocOn=>$session{form}{tocOn},
+                        topOn=>$session{form}{topOn},
+                        qaOn=>$session{form}{qaOn}
 			});
 		if ($session{form}{proceed}) {
 			$_[0]->www_editQuestion();
diff --git a/lib/WebGUI/Wobject/FileManager.pm b/lib/WebGUI/Wobject/FileManager.pm
index ab490068f..cc673f96c 100644
--- a/lib/WebGUI/Wobject/FileManager.pm
+++ b/lib/WebGUI/Wobject/FileManager.pm
@@ -166,8 +166,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		paginateAfter=>$session{form}{paginateAfter},
 		displayThumbnails=>$session{form}{displayThumbnails}
 		});
diff --git a/lib/WebGUI/Wobject/Item.pm b/lib/WebGUI/Wobject/Item.pm
index 4a368b224..e2d116105 100644
--- a/lib/WebGUI/Wobject/Item.pm
+++ b/lib/WebGUI/Wobject/Item.pm
@@ -62,12 +62,12 @@ sub www_edit {
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
         my ($attachment, $property);
-	$_[0]->SUPER::www_editSave();
+	$_[0]->SUPER::www_editSave() if ($_[0]->get("wobjectId") eq "new");
         $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
 	$attachment->save("attachment");
 	$property->{linkURL} = $session{form}{linkURL};
 	$property->{attachment} = $attachment->getFilename if ($attachment->getFilename ne "");
-	$_[0]->set($property);
+	$_[0]->SUPER::www_editSave($property);
         return "";
 }
 
diff --git a/lib/WebGUI/Wobject/LinkList.pm b/lib/WebGUI/Wobject/LinkList.pm
index fd31b3ad0..411f71dba 100644
--- a/lib/WebGUI/Wobject/LinkList.pm
+++ b/lib/WebGUI/Wobject/LinkList.pm
@@ -96,8 +96,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-        $_[0]->SUPER::www_editSave();
-	$_[0]->set({
+        $_[0]->SUPER::www_editSave({
 		indent=>$session{form}{indent},
 		bullet=>$session{form}{bullet},
 		lineSpacing=>$session{form}{lineSpacing}
diff --git a/lib/WebGUI/Wobject/MailForm.pm b/lib/WebGUI/Wobject/MailForm.pm
index 905ae15d3..1c0358337 100755
--- a/lib/WebGUI/Wobject/MailForm.pm
+++ b/lib/WebGUI/Wobject/MailForm.pm
@@ -153,11 +153,10 @@ sub www_edit {
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
 	my ($property);
-	$_[0]->SUPER::www_editSave();
 	foreach my $field (@fields) {
 		$property->{$field} = $session{form}{$field};
 	}
-	$_[0]->set($property);
+	$_[0]->SUPER::www_editSave($property);
         if ($session{form}{proceed}) {
             return $_[0]->www_editField();
         } else {
diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm
index 43ceab9d5..8c45c7806 100644
--- a/lib/WebGUI/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Wobject/MessageBoard.pm
@@ -67,8 +67,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		messagesPerPage=>$session{form}{messagesPerPage}
 		});
         return "";
diff --git a/lib/WebGUI/Wobject/Poll.pm b/lib/WebGUI/Wobject/Poll.pm
index a031d2db5..44450ea7e 100644
--- a/lib/WebGUI/Wobject/Poll.pm
+++ b/lib/WebGUI/Wobject/Poll.pm
@@ -125,7 +125,6 @@ sub www_edit {
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
 	my (@answer, $i, $property);
-	$_[0]->SUPER::www_editSave();
 	@answer = split("\n",$session{form}{answers});
         for ($i=1; $i<=20; $i++) {
              	$property->{'a'.$i} = $answer[($i-1)];
@@ -136,7 +135,7 @@ sub www_editSave {
 	$property->{graphWidth} = $session{form}{graphWidth};
 	$property->{active} = $session{form}{active};
 	$property->{question} = $session{form}{question};
-	$_[0]->set($property);
+	$_[0]->SUPER::www_editSave($property);
 	return "";
 }
 
diff --git a/lib/WebGUI/Wobject/Product.pm b/lib/WebGUI/Wobject/Product.pm
index 654c1ad97..07059061c 100644
--- a/lib/WebGUI/Wobject/Product.pm
+++ b/lib/WebGUI/Wobject/Product.pm
@@ -333,7 +333,7 @@ sub www_edit {
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
 	my ($file, %property);
-	$_[0]->SUPER::www_editSave();
+	$_[0]->SUPER::www_editSave() if ($_[0]->get("wobjectId") eq "new");
 	$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
         $file->save("image1");
 	$property{image1}=$file->getFilename("image1") if ($file->getFilename("image1") ne "");
@@ -355,7 +355,7 @@ sub www_editSave {
 	$property{Product_templateId}=$session{form}{Product_templateId};
 	$property{price}=$session{form}{price};
 	$property{productNumber}=$session{form}{productNumber};
-	$_[0]->set(\%property);
+	$_[0]->SUPER::www_editSave(\%property);
 	return "";
 }
 
diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm
index e24219140..a6f244c58 100644
--- a/lib/WebGUI/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Wobject/SQLReport.pm
@@ -82,9 +82,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-        my ($wobjectId, $displayTitle, $image, $attachment);
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		template=>$session{form}{template},
 		dbQuery=>$session{form}{dbQuery},
 		convertCarriageReturns=>$session{form}{convertCarriageReturns},
diff --git a/lib/WebGUI/Wobject/SiteMap.pm b/lib/WebGUI/Wobject/SiteMap.pm
index 03af953a3..308acaf12 100644
--- a/lib/WebGUI/Wobject/SiteMap.pm
+++ b/lib/WebGUI/Wobject/SiteMap.pm
@@ -100,14 +100,13 @@ sub www_edit {
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
 	my ($property);
-	$_[0]->SUPER::www_editSave();
 	$property->{indent} = $session{form}{indent};
 	$property->{displaySynopsis} = $session{form}{displaySynopsis};
 	$property->{bullet} = $session{form}{bullet};
 	$property->{startAtThisLevel} = $session{form}{startAtThisLevel};
 	$property->{depth} = $session{form}{depth};
 	$property->{lineSpacing} = $session{form}{lineSpacing};
-	$_[0]->set($property);
+	$_[0]->SUPER::www_editSave($property);
         return "";
 }
 
diff --git a/lib/WebGUI/Wobject/SyndicatedContent.pm b/lib/WebGUI/Wobject/SyndicatedContent.pm
index 4032ab123..81fdfe453 100644
--- a/lib/WebGUI/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Wobject/SyndicatedContent.pm
@@ -71,11 +71,10 @@ sub www_edit {
 sub www_editSave {
         return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
 	my ($property);
-	$_[0]->SUPER::www_editSave();
 	$property->{rssUrl} = $session{form}{rssUrl};
 	$property->{content} = $session{form}{content} if ($session{form}{content} ne "");
 	$property->{lastFetched} = $session{form}{lastFetched} if ($session{form}{lastFetched} ne "");
-	$_[0]->set($property);
+	$_[0]->SUPER::www_editSave($property);
         return "";
 }
 
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index 29764646a..fe1d8f299 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -14,7 +14,7 @@ use strict;
 use Tie::CPHash;
 use WebGUI::Attachment;
 use WebGUI::DateTime;
-#use WebGUI::Discussion;
+use WebGUI::Discussion;
 use WebGUI::HTML;
 use WebGUI::HTMLForm;
 use WebGUI::Icon;
@@ -333,8 +333,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		submissionsPerPage=>$session{form}{submissionsPerPage},
 		groupToContribute=>$session{form}{groupToContribute},
 		groupToApprove=>$session{form}{groupToApprove},
diff --git a/lib/WebGUI/Wobject/WobjectProxy.pm b/lib/WebGUI/Wobject/WobjectProxy.pm
index bc7c93150..f02fed7b8 100644
--- a/lib/WebGUI/Wobject/WobjectProxy.pm
+++ b/lib/WebGUI/Wobject/WobjectProxy.pm
@@ -87,8 +87,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave();
-        $_[0]->set({
+	$_[0]->SUPER::www_editSave({
 		proxiedWobjectId=>$session{form}{proxiedWobjectId}
 		});
         return "";