Index: openacs-4/packages/ims-ent/tcl/ims-ent-dotlrn-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ims-ent/tcl/ims-ent-dotlrn-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ims-ent/tcl/ims-ent-dotlrn-procs.xql	9 Jun 2004 18:08:07 -0000	1.1
+++ openacs-4/packages/ims-ent/tcl/ims-ent-dotlrn-procs.xql	16 Jun 2004 23:06:45 -0000	1.2
@@ -86,6 +86,11 @@
       where start_date >= :start_date
       and end_date <= :end_date
       order by end_date DESC
+      UNION
+      select term_id
+      from dotlrn_terms
+      where end_date >= now()
+      order by end_date DESC
       limit 1
     </querytext>
   </fullquery>
Index: openacs-4/packages/ims-ent/tcl/ims-ent-parser-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ims-ent/tcl/ims-ent-parser-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ims-ent/tcl/ims-ent-parser-procs.tcl	11 Jun 2004 23:02:21 -0000	1.3
+++ openacs-4/packages/ims-ent/tcl/ims-ent-parser-procs.tcl	16 Jun 2004 23:06:45 -0000	1.4
@@ -143,7 +143,6 @@
 			set parent_key [xml_get_child_node_content_by_path $parent_node {{ sourcedid id } }]
 		    }
 
-
 		}
 
 		set parent_key [string trim $parent_key]
@@ -253,18 +252,12 @@
 
 	set group_source $source
 
-	# temp regsub till quio fix the document
-	# regsub {(,).*} $id {} id
-
 	foreach member_node [xml_node_get_children_by_name $mem_node "member"] {
 
 	    set sourcedidtype [xml_get_child_node_attribute_by_path $member_node {sourcedid} "sourcedidtype"]
 	    set id [xml_get_child_node_content_by_path $member_node { { sourcedid id } }]
 	    set source [xml_get_child_node_content_by_path $member_node { { sourcedid source } }]
 
-	    # idtype *must* be 1, probably need to put a check here (roc)
-	    set idtype [xml_get_child_node_content_by_path $member_node { { idtype } }]
-
 	    # .LRN right now only allows you to assing one specific
 	    # role for a given relation between a user and a class so
 	    # we won't parse several times the <role> tag, instead