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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/admin/import.tcl	13 Sep 2012 16:05:32 -0000	1.22
@@ -0,0 +1,78 @@
+::xowiki::Package initialize -ad_doc {
+  import objects in xotcl format
+
+  @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at)
+  @creation-date Aug 11, 2006
+  @cvs-id $Id: import.tcl,v 1.22 2012/09/13 16:05:32 victorg Exp $
+} -parameter {
+  {create_user_ids 0}
+  {replace 0}
+}
+
+set msg ""
+ad_form \
+    -name upload_form \
+    -mode edit \
+    -export {parent_id return_url} \
+    -html { enctype multipart/form-data } \
+    -form {
+      {upload_file:file(file) {html {size 30}} {label "[_ xowiki.import_upload_file]"}}
+      {create_user_ids:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} 
+        {label "[_ xowiki.import_create_user_ids]"}
+        {help_text "[_ xowiki.import_create_user_ids_helptxt]"}
+      }
+      {replace:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} 
+        {label "[_ xowiki.import_replace]"}
+        {help_text "[_ xowiki.import_replace_helptxt]"}
+      }
+      {ok_btn:text(submit) {label "[_ acs-templating.HTMLArea_SelectUploadBtn]"}
+      }
+    } \
+    -on_submit {
+      # check file name
+      if {$upload_file eq ""} {
+        template::form::set_error upload_form upload_file \
+            [_ acs-templating.HTMLArea_SpecifyUploadFilename]
+        break
+      }
+
+      set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file]
+      set f [open $upload_tmpfile]; 
+      # if we do not set translation binary,
+      # backslashes at the end of the lines might be lost
+      fconfigure $f -translation binary -encoding utf-8
+      set content [read $f]; close $f
+
+      foreach o [::xowiki::Page allinstances] { 
+        set preexists($o) 1
+      }
+      if {[catch {namespace eval ::xo::import $content} error]} {
+	#my msg "Error: $::errorInfo"
+        set msg "Error: $error\n$::errorInfo"
+      } else {
+        set objects [list]
+        foreach o [::xowiki::Page allinstances] {
+          if {![info exists preexists($o)]} {lappend objects $o}
+        }
+        ns_log notice "objects to import: $objects"
+        set parent_id [ns_queryget parent_id 0]
+        #::xotcl::Object msg parent_id=$parent_id
+        if {[catch {
+          set msg [$package_id import -replace $replace -create_user_ids $create_user_ids \
+                       -parent_id $parent_id -objects $objects]
+        } errMsg]} {
+          ns_log notice "Error during import: $errMsg\nErrInfo: $::errorInfo"
+          ::xotcl::Object msg "Error during import: $errMsg\nErrInfo: $::errorInfo"
+          foreach o $objects {$o destroy}
+          error $errMsg
+        }
+        foreach o $objects {if {[::xotcl::Object isobject $o]} {$o destroy}}
+      }
+      namespace delete ::xo::import
+    }
+
+
+set return_url [ns_queryget return_url ../]
+set title [_ xowiki.import_title]
+set context .
+ad_return_template