Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.151 -r1.152
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Jul 2007 13:06:03 -0000	1.151
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Jul 2007 11:05:09 -0000	1.152
@@ -145,9 +145,9 @@
       -pretty_name "XoWiki FormPage" -pretty_plural "XoWiki FormPages" \
       -table_name "xowiki_form_page" -id_column "xowiki_form_page_id" 
 
-  ::Generic::CrClass create FormInstance -superclass PageInstance \
-      -pretty_name "XoWiki FormInstance" -pretty_plural "XoWiki FormInstances" \
-      -table_name "xowiki_form_instance" -id_column "xowiki_form_instance_id" 
+  #::Generic::CrClass create FormInstance -superclass PageInstance \
+  #    -pretty_name "XoWiki FormInstance" -pretty_plural "XoWiki FormInstances" \
+  #    -table_name "xowiki_form_instance" -id_column "xowiki_form_instance_id" 
 
   #
   # create various extra tables, indices and views
@@ -1061,8 +1061,9 @@
   PageTemplate proc count_usages {-item_id:required} {
     set count [db_string [my qn count_usages] \
 		   "select count(page_instance_id) from xowiki_page_instance, cr_items i \ 
-			where page_template = $item_id and
-                        page_instance_id = coalesce(i.live_revision,i.latest_revision)"]
+			where page_template = $item_id \
+                        and i.publish_status <> 'production' \
+                        and page_instance_id = coalesce(i.live_revision,i.latest_revision)"]
     return $count
   }
 
@@ -1415,7 +1416,7 @@
       my save
       my log "-- old_name $old_name, name $name"
       if {$old_name ne $name} {
-        my log "--forminstance renaming"
+        my log "--formpage renaming"
         db_dml [my qn update_rename] "update cr_items set name = :name \
                 where item_id = [my item_id]"
       }