Index: openacs-4/packages/lorsm/www/shared/add-shared-course-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/shared/Attic/add-shared-course-2.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/lorsm/www/shared/add-shared-course-2.tcl 17 May 2005 17:03:43 -0000 1.4 +++ openacs-4/packages/lorsm/www/shared/add-shared-course-2.tcl 5 Dec 2006 10:49:45 -0000 1.4.4.1 @@ -30,26 +30,21 @@ -community_id $community_id ] # check if the course is actually shared -if {[db_string isshared {select isshared from ims_cp_manifests where man_id = :man_id}] == "f"} { +if {[db_string isshared {}] == "f"} { # if it ain't complain and quit ad_complain "[_ lorsm.lt_The_course_you_are_tr]" } # check if the course is already added as course for this class -if {![db_0or1row exists {select man_id, lorsm_instance_id from ims_cp_manifest_class where man_id = :man_id \ - and lorsm_instance_id = :package_id \ - and community_id = :community_id}]} { +if {![db_0or1row exists {}]} { set var1 [lorsm::get_course_name -manifest_id $man_id] ad_complain "[_ lorsm.lt_The_course_var1_is_al]" } -db_dml add-course {insert into ims_cp_manifest_class \ - (man_id, lorsm_instance_id, community_id, class_key, isenabled, istrackable) \ - values \ - (:man_id, :package_id, :community_id, :class_key, 't', 'f')} +db_dml add-course {} ad_returnredirect $return_url \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/shared/add-shared-course-2.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/shared/add-shared-course.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/shared/Attic/add-shared-course.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/lorsm/www/shared/add-shared-course.tcl 17 May 2005 17:03:43 -0000 1.4 +++ openacs-4/packages/lorsm/www/shared/add-shared-course.tcl 5 Dec 2006 10:49:45 -0000 1.4.4.1 @@ -37,9 +37,7 @@ # check if the course is already added as course for this class -if {![db_0or1row exists {select man_id, lorsm_instance_id from ims_cp_manifest_class where man_id = :man_id \ - and lorsm_instance_id = :package_id \ - and community_id = :community_id}]} { +if {![db_0or1row exists {}]} { ad_complain "The course [lorsm::get_course_name -manifest_id $man_id], is already part of your class" Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/shared/add-shared-course.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/shared/course-info-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/shared/course-info-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/shared/course-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/shared/Attic/course-info.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/lorsm/www/shared/course-info.tcl 17 May 2005 17:03:43 -0000 1.4 +++ openacs-4/packages/lorsm/www/shared/course-info.tcl 5 Dec 2006 10:49:45 -0000 1.4.4.1 @@ -40,45 +40,11 @@ # Checks whether this course is already in use on this community -set active [db_0or1row check " - select - man_id, - community_id, - lorsm_instance_id - from - ims_cp_manifest_class - where - man_id = :man_id - and - community_id = :community_id"] +set active [db_0or1row check ""] -if {[db_0or1row manifest " - select - cp.man_id, - cp.course_name, - cp.identifier, - cp.version, - text 'Yes' as hello, - case - when hasmetadata = 't' then 'Yes' - else 'No' - end as man_metadata, - case - when isscorm = 't' then 'Yes' - else 'No' - end as isscorm, - cp.isshared, - acs.creation_user, - acs.creation_date, - acs.context_id - from - ims_cp_manifests cp, acs_objects acs - where - cp.man_id = acs.object_id - and cp.man_id = :man_id - and cp.parent_man_id = 0"]} { +if {[db_0or1row manifest ""]} { # Sets the variable for display. set display 1 @@ -100,15 +66,7 @@ set creation_date [lc_time_fmt $creation_date "%x %X"] # Check for submanifests - if {[db_0or1row submans " - select - count(*) as submanifests - from - ims_cp_manifests - where - man_id = :man_id - and - parent_man_id = :man_id"]} { + if {[db_0or1row submans ""]} { } else { set submanifests 0 } @@ -128,21 +86,7 @@ Items " -db_foreach organizations { - select - org.org_id, - org.org_title as org_title, - org.hasmetadata, - tree_level(o.tree_sortkey) as indent - from - ims_cp_organizations org, acs_objects o - where - org.org_id = o.object_id - and - man_id = :man_id - order by - org_id -} { +db_foreach organizations {} { append orgs_list "$org_title$hasmetadata" @@ -161,64 +105,8 @@ } set table_item [ad_table -Tmissing_text $missing_text -Textra_vars $table_extra_vars -Theader_row_extra "style=\"background-color: #e0e0e0; font-weight: bold;\" class=\"list-header\"" -Ttable_extra_html $table_extra_html blah { - SELECT - o.object_id, - repeat(' ', (tree_level(tree_sortkey) - :indent)* 3) as indent, - i.ims_item_id as item_id, - i.item_title as item_title, - i.hasmetadata, - i.org_id, - case - when i.isshared = 'f' then ( - 'false' - ) - else 'true' - end as isshared, - case - when i.identifierref <> '' then ( - SELECT - res.href - FROM - ims_cp_items_to_resources i2r, - ims_cp_resources res - WHERE - i2r.res_id = res.res_id - AND - i2r.ims_item_id = i.ims_item_id -) - else '' - end as identifierref, - case - when i.identifierref <> '' then ( - SELECT - res.type - FROM - ims_cp_items_to_resources i2r, - ims_cp_resources res - WHERE - i2r.res_id = res.res_id - AND - i2r.ims_item_id = i.ims_item_id -) - else '' - end as type, - m.fs_package_id, - m.folder_id, - m.course_name - FROM - acs_objects o, ims_cp_items i, ims_cp_manifests m - WHERE - o.object_type = 'ims_item_object' - AND - i.org_id = :org_id - AND - o.object_id = i.ims_item_id - AND - m.man_id = :man_id - ORDER BY - tree_sortkey, object_id + - } $table_def] append orgs_list "$table_item" Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/shared/course-info.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/tracking/index-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/tracking/index-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lorsm/www/tracking/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/tracking/Attic/index.tcl,v diff -u -r1.6 -r1.6.4.1 --- openacs-4/packages/lorsm/www/tracking/index.tcl 17 May 2005 17:03:43 -0000 1.6 +++ openacs-4/packages/lorsm/www/tracking/index.tcl 5 Dec 2006 10:51:38 -0000 1.6.4.1 @@ -67,22 +67,7 @@ } } - db_multirow -extend { ims_md_id } student_track select_students { - select - user_id as student_name, - start_time, - end_time - from - lorsm_student_track - where - community_id = :community_id - and - course_id = :man_id - and - end_time NOTNULL - order by - start_time desc - } { + db_multirow -extend { ims_md_id } student_track select_students1 {} { set ims_md_id $man_id } @@ -96,7 +81,7 @@ viewer_name { label "[_ lorsm.Viewed_By]" } - views { + views_count { label "[_ lorsm.Total_Views]" } last_viewed { @@ -111,20 +96,7 @@ set extra_where "" } - db_multirow -extend {viewer_name} object_views objects_views " - select v.*, - i.item_title as title - from views v, - ims_cp_items i, - ims_cp_organizations o - where - i.ims_item_id = v.object_id - and - i.org_id = o.org_id - and - o.man_id = :man_id - $extra_where - " { + db_multirow -extend {viewer_name} object_views objects_views1 "" { set viewer_name [acs_user::get_element -user_id $viewer_id -element name] } @@ -155,22 +127,7 @@ } } - db_multirow -extend { ims_md_id } student_track select_students { - select - user_id as student_name, - count(*) as counter, - sum(end_time - start_time) as time_spent - from - lorsm_student_track - where - community_id = :community_id - and - course_id = :man_id - and - end_time NOTNULL - group by user_id - - } { + db_multirow -extend { ims_md_id } student_track select_students2 {} { set ims_md_id $man_id } @@ -181,7 +138,7 @@ title { label "[_ lorsm.Title_1]" } - views { + views_count { label "[_ lorsm.Total_Views]" } unique_views { @@ -198,19 +155,6 @@ set extra_where "" } - db_multirow object_views objects_views " - select v.*, - i.item_title as title - from view_aggregates v, - ims_cp_items i, - ims_cp_organizations o - where - i.ims_item_id = v.object_id - and - i.org_id = o.org_id - and - o.man_id = :man_id - $extra_where - " + db_multirow object_views objects_views2 "" } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/tracking/index.xql'. Fisheye: No comparison available. Pass `N' to diff?