--- loncom/imspackages/imsprocessor.pm	2004/03/20 00:45:16	1.5
+++ loncom/imspackages/imsprocessor.pm	2004/08/04 17:34:29	1.9
@@ -100,11 +100,14 @@ sub expand_zip {
     my ($tempdir,$filename) = @_;
     my $zipfile = "$tempdir/$filename";
     if ($filename =~ m|\.zip$|i) {
+    # unzip can cause an sh launch which can pass along all of %ENV
+    # which can be too large for /bin/sh to handle
+        my %oldENV=%ENV;
+        undef(%ENV);
         open(OUTPUT, "unzip -o $zipfile -d $tempdir  2> /dev/null |");
-        while (<OUTPUT>) {
-            print "$_<br />";
-        }
         close(OUTPUT);
+        %ENV=%oldENV;
+        undef(%oldENV);
     } else {
         return 'nozip';
     }
@@ -366,7 +369,7 @@ sub process_coursefile {
 }
 
 sub process_resinfo {
-    my ($cms,$docroot,$destdir,$items,$resources,$boards,$announcements,$quizzes,$surveys,$groups,$messages,$timestamp,$boardnum,$resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,$total,$dirname,$seqstem,$resrcfiles) = @_;
+    my ($cms,$context,$docroot,$destdir,$items,$resources,$boards,$announcements,$quizzes,$surveys,$groups,$messages,$timestamp,$boardnum,$resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,$total,$dirname,$seqstem,$resrcfiles) = @_;
     my $board_id = time;
     my $board_count = 0;
     my $announce_handling = 'include';
@@ -407,7 +410,7 @@ sub process_resinfo {
             if ($$resources{$key}{type} eq "resource/x-bb-document") {
                 unless ($$items{$$resources{$key}{revitm}}{filepath} eq 'Top') {
                     %{$$resinfo{$key}} = ();
-                    &process_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles);
+                    &process_content($key,$context,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles);
                 }
             } elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") {
                 %{$$resinfo{$key}} = ();
@@ -610,7 +613,7 @@ sub build_structure {
                         $curr_id ++;
                         $next_id ++;
                         $seqtext{$key} .= qq|></resource>
-<link from="$curr_id" to="$next_id index="$curr_id"></link>\n|;
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>\n|;
                     } 
                 }
             }
@@ -651,7 +654,7 @@ sub build_structure {
 
     my $filestem;
     if ($context eq 'DOCS') {
-        $filestem = "/uploaded/$cdom/$crs";
+        $filestem = "/uploaded/$cdom/$crs/$timenow";
     } elsif ($context eq 'CSTR') {
         $filestem = "/res/$udom/$uname/$newdir";
     }
@@ -846,13 +849,13 @@ sub process_user {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "USERS USER") {
+        if ("@state" eq "USERS USER") {
             $userid = $attr->{value};
             %{$$settings{$userid}} = ();
             @{$$settings{$userid}{links}} = ();
-        } elsif (@state eq "USERS USER LOGINID") {  
+        } elsif ("@state" eq "USERS USER LOGINID") {  
             $$settings{$userid}{loginid} = $attr->{value};
-        } elsif (@state eq "USERS USER PASSPHRASE") {  
+        } elsif ("@state" eq "USERS USER PASSPHRASE") {  
             $$settings{$userid}{passphrase} = $attr->{value};
         } elsif ("@state" eq "USERS USER STUDENTID" ) {
             $$settings{$userid}{studentid} = $attr->{value};
@@ -890,7 +893,7 @@ sub process_user {
      end_h =>
      [sub {
         my ($tagname) = @_;
-        if (@state eq "USERS USER") {
+        if ("@state" eq "USERS USER") {
             $linknum = 0;
         }
         pop @state;
@@ -927,14 +930,14 @@ sub process_group {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "GROUPS GROUP") {
+        if ("@state" eq "GROUPS GROUP") {
             $grp = $attr->{id};
         }        
-        if (@state eq "GROUPS GROUP TITLE") {
+        if ("@state" eq "GROUPS GROUP TITLE") {
             $$settings{$grp}{title} = $attr->{value};
-        } elsif (@state eq "GROUPS GROUP FLAGS ISAVAILABLE") {  
+        } elsif ("@state" eq "GROUPS GROUP FLAGS ISAVAILABLE") {  
             $$settings{$grp}{isavailable} = $attr->{value};
-        } elsif (@state eq "GROUPS GROUP FLAGS HASCHATROOM") {  
+        } elsif ("@state" eq "GROUPS GROUP FLAGS HASCHATROOM") {  
             $$settings{$grp}{chat} = $attr->{value};
         } elsif ("@state" eq "GROUPS GROUP FLAGS HASDISCUSSIONBOARD") {
             $$settings{$grp}{discussion} = $attr->{value};
@@ -979,11 +982,11 @@ sub process_staff {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "STAFFINFO TITLE") {
+        if ("@state" eq "STAFFINFO TITLE") {
             $$settings{title} = $attr->{value};
-        } elsif (@state eq "STAFFINFO BIOGRAPHY TEXTCOLOR") {
+        } elsif ("@state" eq "STAFFINFO BIOGRAPHY TEXTCOLOR") {
             $$settings{textcolor} = $attr->{value};
-        } elsif (@state eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") {
+        } elsif ("@state" eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") {
             $$settings{ishtml} = $attr->{value};
         } elsif ("@state" eq "STAFFINFO FLAGS ISAVAILABLE" ) {
             $$settings{isavailable} = $attr->{value};
@@ -1156,11 +1159,11 @@ sub process_link {
         [sub {
             my ($tagname, $attr) = @_;
             push @state, $tagname;
-            if (@state eq "EXTERNALLINK TITLE") {
+            if ("@state" eq "EXTERNALLINK TITLE") {
                 $$settings{title} = $attr->{value};
-            } elsif (@state eq "EXTERNALLINK TEXTCOLOR") {  
+            } elsif ("@state" eq "EXTERNALLINK TEXTCOLOR") {  
                 $$settings{textcolor} = $attr->{value};
-            } elsif (@state eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") {  
+            } elsif ("@state" eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") {  
                 $$settings{ishtml} = $attr->{value};                               
             } elsif ("@state" eq "EXTERNALLINK FLAGS ISAVAILABLE" ) {
                 $$settings{isavailable} = $attr->{value};
@@ -1171,7 +1174,7 @@ sub process_link {
             } elsif ("@state" eq "EXTERNALLINK POSITION" ) {
                 $$settings{position} = $attr->{value};
             } elsif ("@state" eq "EXTERNALLINK URL" ) {
-              $$settings{url} = $attr->{value};
+                $$settings{url} = $attr->{value};
             }
         }, "tagname, attr"],
         text_h =>
@@ -1856,7 +1859,7 @@ sub process_announce {
         if ("@state" eq "ANNOUNCEMENT TITLE") {
             $$settings{title} = $attr->{value};
             $$settings{startassessment} = ();
-        } elsif (@state eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") {  
+        } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") {  
             $$settings{ishtml} = $attr->{value};          
         } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISNEWLINELITERAL" ) {
             $$settings{isnewline} = $attr->{value};
@@ -1929,10 +1932,14 @@ $$settings{text}
 
 # ---------------------------------------------------------------- Process Blackboard Content
 sub process_content {
-    my ($res,$docroot,$destdir,$settings,$dom,$user,$resrcfiles) = @_;
+    my ($res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles) = @_;
     my $xmlfile = $docroot.'/'.$res.".dat";
     my $destresdir = $destdir;
-    $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|;
+    if ($context eq 'CSTR') {
+        $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|;
+    } elsif ($context eq 'DOCS') {
+        $destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|;
+    }
     my $filecount = 0;
     my @allrelfiles = ();
     my @state;
@@ -1944,13 +1951,13 @@ sub process_content {
       [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "CONTENT MAINDATA") {
+        if ("@state" eq "CONTENT MAINDATA") {
             %{$$settings{maindata}} = ();
-        } elsif (@state eq "CONTENT MAINDATA TEXTCOLOR") {
+        } elsif ("@state" eq "CONTENT MAINDATA TEXTCOLOR") {
             $$settings{maindata}{color} = $attr->{value};
-        } elsif (@state eq "CONTENT MAINDATA FLAGS ISHTML") {  
+        } elsif ("@state" eq "CONTENT MAINDATA FLAGS ISHTML") {  
             $$settings{maindata}{ishtml} = $attr->{value}; 
-        } elsif (@state eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") {  
+        } elsif ("@state" eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") {  
             $$settings{maindata}{isnewline} = $attr->{value};
         } elsif ("@state" eq "CONTENT FLAGS ISAVAILABLE" ) {
             $$settings{isavailable} = $attr->{value};