Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl,v diff -u -r1.5.4.1 -r1.5.4.2 --- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl 29 Mar 2005 13:50:33 -0000 1.5.4.1 +++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl 15 Apr 2005 17:00:42 -0000 1.5.4.2 @@ -99,3 +99,4 @@ } } } + Index: openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl,v diff -u -r1.7.2.6 -r1.7.2.7 --- openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 13 Jan 2005 23:39:19 -0000 1.7.2.6 +++ openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 15 Apr 2005 17:00:42 -0000 1.7.2.7 @@ -71,6 +71,18 @@ @see content::symlink::new content::extlink::new content::folder::new } { + if {![info exists creation_user]} { + set creation_user [ad_conn user_id] + } + + if {![info exists creation_ip]} { + set creation_ip [ad_conn peeraddr] + } + + if {![exists_and_not_null content_type]} { + set content_type [::content::item::content_type -item_id $item_id] + } + set var_list [list] lappend var_list \ [list name $name] \ @@ -209,7 +221,8 @@ # content_type query was unsucessful, item does not exist return 0 } - set table_name [db_string get_table_name "select table_name from acs_object_types where object_type=:content_type"] + set table_name [acs_object_type::get_table_name -object_type $content_type] + set table_name "${table_name}x" # get attributes of the content_item use the content_typex view return [db_0or1row get_item "" -column_array local_array] Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v diff -u -r1.4.2.10 -r1.4.2.11 --- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 28 Feb 2005 09:22:42 -0000 1.4.2.10 +++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 15 Apr 2005 17:00:42 -0000 1.4.2.11 @@ -116,7 +116,7 @@ } } - set table_name [db_string get_table_name "select table_name from acs_object_types where object_type=:content_type"] + set table_name [acs_object_type::get_table_name -object_type $content_type] set table_name "${table_name}i" set query_text "insert into ${table_name} Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v diff -u -r1.16.2.9 -r1.16.2.10 --- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 29 Mar 2005 13:50:33 -0000 1.16.2.9 +++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 15 Apr 2005 17:00:42 -0000 1.16.2.10 @@ -102,7 +102,7 @@ } # Get the table name - set table_name [db_string get_table_name ""] + set table_name [acs_object_type::get_table_name -object_type $content_type] upvar content content Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.xql,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/acs-content-repository/tcl/filter-procs.xql 7 Jul 2003 12:25:53 -0000 1.4 +++ openacs-4/packages/acs-content-repository/tcl/filter-procs.xql 15 Apr 2005 17:00:42 -0000 1.4.4.1 @@ -27,15 +27,6 @@ - - - - select table_name from acs_object_types - where object_type = :content_type - - - - Index: openacs-4/packages/acs-content-repository/tcl/item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/item-procs.tcl,v diff -u -r1.18 -r1.18.2.1 --- openacs-4/packages/acs-content-repository/tcl/item-procs.tcl 16 Jan 2004 18:29:32 -0000 1.18 +++ openacs-4/packages/acs-content-repository/tcl/item-procs.tcl 15 Apr 2005 17:00:42 -0000 1.18.2.1 @@ -135,7 +135,7 @@ set content_type [get_content_type $item_id] # Get the table name - set table_name [db_string grc_get_table_names ""] + set table_name [acs_object_type::get_table_name -object_type $content_type] upvar content content Index: openacs-4/packages/acs-content-repository/tcl/item-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/item-procs.xql,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/acs-content-repository/tcl/item-procs.xql 16 Jan 2004 19:18:44 -0000 1.6 +++ openacs-4/packages/acs-content-repository/tcl/item-procs.xql 15 Apr 2005 17:00:42 -0000 1.6.2.1 @@ -9,14 +9,6 @@ - - - - select table_name from acs_object_types - where object_type = :content_type - - - Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v diff -u -r1.12.2.7 -r1.12.2.8 --- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 7 Oct 2004 17:51:30 -0000 1.12.2.7 +++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 15 Apr 2005 17:00:42 -0000 1.12.2.8 @@ -254,8 +254,19 @@ db_dml set_file_content "" } lob { - db_dml set_lob_content "" -blob_files [list $tmp_filename] + # mmagerl: rename file, because Oracle cannot handle UTF chararacters + set tmp_newname [uni_procs::masquerade_name -name $tmp_filename -masqslash "f"] + ns_log Debug "mmagerl: Renaming $tmp_filename to $tmp_newname" + if {![string eq $tmp_filename $tmp_newname]} { + file rename $tmp_filename $tmp_newname + } + db_dml set_lob_content "" -blob_files [list $tmp_newname] db_dml set_lob_size "" + ns_log Debug "mmagerl: Chaning $tmp_newname back to $tmp_filename" + if {![string eq $tmp_filename $tmp_newname]} { + file rename $tmp_newname $tmp_filename + } + # mmagerl: end } }