Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.73 -r1.74
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	17 Sep 2007 09:43:56 -0000	1.73
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	17 Sep 2007 12:58:29 -0000	1.74
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.4.0d5" url="http://openacs.org/repository/download/apm/acs-content-repository-5.4.0d5.apm">
+    <version name="5.4.0d7" url="http://openacs.org/repository/download/apm/acs-content-repository-5.4.0d7.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2007-04-22</release-date>
@@ -20,7 +20,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-content-repository" version="5.4.0d5"/>
+        <provides url="acs-content-repository" version="5.4.0d7"/>
         <requires url="acs-kernel" version="5.3.1"/>
         <requires url="acs-service-contract" version="5.3.1"/>
         <requires url="search" version="5.3.1"/>
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql	18 Jan 2005 16:44:19 -0000	1.14
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql	17 Sep 2007 12:58:30 -0000	1.15
@@ -10,7 +10,7 @@
 -- License.  Full text of the license is available from the GNU Project:
 -- http://www.fsf.org/copyleft/gpl.html
 
-create or replace package body content_revision
+create or replace package content_revision
 as
 
 function new (
@@ -356,63 +356,6 @@
 
 end revision_name;
 
-procedure index_attributes(
-  revision_id IN cr_revisions.revision_id%TYPE
-) is
-
-  clob_loc clob;
-  v_revision_id cr_revisions.revision_id%TYPE;
-
-begin
-
-  insert into cr_revision_attributes (
-    revision_id, attributes
-  ) values (
-    revision_id, empty_clob()
-  ) returning attributes into clob_loc;
-
-  v_revision_id := write_xml(revision_id, clob_loc);  
-
-end index_attributes;
-
-function import_xml (
-  item_id IN cr_items.item_id%TYPE,
-  revision_id IN cr_revisions.revision_id%TYPE,
-  doc_id IN number
-) return cr_revisions.revision_id%TYPE is
-
-  clob_loc clob;
-  v_revision_id cr_revisions.revision_id%TYPE;
-
-begin
-
-  select doc into clob_loc from cr_xml_docs where doc_id = import_xml.doc_id;
-  v_revision_id := read_xml(item_id, revision_id, clob_loc);  
-
-  return v_revision_id;
-
-end import_xml;
-
-function export_xml (
-  revision_id IN cr_revisions.revision_id%TYPE
-) return cr_xml_docs.doc_id%TYPE is
-
-  clob_loc clob;
-  v_doc_id cr_xml_docs.doc_id%TYPE;
-  v_revision_id cr_revisions.revision_id%TYPE;
-
-begin
-
-  insert into cr_xml_docs (doc_id, doc) 
-    values (cr_xml_doc_seq.nextval, empty_clob())
-    returning doc_id, doc into v_doc_id, clob_loc;
-
-  v_revision_id := write_xml(revision_id, clob_loc);  
-
-  return v_doc_id;
-
-end export_xml;
-
 procedure to_html (
   revision_id IN cr_revisions.revision_id%TYPE
 ) is
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-util.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-util.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/sql/oracle/content-util.sql	24 Mar 2001 22:00:48 -0000	1.1
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-util.sql	17 Sep 2007 12:58:30 -0000	1.2
@@ -60,69 +60,141 @@
 /
 show errors
 
-create or replace procedure clob_to_blob(
-  clob_loc clob, blob_loc blob) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.clobToBlob(
-    oracle.sql.CLOB, oracle.sql.BLOB
-   )';
-/
-show errors
 
-create or replace procedure blob_to_clob(
-  blob_loc blob, clob_loc clob) 
+create or replace procedure string_to_blob_size(
+  s varchar2, blob_loc blob, blob_size number) 
 as language 
   java 
 name 
-  'com.arsdigita.content.Util.blobToClob(
-    oracle.sql.BLOB, oracle.sql.CLOB
+  'com.arsdigita.content.Util.stringToBlob(
+    java.lang.String, oracle.sql.BLOB, int
    )';
 /
 show errors
 
+create or replace function blob_to_string (blob_loc IN BLOB)
+RETURN VARCHAR2
+IS
+v_blength number;
+v_ret varchar(32767);
+v_amount binary_integer:=10000;
+v_offset integer:=1;
+v_buffer raw(20000);
+BEGIN
+  v_blength:=dbms_lob.getlength(blob_loc);
+  IF v_blength=0 THEN
+   return v_ret;
+  ELSE
+    if v_blength<v_amount then
+      v_amount:=v_blength;
+    end if;
 
-create or replace procedure string_to_blob(
-  s varchar2, blob_loc blob) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.stringToBlob(
-    java.lang.String, oracle.sql.BLOB
-   )';
+    FOR i IN 1..CEIL(v_blength/v_amount) LOOP
+      dbms_lob.read(blob_loc,v_amount,v_offset,v_buffer);
+      v_ret:=v_ret||utl_raw.cast_to_varchar2(v_buffer);
+      v_offset:=v_offset+v_amount;
+    END LOOP;
+
+    return v_ret;
+  END IF;
+END;
 /
-show errors
 
-create or replace procedure string_to_blob_size(
-  s varchar2, blob_loc blob, blob_size number) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.stringToBlob(
-    java.lang.String, oracle.sql.BLOB, int
-   )';
+create or replace procedure string_to_blob (STRING IN VARCHAR2, BLOB_LOC IN OUT BLOB)
+IS
+v_slength number;
+v_ret blob;
+v_amount binary_integer:=10000;
+v_offset integer:=1;
+v_buffer raw(20000);
+BEGIN
+  v_slength:=length(string);
+  IF v_slength = 0 THEN
+    blob_loc:=v_ret;
+  ELSE
+    v_buffer:=utl_raw.cast_to_raw(string);
+    v_slength:=utl_raw.length(v_buffer);
+    
+    IF v_slength<v_amount THEN
+      v_amount:=v_slength;
+    END IF;
+
+    FOR i IN 1..CEIL(v_slength/v_amount) LOOP
+      dbms_lob.write(v_ret,v_amount,v_offset,v_buffer);
+      v_offset:=v_offset+v_amount;
+    END LOOP;
+    blob_loc:=v_ret;
+  END IF;
+END;
 /
-show errors
 
-create or replace function blob_to_string(
-  blob_loc blob) return varchar2
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.blobToString(
-    oracle.sql.BLOB
-   ) return java.lang.String';
+create or replace procedure clob_to_blob (CLOB_LOC IN CLOB, BLOB_LOC IN OUT BLOB)
+IS
+v_clength number;
+v_ret BLOB;
+v_amount binary_integer:=10000;
+v_offset integer:=1;
+v_lang_context number:=DBMS_LOB.DEFAULT_LANG_CTX;
+v_warning NUMBER;
+BEGIN
+  v_clength:=dbms_lob.getlength(CLOB_LOC);
+  if v_clength<v_amount then
+    v_amount:=v_clength;
+  end if;
+  FOR i IN 1..CEIL(v_clength/v_amount) LOOP
+    dbms_lob.converttoblob(v_ret,clob_loc,v_amount,v_offset,v_offset,0,v_lang_context,v_warning);
+    v_offset:=v_offset+v_amount;  
+  END LOOP;
+  blob_loc:=v_ret;
+END;
 /
-show errors
 
-create or replace procedure blob_to_file(
-s varchar2, blob_loc blob)
-as language
-  java
-name
-  'com.arsdigita.content.Util.blobToFile(
-  java.lang.String, oracle.sql.BLOB
-  )';
+create or replace procedure blob_to_clob (BLOB_LOC IN BLOB, CLOB_LOC IN OUT CLOB)
+IS
+v_blength number;
+v_ret CLOB;
+v_amount binary_integer:=10000;
+v_offset integer:=1;
+v_lang_context number:=DBMS_LOB.DEFAULT_LANG_CTX;
+v_warning NUMBER;
+BEGIN
+  if v_blength<v_amount then
+    v_amount:=v_blength;
+  end if;
+  FOR i IN 1..CEIL(v_blength/v_amount) LOOP
+    dbms_lob.converttoclob(v_ret,blob_loc,v_amount,v_offset,v_offset,0,v_lang_context,v_warning);
+    v_offset:=v_offset+v_amount;  
+  END LOOP;
+  clob_loc:=v_ret;
+END;
 /
-show errors
+
+
+
+create or replace procedure blob_to_file (path IN VARCHAR2, BLOB_LOC BLOB)
+IS
+v_dir varchar2(128);
+v_file varchar2(32);
+v_blength number;
+outfile utl_file.file_type;
+v_amount binary_integer:=10000;
+v_offset integer:=1;
+v_buffer raw(20000);
+BEGIN
+  v_dir:=substr(path,1,instr(path,'/',-1)-1);
+  v_file:=substr(path,instr(path,'/',-1)+1);
+  v_blength := dbms_lob.getlength(blob_loc);
+  outfile := utl_file.fopen(v_dir, v_file, 'WB');
+  if v_blength<v_amount then
+    v_amount:=v_blength;
+  end if;
+
+  FOR i IN 1..CEIL(v_blength/v_amount) LOOP
+    dbms_lob.read(blob_loc,v_amount,v_offset,v_buffer);
+    utl_file.put_raw(outfile,v_buffer);
+    v_offset:=v_offset+v_amount;
+  END LOOP;
+
+  utl_file.fclose(outfile);
+END;
+/
\ No newline at end of file
Index: openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql	5 Oct 2006 17:04:18 -0000	1.26
+++ openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql	17 Sep 2007 12:58:30 -0000	1.27
@@ -915,47 +915,6 @@
   revision_id   in cr_revisions.revision_id%TYPE
 ) return varchar2;
 
-procedure index_attributes(
-  --/** Generates an XML document for insertion into cr_revision_attributes,
-  --    which is indexed by Intermedia for searching attributes.
-  --    @author Karl Goldstein
-  --    @param revision_id The id of the revision to index
-  --    @see {content_revision.new}
-  --*/
-  revision_id IN cr_revisions.revision_id%TYPE
-);
-
-function export_xml (
-  revision_id IN cr_revisions.revision_id%TYPE
-) return cr_xml_docs.doc_id%TYPE;
-
-function write_xml (
-  revision_id IN number,
-  clob_loc IN clob
-) return number as language
-  java
-name
-  'com.arsdigita.content.XMLExchange.exportRevision(
-     java.lang.Integer, oracle.sql.CLOB
-  ) return int';
-
-function import_xml (
-  item_id IN cr_items.item_id%TYPE,
-  revision_id IN cr_revisions.revision_id%TYPE,
-  doc_id IN number
-) return cr_revisions.revision_id%TYPE;
-
-function read_xml (
-  item_id IN number,
-  revision_id IN number,
-  clob_loc IN clob
-) return number as language
-  java
-name
-  'com.arsdigita.content.XMLExchange.importRevision(
-     java.lang.Integer, java.lang.Integer, oracle.sql.CLOB
-  ) return int';
-
 procedure to_html (
   --/** Converts a revision uploaded as a binary document to html
   --    @author Karl Goldstein
@@ -964,15 +923,6 @@
   revision_id IN cr_revisions.revision_id%TYPE
 );
 
-procedure replace(
-  revision_id number, search varchar2, replace varchar2)
-as language 
-  java 
-name 
-  'com.arsdigita.content.Regexp.replace(
-    int, java.lang.String, java.lang.String
-   )';
-
 function is_live (
   -- /** Determine if the revision is live
   --   @author Karl Goldstein, Stanislav Freidin
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql	11 Dec 2003 21:39:47 -0000	1.7
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql	17 Sep 2007 12:58:30 -0000	1.8
@@ -73,73 +73,3 @@
 
 end;' language 'plpgsql' stable;
 
--- java stuff, deal with this later.
-
-/*
-create or replace procedure clob_to_blob(
-  clob_loc clob, blob_loc blob) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.clobToBlob(
-    oracle.sql.CLOB, oracle.sql.BLOB
-   )';
-/
-show errors
-
-create or replace procedure blob_to_clob(
-  blob_loc blob, clob_loc clob) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.blobToClob(
-    oracle.sql.BLOB, oracle.sql.CLOB
-   )';
-/
-show errors
-
-
-create or replace procedure string_to_blob(
-  s varchar2, blob_loc blob) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.stringToBlob(
-    java.lang.String, oracle.sql.BLOB
-   )';
-/
-show errors
-
-create or replace procedure string_to_blob_size(
-  s varchar2, blob_loc blob, blob_size number) 
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.stringToBlob(
-    java.lang.String, oracle.sql.BLOB, int
-   )';
-/
-show errors
-
-create or replace function blob_to_string(
-  blob_loc blob) return varchar2
-as language 
-  java 
-name 
-  'com.arsdigita.content.Util.blobToString(
-    oracle.sql.BLOB
-   ) return java.lang.String';
-/
-show errors
-
-create or replace procedure blob_to_file(
-s varchar2, blob_loc blob)
-as language
-  java
-name
-  'com.arsdigita.content.Util.blobToFile(
-  java.lang.String, oracle.sql.BLOB
-  )';
-/
-show errors
-*/
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.20 -r1.21
--- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	12 Apr 2007 11:52:35 -0000	1.20
+++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	17 Sep 2007 12:58:30 -0000	1.21
@@ -269,19 +269,6 @@
 }
 
 
-ad_proc -public content::revision::export_xml {
-    -revision_id:required
-} {
-    @param revision_id
-
-    @return NUMBER(38)
-} {
-    return [package_exec_plsql -var_list [list \
-        [list revision_id $revision_id ] \
-    ] content_revision export_xml]
-}
-
-
 ad_proc -public content::revision::get_number {
     -revision_id:required
 } {
@@ -295,25 +282,6 @@
 }
 
 
-ad_proc -public content::revision::import_xml {
-    -item_id:required
-    -revision_id:required
-    -doc_id:required
-} {
-    @param item_id
-    @param revision_id
-    @param doc_id
-
-    @return NUMBER(38)
-} {
-    return [package_exec_plsql -var_list [list \
-        [list item_id $item_id ] \
-        [list revision_id $revision_id ] \
-        [list doc_id $doc_id ] \
-    ] content_revision import_xml]
-}
-
-
 ad_proc -public content::revision::index_attributes {
     -revision_id:required
 } {
@@ -364,25 +332,7 @@
 }
 
 
-ad_proc -public content::revision::read_xml {
-    -item_id:required
-    -revision_id:required
-    -clob_loc:required
-} {
-    @param item_id
-    @param revision_id
-    @param clob_loc
 
-    @return NUMBER
-} {
-    return [package_exec_plsql -var_list [list \
-        [list item_id $item_id ] \
-        [list revision_id $revision_id ] \
-        [list clob_loc $clob_loc ] \
-    ] content_revision read_xml]
-}
-
-
 ad_proc -public content::revision::replace {
     -revision_id:required
     -search:required
@@ -435,29 +385,6 @@
 }
 
 
-ad_proc -public content::revision::write_xml {
-    -revision_id:required
-    -clob_loc:required
-} {
-    @param revision_id
-    @param clob_loc
-
-    @return NUMBER
-} {
-    return [package_exec_plsql -var_list [list \
-        [list revision_id $revision_id ] \
-        [list clob_loc $clob_loc ] \
-    ] content_revision write_xml]
-}
-
-
-ad_proc -public content::revision::update_attribute_index {
-} {
-} {
-    return [package_exec_plsql content_revision update_attribute_index]
-}
-
-
 ad_proc -public content::revision::get_cr_file_path {
     -revision_id 
 } {