Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/admin/import.tcl	26 Jan 2006 01:30:46 -0000	1.2
+++ openacs-4/packages/xowiki/www/admin/import.tcl	3 Feb 2006 22:17:41 -0000	1.3
@@ -17,58 +17,12 @@
 	break
       }
 
-      set file_name [template::util::file::get_property filename $upload_file]
       set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file]
-      set mime_type [template::util::file::get_property mime_type $upload_file]
       set f [open $upload_tmpfile]; set content [read $f]; close $f
       if {[catch {eval $content} error]} {
-	append  msg "Error: $error"
+	set msg "Error: $error"
       } else {
-
-	set replace 0 ;# 1 is overwrite mode
-	set object_type ::xowiki::Page
-	set folder_id [$object_type require_folder -name xowiki]
-
-	append  msg "objects=[$object_type allinstances]<p>"
-	set added 0
-	foreach o [$object_type allinstances] {
-	  $o set parent_id $folder_id
-	  $o set package_id [ad_conn package_id]
-	  # page instances have references to page templates, add these first
-	  if {[$o istype ::xowiki::PageInstance]} continue
-	  set item [CrItem lookup -title [$o set title] -parent_id $folder_id]
-	  if {$item != 0 && $replace} { ;# we delete the original 
-	    ::Generic::CrItem delete -item_id $item 
-	    set item 0
-	  }
-	  if {$item == 0} {
-	    $o save_new
-	    incr added
-	  }
-	}
-
-	foreach o [$object_type allinstances] {
-	  if {[$o istype ::xowiki::PageInstance]} {
-	    db_transaction {
-	      set item [CrItem lookup -title [$o set title] -parent_id $folder_id]
-	      if {$item != 0 && $replace} { ;# we delete the original
-		::Generic::CrItem delete -item_id $item 
-		set item 0
-	      }
-	      if {$item == 0} {  ;# the item does not exist -> update reference and save
-		set old_template_id [$o set page_template]
-		set template [CrItem lookup \
-				  -title [$old_template_id set title] \
-				  -parent_id $folder_id]
-		$o set page_template $template
-		$o save_new
-		incr added
-	      }
-	    }
-	  }
-	  $o destroy
-	}
-	append msg "$added objects inserted<p>"
+	set msg [::xowiki::Page import]
       }
     }