--- loncom/lond	2004/11/02 23:13:18	1.265
+++ loncom/lond	2005/01/03 16:08:07	1.273
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.265 2004/11/02 23:13:18 albertel Exp $
+# $Id: lond,v 1.273 2005/01/03 16:08:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.265 $'; #' stupid emacs
+my $VERSION='$Revision: 1.273 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1312,8 +1312,10 @@ sub user_authorization_type {
 	my ($type,$otherinfo) = split(/:/,$result);
 	if($type =~ /^krb/) {
 	    $type = $result;
-	}
-	&Reply( $replyfd, "$type:\n", $userinput);
+	} else {
+            $type .= ':';
+        }
+	&Reply( $replyfd, "$type\n", $userinput);
     }
   
     return 1;
@@ -1960,7 +1962,7 @@ sub fetch_user_file_handler {
 	# Note that any regular files in the way of this path are
 	# wiped out to deal with some earlier folly of mine.
 
-	if (!&mkpath($udir.'/')) {
+	if (!&mkpath($udir.'/'.$ufile)) {
 	    &Failure($client, "unable_to_create\n", $userinput);	    
 	}
 
@@ -2835,7 +2837,7 @@ sub store_handler {
 	chomp($what);
 	my @pairs=split(/\&/,$what);
 	my $hashref  = &tie_user_hash($udom, $uname, $namespace,
-				       &GDBM_WRCREAT(), "P",
+				       &GDBM_WRCREAT(), "S",
 				       "$rid:$what");
 	if ($hashref) {
 	    my $now = time;
@@ -3106,6 +3108,14 @@ sub reply_query_handler {
 #   $tail     - Tail of the command.  In this case consists of a colon
 #               separated list contaning the domain to apply this to and
 #               an ampersand separated list of keyword=value pairs.
+#               Each value is a colon separated list that includes:  
+#               description, institutional code and course owner.
+#               For backward compatibility with versions included
+#               in LON-CAPA 1.1.X (and earlier) and 1.2.X, institutional
+#               code and/or course owner are preserved from the existing 
+#               record when writing a new record in response to 1.1 or 
+#               1.2 implementations of lonnet::flushcourselogs().   
+#                      
 #   $client   - Socket open on the client.
 # Returns:
 #   1    - indicating that processing should continue
@@ -3119,7 +3129,7 @@ sub put_course_id_handler {
 
     my $userinput = "$cmd:$tail";
 
-    my ($udom, $what) = split(/:/, $tail);
+    my ($udom, $what) = split(/:/, $tail,2);
     chomp($what);
     my $now=time;
     my @pairs=split(/\&/,$what);
@@ -3127,8 +3137,24 @@ sub put_course_id_handler {
     my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
     if ($hashref) {
 	foreach my $pair (@pairs) {
-	    my ($key,$descr,$inst_code)=split(/=/,$pair);
-	    $hashref->{$key}=$descr.':'.$inst_code.':'.$now;
+            my ($key,$courseinfo) = split(/=/,$pair,2);
+            $courseinfo =~ s/=/:/g;
+
+            my @current_items = split(/:/,$hashref->{$key});
+            shift(@current_items); # remove description
+            pop(@current_items);   # remove last access
+            my $numcurrent = scalar(@current_items);
+
+            my @new_items = split(/:/,$courseinfo);
+            my $numnew = scalar(@new_items);
+            if ($numcurrent > 0) {
+                if ($numnew == 1) { # flushcourselogs() from 1.1 or earlier
+                    $courseinfo .= ':'.join(':',@current_items);
+                } elsif ($numnew == 2) { # flushcourselogs() from 1.2.X
+                    $courseinfo .= ':'.$current_items[$numcurrent-1];
+                }
+            }
+	    $hashref->{$key}=$courseinfo.':'.$now;
 	}
 	if (untie(%$hashref)) {
 	    &Reply( $client, "ok\n", $userinput);
@@ -3166,6 +3192,14 @@ sub put_course_id_handler {
 #                 description - regular expression that is used to filter
 #                            the dump.  Only keywords matching this regexp
 #                            will be used.
+#                 institutional code - optional supplied code to filter 
+#                            the dump. Only courses with an institutional code 
+#                            that match the supplied code will be returned.
+#                 owner    - optional supplied username of owner to filter
+#                            the dump.  Only courses for which the course 
+#                            owner matches the supplied username will be
+#                            returned. Implicit assumption that owner is a user
+#                            in the domain in which the course database is defined.        
 #     $client  - The socket open on the client.
 # Returns:
 #    1     - Continue processing.
@@ -3176,32 +3210,61 @@ sub dump_course_id_handler {
 
     my $userinput = "$cmd:$tail";
 
-    my ($udom,$since,$description) =split(/:/,$tail);
+    my ($udom,$since,$description,$instcodefilter,$ownerfilter) =split(/:/,$tail);
     if (defined($description)) {
 	$description=&unescape($description);
     } else {
 	$description='.';
     }
+    if (defined($instcodefilter)) {
+        $instcodefilter=&unescape($instcodefilter);
+    } else {
+        $instcodefilter='.';
+    }
+    if (defined($ownerfilter)) {
+        $ownerfilter=&unescape($ownerfilter);
+    } else {
+        $ownerfilter='.';
+    }
+
     unless (defined($since)) { $since=0; }
     my $qresult='';
     my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
     if ($hashref) {
 	while (my ($key,$value) = each(%$hashref)) {
-	    my ($descr,$lasttime,$inst_code);
-	    if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
-		($descr,$inst_code,$lasttime)=($1,$2,$3);
-	    } else {
-		($descr,$lasttime) = split(/\:/,$value);
-	    }
+	    my ($descr,$lasttime,$inst_code,$owner);
+            my @courseitems = split/:/,$value;
+            $descr = shift @courseitems;
+            $lasttime = pop @courseitems;
+            if (@courseitems > 0) {
+                $inst_code = shift @courseitems;
+            }
+            if (@courseitems > 0) {
+                $owner = shift @courseitems;
+            }
 	    if ($lasttime<$since) { next; }
-	    if ($description eq '.') {
-		$qresult.=$key.'='.$descr.':'.$inst_code.'&';
-	    } else {
-		my $unescapeVal = &unescape($descr);
-		if (eval('$unescapeVal=~/\Q$description\E/i')) {
-		    $qresult.=$key.'='.$descr.':'.$inst_code.'&';
+            my $match = 1;
+	    unless ($description eq '.') {
+		my $unescapeDescr = &unescape($descr);
+		unless (eval('$unescapeDescr=~/\Q$description\E/i')) {
+                    $match = 0;
 		}
+            }
+            unless ($instcodefilter eq '.' || !defined($instcodefilter)) {
+                my $unescapeInstcode = &unescape($inst_code);
+                unless (eval('$unescapeInstcode=~/\Q$instcodefilter\E/i')) {
+                    $match = 0;
+                }
 	    }
+            unless ($ownerfilter eq '.' || !defined($ownerfilter)) {
+                my $unescapeOwner = &unescape($owner);
+                unless (eval('$unescapeOwner=~/\Q$ownerfilter\E/i')) {
+                    $match = 0;
+                }
+            }
+            if ($match == 1) {
+                $qresult.=$key.'='.$descr.':'.$inst_code.':'.$owner.'&';
+            }
 	}
 	if (untie(%$hashref)) {
 	    chop($qresult);
@@ -5077,7 +5140,7 @@ sub validate_user {
 		my $krbserver  = &Authen::Krb5::parse_name($krbservice);
 		my $credentials= &Authen::Krb5::cc_default();
 		$credentials->initialize($krbclient);
-		my $krbreturn  = &Authen::KRb5::get_in_tkt_with_password($krbclient,
+		my $krbreturn  = &Authen::Krb5::get_in_tkt_with_password($krbclient,
 									 $krbserver,
 									 $password,
 									 $credentials);