Index: openacs-4/packages/acs-content-repository/tcl/search-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/search-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/tcl/search-procs.tcl 9 Sep 2001 18:10:13 -0000 1.2 +++ openacs-4/packages/acs-content-repository/tcl/search-procs.tcl 10 Sep 2001 12:43:23 -0000 1.3 @@ -45,15 +45,15 @@ set package_id [apm_package_id_from_key acs-content-repository] db_1row get_url_stub " - select site_node__url(node_id) || + select site_node__url(node_id) as root_url, (select content_item__get_path(item_id,null) from cr_revisions where revision_id = :object_id) as url from site_nodes n where n.object_id = :package_id " - return $url + return "[string trimright $root_url /]$url" } ad_proc content_search__search_ids { Index: openacs-4/packages/acs-content-repository/www/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-content-repository/www/index-oracle.xql 10 Sep 2001 12:43:23 -0000 1.1 @@ -0,0 +1,24 @@ + + + + oracle8.1.6 + + + + + select content_item.get_root_folder from dual + + + + + + + + + select content_template.get_root_folder from dual + + + + + + Index: openacs-4/packages/acs-content-repository/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-content-repository/www/index-postgresql.xql 10 Sep 2001 12:43:23 -0000 1.1 @@ -0,0 +1,24 @@ + + + + postgresql7.1 + + + + + select content_item__get_root_folder(null) + + + + + + + + + select content_template__get_root_folder() + + + + + + Index: openacs-4/packages/acs-content-repository/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index.vuh,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-content-repository/www/index.vuh 10 Sep 2001 12:43:23 -0000 1.1 @@ -0,0 +1,35 @@ +################## KLUDGE BY STAS ############### +# Try and look up the item in the content repository +################################################# + + +# Get the paths + +set the_url [ad_conn path_info] +set package_key [ad_conn package_key] +set the_root [ns_info pageroot] + +# Get the IDs +set content_root \ + [db_string content_root "select content_item.get_root_folder from dual"] +set template_root \ + [db_string template_root "select content_template.get_root_folder from dual"] + +# Serve the page + +ns_log notice "RESOLVING URL: $the_root $the_url" +if { [content::init the_url the_root $content_root $template_root] } { + set file "$the_root/$the_url" + ns_log notice "RESOLVED URL: $file" + rp_serve_abstract_file $file +} else { + # ns_returnnotfound + set page "[ad_header {Content Item Not Found}]" + append page "

Content Item Not Found

" + append page "The requested item is not available for viewing. " + append page "The item is either not available on this server or it is not in a publishable state " + append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.
" + append page "[ad_footer]" + doc_return 200 text/html $page +} + Index: openacs-4/packages/acs-content-repository/www/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-content-repository/www/index.xql 10 Sep 2001 12:43:23 -0000 1.1 @@ -0,0 +1,18 @@ + + + + + + + select + first_names || ' ' || last_name + from + persons + where + person_id = :user_id + + + + + +