--- loncom/interface/lonprintout.pm	2010/02/25 04:55:30	1.568.4.2
+++ loncom/interface/lonprintout.pm	2010/12/05 17:25:10	1.568.4.3
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.568.4.2 2010/02/25 04:55:30 raeburn Exp $
+# $Id: lonprintout.pm,v 1.568.4.3 2010/12/05 17:25:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2944,7 +2944,7 @@ sub handler {
 
     my ($helper,$is_custom);
     if ((&Apache::loncommon::needs_gci_custom()) &&
-        ($env{'request.role.domain'} eq 'gcitest')) {
+        ($env{'request.role.domain'} =~ /^\w+citest$/)) {
         if ($r->header_only) {
             if ($env{'browser.mathml'}) {
                 &Apache::loncommon::content_type($r,'text/xml');
@@ -2981,7 +2981,10 @@ sub handler {
         } else {
             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/default_1261144274.sequence');
+            my $sequence = &Apache::loncommon::get_citest_map($cdom);
+            my @allres;
+            if ($sequence) {
+                @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/'.$sequence);
             foreach my $resource (@allres) {
                 next if ($resource->is_map());
                 my $symb = $resource->symb();