Index: openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 24 Jun 2003 12:01:41 -0000 1.10 +++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml 29 Jun 2003 23:30:49 -0000 1.11 @@ -32,7 +32,7 @@ Administrator Administratoren Administrieren - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="Administrieren"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrieren"> Administrator @@ -222,7 +222,7 @@ Elemente Beitreten Einer Gruppe beitreten - <img src="/graphics/join.gif" alt="Beitritt" border="0"> + <img src="graphics/join.gif" alt="Beitritt" border="0"> Regelung des Beitritts Schl�ssel gro� @@ -459,7 +459,7 @@ Zur�ckweisen zur�ckweisen Zugang beantragen - <img src=/graphics/request.gif alt="%label%" border="0" title="Teilnahme beantragen"> + <img src=graphics/request.gif alt="%label%" border="0" title="Teilnahme beantragen"> erforderlich Ergebnisse R�cksprungs-Webadresse Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 24 Jun 2003 12:01:41 -0000 1.15 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 29 Jun 2003 23:30:49 -0000 1.16 @@ -32,7 +32,7 @@ Administrator Administrators Administer - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="Administer"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administer"> Administrator Administrators Admins of @@ -217,7 +217,7 @@ items Join Join A Group - <img src="/graphics/join.gif" alt="Join" border="0"> + <img src="graphics/join.gif" alt="Join" border="0"> Join Policy Key Large @@ -474,7 +474,7 @@ Reject reject Request Membership - <img src=/graphics/request.gif alt="%label%" border="0" title="Request Membership"> + <img src=graphics/request.gif alt="%label%" border="0" title="Request Membership"> required Results Return URL Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 24 Jun 2003 12:01:41 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 29 Jun 2003 23:30:49 -0000 1.5 @@ -32,7 +32,7 @@ Administrador Administradores Administrar - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="Administrar"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrar"> Administrador Administradores Administradores de @@ -216,7 +216,7 @@ elementos Alta Alta en un grupo - <img src="/graphics/join.gif" alt="Alta" border="0"> + <img src="graphics/join.gif" alt="Alta" border="0"> Pol�tica de suscripci�n Clave Grande @@ -444,7 +444,7 @@ Rechazar rechazar Solicitar alta - <img src=/graphics/request.gif alt="%label%" border="0" title="Solicitar alta"> + <img src=graphics/request.gif alt="%label%" border="0" title="Solicitar alta"> requerido Resultados URL donde volver Index: openacs-4/packages/dotlrn/catalog/dotlrn.ja_JP.Shift_JIS.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/Attic/dotlrn.ja_JP.Shift_JIS.xml,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn/catalog/dotlrn.ja_JP.Shift_JIS.xml 24 Jun 2003 12:01:41 -0000 1.2 +++ openacs-4/packages/dotlrn/catalog/dotlrn.ja_JP.Shift_JIS.xml 29 Jun 2003 23:30:49 -0000 1.3 @@ -32,7 +32,7 @@ �Ǘ��� �Ǘ��� �Ǘ� - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="�Ǘ�"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="�Ǘ�"> �Ǘ��� �Ǘ��� �ȉ��̊Ǘ��� @@ -209,7 +209,7 @@ �A�C�e�� �Q�� �O���[�v�ɎQ�� - <img src="/graphics/join.gif" alt="�Q��" border="0"> + <img src="graphics/join.gif" alt="�Q��" border="0"> �Q�����j �L�[ �� Index: openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml 24 Jun 2003 12:01:41 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.nl_NL.ISO-8859-1.xml 29 Jun 2003 23:30:49 -0000 1.5 @@ -32,7 +32,7 @@ Beheerder Beheerders Beheren - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="Beheer"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="Beheer"> Beheerder Beheerders Beheerders van @@ -216,7 +216,7 @@ items Lid worden Groep Lidmaatschap - <img src="/graphics/join.gif" alt="Aanmelden" border="0"> + <img src="graphics/join.gif" alt="Aanmelden" border="0"> Toelatingsbeleid Code Groot @@ -445,7 +445,7 @@ Weigeren weigeren Verzoek Lidmaatschap - <img src=/graphics/request.gif alt="%label%" border="0" title="Verzoek Lidmaatschap"> + <img src=graphics/request.gif alt="%label%" border="0" title="Verzoek Lidmaatschap"> vereist Resultaten Terugkeer URL Index: openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml 24 Jun 2003 12:01:41 -0000 1.3 +++ openacs-4/packages/dotlrn/catalog/dotlrn.no_NO.ISO-8859-1.xml 29 Jun 2003 23:30:49 -0000 1.4 @@ -32,7 +32,7 @@ Administrator Administratorer Administrer - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="Administrer"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrer"> Administrator Administratorer Admins for @@ -216,7 +216,7 @@ deler Bli medlem i Abonner p� en gruppe - <img src="/graphics/join.gif" alt="Abonner" border="0"> + <img src="graphics/join.gif" alt="Abonner" border="0"> Regler for medlemsskap N�kkel Stor @@ -444,7 +444,7 @@ Forkast forkast Be om medlemskap - <img src=/graphics/request.gif alt="%label%" border="0" title="Be om medlemsskap"> + <img src=graphics/request.gif alt="%label%" border="0" title="Be om medlemsskap"> forventet Resultat Retur URL Index: openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.ISO-8859-2.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/Attic/dotlrn.pl_PL.ISO-8859-2.xml,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.ISO-8859-2.xml 24 Jun 2003 12:01:41 -0000 1.4 +++ openacs-4/packages/dotlrn/catalog/dotlrn.pl_PL.ISO-8859-2.xml 29 Jun 2003 23:30:49 -0000 1.5 @@ -32,7 +32,7 @@ Administrator Administratorzy Administruj - <img border=0 valign="bottom" src="/graphics/admin.gif" alt="Administruj"> + <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administruj"> Administrator Administratorzy Adminowie @@ -221,7 +221,7 @@ obiekt�w Do��cz Do��cz do Grupy - <img src="/graphics/join.gif" alt="Zapisz si�" border="0"> + <img src="graphics/join.gif" alt="Zapisz si�" border="0"> Zasady Zapis�w Klucz Wielki @@ -449,7 +449,7 @@ Odrzu� odzrzu� Wyst�p o cz�onkostwo - <img src=/graphics/request.gif alt="%label%" border="0" title="Wyst�p o cz�onkostwo"> + <img src=graphics/request.gif alt="%label%" border="0" title="Wyst�p o cz�onkostwo"> wymagany Wyniki Powrotny URL Index: openacs-4/packages/dotlrn/www/configure.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/dotlrn/www/configure.adp 29 May 2003 18:05:01 -0000 1.17 +++ openacs-4/packages/dotlrn/www/configure.adp 29 Jun 2003 23:30:49 -0000 1.18 @@ -28,7 +28,7 @@

-@rendered_page@ +@rendered_page;noquote@ Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/dotlrn/www/dotlrn-master.adp 15 Jun 2003 01:23:59 -0000 1.18 +++ openacs-4/packages/dotlrn/www/dotlrn-master.adp 29 Jun 2003 23:30:49 -0000 1.19 @@ -47,7 +47,7 @@ @header_img_alt_text@ - @text@ + @text;noquote@ @user_name@ Index: openacs-4/packages/dotlrn/www/one-community-admin.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/one-community-admin.adp 15 Jun 2003 01:24:00 -0000 1.26 +++ openacs-4/packages/dotlrn/www/one-community-admin.adp 29 Jun 2003 23:30:49 -0000 1.27 @@ -19,8 +19,8 @@ %> -@context_bar@ +@context_bar;noquote@ @pretty_name@ #dotlrn.Admin# 0 -@rendered_page@ +@rendered_page;noquote@ Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/one-community-portal-configure.adp 15 Jun 2003 01:24:00 -0000 1.7 +++ openacs-4/packages/dotlrn/www/one-community-portal-configure.adp 29 Jun 2003 23:30:49 -0000 1.8 @@ -23,7 +23,7 @@

-@rendered_page@ +@rendered_page;noquote@ Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl 4 Dec 2002 09:51:04 -0000 1.5 +++ openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl 29 Jun 2003 23:30:49 -0000 1.6 @@ -32,7 +32,7 @@ -community_id [dotlrn_community::get_community_id] set rendered_page [portal::configure \ - -allow_theme_change_p "0" \ + -allow_theme_change_p 0 \ [dotlrn_community::get_portal_id] \ $referer ] Index: openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl 24 Jun 2003 00:55:32 -0000 1.2 +++ openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl 29 Jun 2003 23:30:49 -0000 1.3 @@ -18,112 +18,134 @@ @author Don Baccus (dhogaza@pacifier.com) } { + db_transaction { - # Define notifications for homework and correction file uploads + # Define notifications for homework and correction file uploads - set impl_id \ - [acs_sc::impl::new_from_spec -spec { - name homework_file_upload - contract_name NotificationType - owner dotlrn-homework - aliases { - GetURL dotlrn_homework::notification::get_homework_url - ProcessReply dotlrn_homework::notification::process_homework_reply - } - }] + set impl_id \ + [acs_sc::impl::new_from_spec -spec { + name homework_file_upload + contract_name NotificationType + owner dotlrn-homework + aliases { + GetURL dotlrn_homework::notification::get_url + ProcessReply dotlrn_homework::notification::process_reply + } + }] - set type_id [notification::type::new \ - -sc_impl_id $impl_id \ - -short_name homework_upload \ - -pretty_name Homework \ - -description "Notification of Homework File Upload"] + set type_id [notification::type::new \ + -sc_impl_id $impl_id \ + -short_name homework_upload \ + -pretty_name Homework \ + -description "Notification of Homework File Upload"] - notification::type::interval_enable \ - -type_id $type_id \ - -interval_id [notification::interval::get_id_from_name -name instant] + notification::type::interval_enable \ + -type_id $type_id \ + -interval_id [notification::interval::get_id_from_name -name instant] - notification::type::delivery_method_enable \ - -type_id $type_id \ - -delivery_method_id [notification::delivery::get_id_from_name -name email] + notification::type::delivery_method_enable \ + -type_id $type_id \ + -delivery_method_id [notification::delivery::get_id_from_name -name email] - set impl_id \ - [acs_sc::impl::new_from_spec -spec { - name correction_file_upload - contract_name NotificationType - owner dotlrn-homework - aliases { - GetURL dotlrn_homework::notification::get_correction_url - ProcessReply dotlrn_homework::notification::process_correction_reply - } - }] + set impl_id \ + [acs_sc::impl::new_from_spec -spec { + name correction_file_upload + contract_name NotificationType + owner dotlrn-homework + aliases { + GetURL dotlrn_homework::notification::get_url + ProcessReply dotlrn_homework::notification::process_reply + } + }] - set type_id [notification::type::new \ - -sc_impl_id $impl_id \ - -short_name correction_upload \ - -pretty_name "Comment File" \ - -description "Notification of Comment File Upload"] + set type_id [notification::type::new \ + -sc_impl_id $impl_id \ + -short_name correction_upload \ + -pretty_name "Comment File" \ + -description "Notification of Comment File Upload"] - notification::type::interval_enable \ - -type_id $type_id \ - -interval_id [notification::interval::get_id_from_name -name instant] + notification::type::interval_enable \ + -type_id $type_id \ + -interval_id [notification::interval::get_id_from_name -name instant] - notification::type::delivery_method_enable \ - -type_id $type_id \ - -delivery_method_id [notification::delivery::get_id_from_name -name email] + notification::type::delivery_method_enable \ + -type_id $type_id \ + -delivery_method_id [notification::delivery::get_id_from_name -name email] - # Define the dotLRN Homework Applet + # Define the dotLRN Homework Applet - acs_sc::impl::new_from_spec -spec { - name dotlrn_homework - contract_name dotlrn_applet - owner dotlrn_applet - aliases { - GetPrettyName dotlrn_homework::get_pretty_name - AddApplet dotlrn_homework::add_applet - RemoveApplet dotlrn_homework::remove_applet - AddAppletToCommunity dotlrn_homework::add_applet_to_community - RemoveAppletFromCommunity dotlrn_homework::remove_applet_from_community - AddUser dotlrn_homework::add_user - RemoveUser dotlrn_homework::remove_user - AddUserToCommunity dotlrn_homework::add_user_to_community - RemoveUserFromCommunity dotlrn_homework::remove_user_from_community - AddPortlet dotlrn_homework::add_portlet - RemovePortlet dotlrn_homework::remove_portlet - ChangeEventHandler dotlrn_homework::change_event_handler - Clone dotlrn_homework::clone + acs_sc::impl::new_from_spec -spec { + name dotlrn_homework_applet + contract_name dotlrn_applet + owner dotlrn_homework + aliases { + GetPrettyName dotlrn_homework_applet::get_pretty_name + AddApplet dotlrn_homework_applet::add_applet + RemoveApplet dotlrn_homework_applet::remove_applet + AddAppletToCommunity dotlrn_homework_applet::add_applet_to_community + RemoveAppletFromCommunity dotlrn_homework_applet::remove_applet_from_community + AddUser dotlrn_homework_applet::add_user + RemoveUser dotlrn_homework_applet::remove_user + AddUserToCommunity dotlrn_homework_applet::add_user_to_community + RemoveUserFromCommunity dotlrn_homework_applet::remove_user_from_community + AddPortlet dotlrn_homework_applet::add_portlet + RemovePortlet dotlrn_homework_applet::remove_portlet + ChangeEventHandler dotlrn_homework_applet::change_event_handler + Clone dotlrn_homework_applet::clone + } } - } - # Define the user portlet + # Define the user portlet - portal::datasource::new_from_spec -spec { - name homework_portlet - description "Homework Portlet" - params { - {shadeable_p:config_required,configured t} - {shaded_p:config_required,configured f} - {hideable_p:config_required,configured t} - {user_editable_p:config_required,configured f} - {link_hideable_p:config_required,configured t} - {folder_id:config_required ""} - {package_id:config_required ""} - } - } + portal::datasource::new_from_spec -spec { + name dotlrn_homework_portlet + description "Homework Portlet" + owner dotlrn_homework + params { + shadeable_p:config_required,configured t + shaded_p:config_required,configured f + hideable_p:config_required,configured t + user_editable_p:config_required,configured f + link_hideable_p:config_required,configured t + folder_id:config_required {} + package_id:config_required {} + } + aliases { + GetMyName dotlrn_homework_portlet::get_my_name + GetPrettyName dotlrn_homework_portlet::get_pretty_name + Link dotlrn_homework_portlet::link + AddSelfToPage dotlrn_homework_portlet::add_self_to_page + Show dotlrn_homework_portlet::show + Edit dotlrn_homework_portlet::edit + RemoveSelfFromPage dotlrn_homework_portlet::remove_self_from_page + } + } - # Define the admin portlet + # Define the admin portlet - portal::datasource::new_from_spec -spec { - name "homework_admin_portlet" - description "Homework Administration Portlet" - params { - {shadeable_p:config_required,configured t} - {shaded_p:config_required,configured f} - {hideable_p:config_required,configured t} - {user_editable_p:config_required,configured f} - {link_hideable_p:config_required,configured t} - {folder_id:config_required ""} - {package_id:config_required ""} - } + portal::datasource::new_from_spec -spec { + name dotlrn_homework_admin_portlet + description "Homework Administration Portlet" + owner dotlrn_homework + params { + shadeable_p:config_required,configured t + shaded_p:config_required,configured f + hideable_p:config_required,configured t + user_editable_p:config_required,configured f + link_hideable_p:config_required,configured t + folder_id:config_required {} + package_id:config_required {} + } + aliases { + GetMyName dotlrn_homework_admin_portlet::get_my_name + GetPrettyName dotlrn_homework_admin_portlet::get_pretty_name + Link dotlrn_homework_admin_portlet::link + AddSelfToPage dotlrn_homework_admin_portlet::add_self_to_page + Show dotlrn_homework_admin_portlet::show + Edit dotlrn_homework_admin_portlet::edit + RemoveSelfFromPage dotlrn_homework_admin_portlet::remove_self_from_page + } + } } } @@ -134,10 +156,13 @@ @author Don Baccus (dhogaza@pacifier.com) } { - notification::type::delete -short_name homework_upload - acs_sc::impl::delete -contract_name NotificationType -impl_name homework_file_upload - notification::type::delete -short_name correction_upload - acs_sc::impl::delete -contract_name NotificationType -impl_name correction_file_upload - portal::datasource::delete -name homework_portlet - acs_sc::impl::delete -contract_name dotlrn_applet -impl_name dotlrn_homework + db_transaction { + notification::type::delete -short_name homework_upload + acs_sc::impl::delete -contract_name NotificationType -impl_name homework_file_upload + notification::type::delete -short_name correction_upload + acs_sc::impl::delete -contract_name NotificationType -impl_name correction_file_upload + acs_sc::impl::delete -contract_name dotlrn_applet -impl_name dotlrn_homework_applet + portal::datasource::delete -name dotlrn_homework_portlet + portal::datasource::delete -name dotlrn_homework_admin_portlet + } } Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl 17 Feb 2003 20:56:15 -0000 1.1 +++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl 29 Jun 2003 23:30:49 -0000 1.2 @@ -163,7 +163,6 @@ cf } { } { -ns_log Notice "Huh? show..." portal::show_proc_helper \ -package_key [my_package_key] \ -config_list $cf \ Index: openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql 17 Feb 2003 20:56:17 -0000 1.1 +++ openacs-4/packages/dotlrn-homework/www/folder-chunk-oracle.xql 29 Jun 2003 23:30:49 -0000 1.2 @@ -28,7 +28,6 @@ and f.folder_id(+) = fs_tree.item_id $qualify_by_owner and r.item_id(+) = fs_tree.item_id - and r.content_length(+) = fs_tree.item_id and rels.item_id(+) = o.object_id and rels.relation_tag(+) = 'homework_correction' and not exists (select 1 Index: openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-homework/www/folder-chunk-postgresql.xql 29 Jun 2003 23:30:49 -0000 1.2 @@ -0,0 +1,42 @@ + + + +postgresql7.2 + + + + select + o.object_id, + coalesce(f.label, fs_tree.name) as name, + fs_tree.live_revision as version_id, + fs_tree.content_type, + r.content_length, + fs_tree.parent_id as folder_id, + lpad(' ',(tree_level(fs_tree.tree_sortkey) - 1), ' ') as spaces, + rels.related_object_id as homework_file_id, + p.first_names || ' ' || p.last_name as file_owner_name, + o.creation_user + from + (select cr_items.* + from cr_items, cr_items as cr_items2 + where cr_items2.item_id in ([join $list_of_folder_ids ", "]) + and cr_items.tree_sortkey between + cr_items2.tree_sortkey and tree_right(cr_items2.tree_sortkey) + and tree_level(cr_items.tree_sortkey) > :min_level + and tree_level(cr_items.tree_sortkey) <= :max_level + 1) fs_tree + join acs_objects o on (o.object_id = fs_tree.item_id) + left join cr_folders f on (f.folder_id = fs_tree.item_id) + left join persons p on (p.person_id = o.creation_user) + left join cr_revisions r on (r.revision_id = fs_tree.item_id) + left join cr_item_rels rels on + (rels.item_id = o.object_id and rels.relation_tag = 'homework_correction') + where not exists (select 1 + from cr_item_rels + where related_object_id = o.object_id + and relation_tag = 'homework_correction') + $qualify_by_owner + order by content_item__get_path(fs_tree.item_id, null) + + + + Index: openacs-4/packages/dotlrn-homework/www/folder-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-homework/www/folder-chunk.adp 17 Feb 2003 20:56:17 -0000 1.1 +++ openacs-4/packages/dotlrn-homework/www/folder-chunk.adp 29 Jun 2003 23:30:49 -0000 1.2 @@ -13,7 +13,7 @@ - Folder is empty + Folder is empty @@ -55,7 +55,7 @@ - @folders.spaces@ + @folders.spaces;noquote@ @folders.name@ Index: openacs-4/packages/dotlrn-homework/www/folder-contents.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-contents.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-homework/www/folder-contents.adp 17 Feb 2003 20:56:17 -0000 1.1 +++ openacs-4/packages/dotlrn-homework/www/folder-contents.adp 29 Jun 2003 23:30:49 -0000 1.2 @@ -1,6 +1,6 @@ Contents of @folder_name@ - @context_bar@ + @context_bar;noquote@ @title@ -@context_bar@ +@context_bar;noquote@
Index: openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl 17 Feb 2003 20:56:17 -0000 1.1 +++ openacs-4/packages/dotlrn-homework/www/toggle-homework-alert.tcl 29 Jun 2003 23:30:49 -0000 1.2 @@ -22,7 +22,6 @@ } } -ns_log Notice "Huh? type_id: $type_id subscribe_p: $subscribe_p request_id: $request_id" set community_id [dotlrn_community::get_community_id] dotlrn::require_user_admin_community -community_id $community_id Index: openacs-4/packages/new-portal/tcl/datasource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/datasource-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/new-portal/tcl/datasource-procs.tcl 19 Jun 2003 01:59:17 -0000 1.3 +++ openacs-4/packages/new-portal/tcl/datasource-procs.tcl 29 Jun 2003 23:30:49 -0000 1.4 @@ -36,15 +36,18 @@ post-install procedure is easier than writing PL/SQL for Oracle and PL/pgSQL for Oracle. - @author Don Baccus (dhogaza@pacifier.com) - @param spec The specification (format described below) + @author Don Baccus (dhogaza@pacifier.com) + @see acs_sc::impl::new_from_spec + The specification is a list of name-value pairs. Possible names are name The name of the new datasource + owner The package that owns this portlet description A human-readable description (defaults to name) params A list of param key/attributes and their values + aliases Service contract aliases clause for acs_sc::impl::new_from_spec Each parameter key can be followed by a comma-separated list of attributes in the familiar style of ad_page_contract or ad_form. Do not include spaces @@ -53,15 +56,6 @@ See the portal package documentation for the meaning of these two attributes. - An example of a specification: - - { name "my_name" - description "my_description" - spec { shadeable_p,config_required t - hideable_p,configured t - } - } - } { array set datasource $spec @@ -75,11 +69,11 @@ set datasource_id [new -name $datasource(name) -description $datasource(description)] - foreach param $datasource(params) { + foreach {param value} $datasource(params) { - if { ![regexp {^([^ \t:]+)(?::([a-zA-Z0-9_,(|)]*))([ \t]+)(.+)$} \ - $param match param_name flags blanks value] } { - ad_return -code error "Parameter '$param' doesn't have the right format. It must be var\[:flag\[,flag ...\]\] value" + if { ![regexp {^([^ \t:]+)(?::([a-zA-Z0-9_,(|)]*))} \ + $param match param_name flags] } { + ad_return -code error "Parameter name '$param' doesn't have the right format. It must be var\[:flag\[,flag ...\]\]" } # set defaults for attributes @@ -103,6 +97,13 @@ -value $value } + + acs_sc::impl::new_from_spec \ + -spec [list name $datasource(name) \ + contract_name portal_datasource \ + owner $datasource(owner) \ + aliases $datasource(aliases)] + } } @@ -140,9 +141,12 @@ } { if { ![db_0or1row get_datasource_id {}] } { - ad_return -code error "Datasource \"$name\" does not exist" + # Returning an error here is a PITA developing, so we'll just log an error + ns_log Error "Datasource \"$name\" does not exist" + return } + acs_sc::impl::delete -contract_name portal_datasource -impl_name $name return [db_exec_plsql delete_datasource {}] } Index: openacs-4/packages/new-portal/www/admin/portal-show.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-show.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/new-portal/www/admin/portal-show.adp 9 Aug 2002 20:56:30 -0000 1.4 +++ openacs-4/packages/new-portal/www/admin/portal-show.adp 29 Jun 2003 23:30:50 -0000 1.5 @@ -19,4 +19,4 @@ @referer@ @name@ -@html@ +@html;noquote@