Index: openacs-4/packages/imsld/lib/activity-resource.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-resource.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/imsld/lib/activity-resource.adp	17 Jun 2009 08:00:01 -0000	1.3
+++ openacs-4/packages/imsld/lib/activity-resource.adp	15 Nov 2019 09:02:32 -0000	1.4
@@ -1,58 +1,58 @@
 <switch @resource_type@>
     <case value="webcontent">      
       <multiple name="files">
-        <if @li_mode_p@>
+        <if @li_mode_p;literal@ true>
           <li>
         </if>
         <a href="@files.href@" target="_blank"
           onclick="return(loadContent(this.href))" title="@files.title@">
           <img src="@img_src@" alt="@files.title@" title="@files.title@" >
-          <if @li_mode_p@>
+          <if @li_mode_p;literal@ true>
             @files.title@
           </if>
         </a>
-        <if @monitor_p@>
+        <if @monitor_p;literal@ true>
         </if>
-        <if @li_mode_p@>
+        <if @li_mode_p;literal@ true>
           </li>
         </if>
       </multiple>
     </case>
     <case value="imsldcontent">
       <multiple name="files">
-        <if @li_mode_p@>
+        <if @li_mode_p;literal@ true>
           <li>
         </if>
         <a href="@files.href@" target="_blank"
           onclick="return(loadContent(this.href))" title="@files.file_name@">
           <img src="@img_src@" alt="@files.file_name@" title="@files.file_name@" >
-          <if @li_mode_p@>
+          <if @li_mode_p;literal@ true>
             @files.file_name@
           </if>
         </a>
-        <if @monitor_p@>
+        <if @monitor_p;literal@ true>
         </if>
-        <if @li_mode_p@>
+        <if @li_mode_p;literal@ true>
           </li>
         </if>
       </multiple>
     </case>
     <default>
       <if @acs_object_id@ ne "">
-        <if @li_mode_p@>
+        <if @li_mode_p;literal@ true>
           <li>
         </if>
         <a href="@href@" target="_blank"
           onclick="return(loadContent(this.href))" title="@object_title@">
           <img src="@img_src@" alt="@object_title@" title="@object_title@" >
-          <if @li_mode_p@>
+          <if @li_mode_p;literal@ true>
             @object_title@
           </if>
         </a>
-        <if @monitor_p@>
+        <if @monitor_p;literal@ true>
           
         </if>
-        <if @li_mode_p@>
+        <if @li_mode_p;literal@ true>
           </li>
         </if>
       </if>
Index: openacs-4/packages/imsld/lib/activity.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/imsld/lib/activity.adp	19 Oct 2009 16:19:54 -0000	1.5
+++ openacs-4/packages/imsld/lib/activity.adp	15 Nov 2019 09:02:32 -0000	1.6
@@ -5,14 +5,14 @@
         onclick="return(loadContent('@div@'))">
         @activity_title@
       </a>
-      <if @completed_activity_p@>
+      <if @completed_activity_p;literal@ true>
         <if @complete_act_id@ ne "">
           <img src="/resources/imsld/completed.png" alt="#imsld.completed#"
             title="#imsld.completed#" >
         </if>
       </if>
       <else>
-        <if @is_visible_p@ and @user_choice_p@ and @finish_href@ not nil>
+        <if @is_visible_p;literal@ true and @user_choice_p@ and @finish_href@ not nil>
           <a href="@finish_href@" onclick="return(loadTree(this.href))"
             class="finish" title="#imsld.finish_activity#">#imsld.finish#</a>
         </if>
@@ -28,14 +28,14 @@
         onclick="return(loadContent('@div@'))">
         @activity_title@
       </a>
-      <if @completed_activity_p@>
+      <if @completed_activity_p;literal@ true>
         <if @complete_act_id@ ne "">
           <img src="/resources/imsld/completed.png" alt="#imsld.completed#"
             title="#imsld.completed#" >
         </if>
       </if>
       <else>
-        <if @is_visible_p@ and @user_choice_p@>
+        <if @is_visible_p;literal@ true and @user_choice_p;literal@ true>
           <a href="@finish_href@" onclick="return(loadTree(this.href))"
             class="finish" title="#imsld.finish_activity#">#imsld.finish#</a>
         </if>
@@ -46,7 +46,7 @@
   </case>
 
   <case value="structure">
-    <if @started_p@ and @referenced_activities:rowcount@>
+    <if @started_p;literal@ true and @referenced_activities:rowcount@>
       <li id="mktree_activity_li_@structure_item_id@">
         <a href="@href@"
           onclick="return(loadContent('@div@'))">
Index: openacs-4/packages/imsld/sql/postgresql/imsld-cp-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-cp-create.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/imsld/sql/postgresql/imsld-cp-create.sql	15 Nov 2005 12:28:39 -0000	1.4
+++ openacs-4/packages/imsld/sql/postgresql/imsld-cp-create.sql	15 Nov 2019 09:02:32 -0000	1.5
@@ -34,7 +34,7 @@
 
 comment on column imsld_cp_manifests.parent_manifest_id is '
 Parent manifest.
-A manifest could have submanifests. If the manifest doesnt have a parent
+A manifest could have submanifests. If the manifest doesn't have a parent
 then we put 0';
 
 comment on column imsld_cp_manifests.is_shared_p is '
Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.xql	17 Apr 2008 17:18:16 -0000	1.7
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.xql	15 Nov 2019 09:02:32 -0000	1.8
@@ -49,7 +49,7 @@
 
 	<fullquery name="imsld::parse::parse_and_create_environment.get_env_id">
 		<querytext>
-                select item_id as refrenced_env_id 
+                select item_id as referenced_env_id 
                 from imsld_environmentsi 
                 where identifier = :ref 
                 and content_revision__is_live(environment_id) = 't' 
@@ -135,7 +135,7 @@
 
 	<fullquery name="imsld::parse::parse_and_create_activity_structure.get_struct_id_from_as_ref">
 		<querytext>
-                        select item_id as refrenced_struct_id,
+                        select item_id as referenced_struct_id,
                         structure_id
                         from imsld_activity_structuresi 
                         where identifier = :ref 
@@ -147,7 +147,7 @@
 
 	<fullquery name="imsld::parse::parse_and_create_activity_structure.get_struct_id_from_la_ref">
 		<querytext>
-                        select item_id as refrenced_struct_id,
+                        select item_id as referenced_struct_id,
                         structure_id
                         from imsld_activity_structuresi 
                         where identifier = :learning_activity_ref 
@@ -159,7 +159,7 @@
 
 	<fullquery name="imsld::parse::parse_and_create_activity_structure.get_struct_id_from_sa_ref">
 		<querytext>
-                        select item_id as refrenced_struct_id,
+                        select item_id as referenced_struct_id,
                         structure_id
                         from imsld_activity_structuresi 
                         where identifier = :support_activity_ref
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -N -r1.128 -r1.129
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	17 Apr 2018 14:47:02 -0000	1.128
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	15 Nov 2019 09:02:32 -0000	1.129
@@ -103,15 +103,15 @@
             set role_part_list [list]
             set referncer_list [db_list la_directly_mapped { *SQL* }]
             if { [llength $referncer_list] } {
-                set role_part_list [concat $role_part_list $referncer_list]
+                lappend role_part_list {*}$referncer_list
             }
             # check if the learning activity is referenced by some activity structures... digg more
             foreach la_structure_list [db_list_of_lists get_la_activity_structures { *SQL* }] {
                 set stucture_id [lindex $la_structure_list 0]
                 set leaf_id [lindex $la_structure_list 1]
                 set referencer_list [imsld::get_role_part_from_activity -activity_type structure -leaf_id $leaf_id]
                 if { [llength $referencer_list] } {
-                    set role_part_list [concat $role_part_list $referencer_list]
+                    lappend role_part_list {*}$referencer_list
                 }
             }
             return $role_part_list
@@ -120,15 +120,15 @@
             set role_part_list [list]
             set referncer_list [db_list sa_directly_mapped { *SQL* }]
             if { [llength $referncer_list] } {
-                set role_part_list [concat $role_part_list $referncer_list]
+                lappend role_part_list {*}$referncer_list
             }
             # check if the support activity is referenced by some activity structures... digg more
             foreach sa_structure_list [db_list_of_lists get_sa_activity_structures { *SQL* }] {
                 set stucture_id [lindex $sa_structure_list 0]
                 set leaf_id [lindex $sa_structure_list 1]
                 set referencer_list [imsld::get_role_part_from_activity -activity_type structure -leaf_id $leaf_id]
                 if { [llength $referencer_list] } {
-                    set role_part_list [concat $role_part_list $referencer_list]
+                    lappend role_part_list {*}$referencer_list
                 }
             }
             return $role_part_list
@@ -137,15 +137,15 @@
             set role_part_list [list]
             set referncer_list [db_list as_directly_mapped { *SQL* }]
             if { [llength $referncer_list] } {
-                set role_part_list [concat $role_part_list $referncer_list]
+                lappend role_part_list {*}$referncer_list
             }
             # check if the activity structure is referenced by an activity structure... digg more
             foreach sa_structure_list [db_list_of_lists get_as_activity_structures { *SQL* }] {
                 set stucture_id [lindex $sa_structure_list 0]
                 set leaf_id [lindex $sa_structure_list 1] 
                 set referencer_list [imsld::get_role_part_from_activity -activity_type structure -leaf_id $leaf_id]
                 if { [llength $referencer_list] } {
-                    set role_part_list [concat $role_part_list $referencer_list]
+                    lappend role_part_list {*}$referencer_list
                 } 
             }
             return $role_part_list
@@ -4329,7 +4329,7 @@
                 set users_list [list]
                 foreach role $roles_list {
                     set users_in_role [imsld::roles::get_users_in_role -role_id [lindex $role 0] -run_id $run_id]
-                    set users_list [concat $users_list $users_in_role]
+                    lappend users_list {*}$users_in_role
                 }
 
                 #check if all has finished the act
@@ -4455,7 +4455,7 @@
                 set referencer_env_item_id [lindex $referenced_environment 0]
                 set activities_list_nested [concat $activities_list_nested [imsld::get_activity_from_environment -environment_item_id $referencer_env_item_id]]
             }
-            set activities_list [concat $activities_list $$activities_list]
+            lappend activities_list {*}$$activities_list
         }
     }
     return $activities_list
@@ -4523,7 +4523,7 @@
                         and la.activity_description_id = ades.item_id
                         and content_revision__is_live(la.activity_id)
                     }] } {
-                        set activities_list [concat $activities_list [list [list $activity_id $activity_item_id learning]]]
+                        lappend activities_list [list $activity_id $activity_item_id learning]
                     } else {
                         set activities_list [concat $activities_list [db_list_of_lists support_activity_ref {
                             select sa.activity_id,
Index: openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl	9 May 2018 15:33:31 -0000	1.23
+++ openacs-4/packages/imsld/tcl/imsld-roles-procs.tcl	15 Nov 2019 09:02:32 -0000	1.24
@@ -321,7 +321,7 @@
            where group_id=:group
            group by member_id
         }]
-        set users_list [concat $users_list $users_in_group]
+        lappend users_list {*}$users_in_group
    }
   return $users_list
 }
@@ -466,7 +466,7 @@
 	lappend groups $occurrence $new_instance_id
 	set sub_groups [imsld::roles::create_groups_from_dom -node $role_node -run_id $run_id -imsld_id $imsld_id \
 			    -parent_group_id $new_instance_id]
-	set groups [concat $groups $sub_groups]
+	lappend groups {*}$sub_groups
     }
     return $groups
 }
Index: openacs-4/packages/imsld/www/activity-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.adp,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/imsld/www/activity-frame.adp	19 Oct 2009 16:19:54 -0000	1.20
+++ openacs-4/packages/imsld/www/activity-frame.adp	15 Nov 2019 09:02:32 -0000	1.21
@@ -16,7 +16,7 @@
       </a>
     </span>
 
-  <if @roles_template_p@ eq 1>
+  <if @roles_template_p;literal@ true>
     <include src="support-activity-roles" 
 	supported_roles="@supported_roles@" 
 	run_id=@run_id@ 
@@ -36,7 +36,7 @@
   <iframe id="object" name="object" src="@iframe_activity_url@" style="left:0; top:0;" width="98%" height="60%"></iframe>
 
   <script type="text/javascript">
-    <if @roles_template_p@ eq 1>
+    <if @roles_template_p;literal@ true>
       dynamicSelect("supported-roles", "user-roles");
     </if>
   </script>
Index: openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-show-service-configurated.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-show-service-configurated.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-show-service-configurated.adp	23 Jun 2009 17:21:19 -0000	1.1
+++ openacs-4/packages/imsld/www/admin/gsi/imsld-gsi-show-service-configurated.adp	15 Nov 2019 09:02:32 -0000	1.2
@@ -1,5 +1,5 @@
 <div class="service-configurated">
-<if @still_waiting_p@ eq "f">
+<if @still_waiting_p;literal@ false>
 <p>congratulations....</p>
 </if>
 <else>