Index: openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-edit.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl	16 Sep 2002 13:01:34 -0000	1.7
+++ openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl	2 Jan 2003 16:41:22 -0000	1.8
@@ -16,7 +16,7 @@
     ad_script_abort
 }
 
-set today [db_string today { *SQL* }]
+set today [db_string today {}]
 set today_html [ad_quotehtml $today]
 
 form create entry
@@ -30,29 +30,24 @@
 element create entry draft_p -label "Post Status" -datatype text -widget select -options { { "Draft" "t" } { "Publish" "f" } }
 
 element create entry entry_id -widget hidden -datatype text
-element create entry insert_or_update -widget hidden -datatype text
 element create entry return_url -widget hidden -datatype text -value $return_url
 
 if { [form is_request entry] } {
 
     if { [empty_string_p $entry_id] } {
-        set insert_or_update insert
         set entry_id [db_nextval "acs_object_id_seq"]
         element set_properties entry entry_date -value $today
         element set_properties entry draft_p -value "t"
     } else {
-        set insert_or_update update
+        db_1row entry {}
         
-        db_1row entry { *SQL* }
-        
         element set_properties entry title -value $title
         element set_properties entry content -value $content
         element set_properties entry entry_date -value $entry_date
         element set_properties entry draft_p -value $draft_p
     }
 
     element set_properties entry entry_id -value $entry_id
-    element set_properties entry insert_or_update -value $insert_or_update
 }
 
 
@@ -65,9 +60,9 @@
     set draft_p [ad_decode $draft_p "" "f" $draft_p]
 
     set return_url [element get_value entry return_url]
-    set insert_or_update [element get_value entry insert_or_update]
+    
 
-    if { [string equal $insert_or_update "insert"] } {
+    if { [db_string entry_exists {}] == 0 } {
         lars_blog_entry_add \
                 -entry_id $entry_id \
                 -package_id [ad_conn package_id] \
@@ -78,14 +73,14 @@
     } else {
         set set_clauses { "title = :title" "content = :content" "entry_date = to_date(:entry_date, 'YYYY-MM-DD')" "draft_p = :draft_p" }
 
-        set org_draft_p [db_string org_draft_p { select draft_p from pinds_blog_entries where entry_id = :entry_id } ]
+        set org_draft_p [db_string org_draft_p {} ]
 
         if { [string equal $draft_p "t"] && [string equal $org_draft_p "f"] } {
             # If this is a publish, set the posted_date to now
             lappend set_clauses [db_map now]
         }
     
-        db_dml update_entry { *SQL* }
+        db_dml update_entry {}
 
         lars_blog_flush_cache [ad_conn package_id]
     }
@@ -98,19 +93,8 @@
     ad_script_abort
 } 
 
-if { ![form is_request entry] && ![form is_valid entry] } {
-    set insert_or_update [element get_value entry insert_or_update]
-}
+set page_title "Blog Entry"
 
-switch -- $insert_or_update {
-    insert {
-        set page_title "Add Blog Entry"
-    }
-    update {
-        set page_title "Edit Blog Entry"
-    }
-}
-
 set context_bar [ad_context_bar $page_title]
 
 ad_return_template
\ No newline at end of file
Index: openacs-4/packages/lars-blogger/www/admin/entry-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-edit.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lars-blogger/www/admin/entry-edit.xql	19 Aug 2002 21:52:59 -0000	1.1
+++ openacs-4/packages/lars-blogger/www/admin/entry-edit.xql	2 Jan 2003 16:41:22 -0000	1.2
@@ -2,6 +2,22 @@
 
 <queryset>
 
+    <fullquery name="entry_exists">
+        <querytext>
+            select count(*) 
+            from   pinds_blog_entries 
+            where  entry_id = :entry_id 
+        </querytext>
+    </fullquery>
+
+    <fullquery name="org_draft_p">
+        <querytext>
+            select draft_p 
+            from   pinds_blog_entries 
+            where  entry_id = :entry_id
+        </querytext>
+    </fullquery>
+
     <fullquery name="entry">
         <querytext>
             select title, content, draft_p, to_char(entry_date, 'YYYY-MM-DD') as entry_date