--- loncom/metadata_database/searchcat.pl	2007/07/25 23:17:43	1.77
+++ loncom/metadata_database/searchcat.pl	2016/06/19 04:28:08	1.85
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.77 2007/07/25 23:17:43 raeburn Exp $
+# $Id: searchcat.pl,v 1.85 2016/06/19 04:28:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,6 +74,8 @@ use IO::File;
 use HTML::TokeParser;
 use GDBM_File;
 use POSIX qw(strftime mktime);
+use Mail::Send;
+use Apache::loncommon();
 
 use Apache::lonnet();
 
@@ -123,7 +125,7 @@ my %oldnames = (
                  'portfolio'   => 'portfolio_metadata',
                  'access'      => 'portfolio_access',
                  'addedfields' => 'portfolio_addedfields',
-                 'allusers'     => 'allusers',
+                 'allusers'    => 'allusers',
                );
 
 my %newnames;
@@ -135,6 +137,8 @@ foreach my $key (keys(%oldnames)) {
 #
 # Only run if machine is a library server
 exit if ($Apache::lonnet::perlvar{'lonRole'} ne 'library');
+my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
+
 #
 #  Make sure this process is running from user=www
 my $wwwid=getpwnam('www');
@@ -204,12 +208,20 @@ foreach my $dom (@domains) {
     closedir RESOURCES;
     &log(5,'users = '.$dom.':'.join(',',@homeusers));
     #
+    my %courses;
     if ($oneuser) {
+        %courses = &courseiddump($dom,'.',1,'.','.',$oneuser,undef,
+                                 undef,'.');
         @homeusers=($oneuser);
+    } else {
+        # get courseIDs for domain on current machine
+        %courses=&Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',1,[$hostid],'.');
     }
+
     #
     # Loop through the users
     foreach my $user (@homeusers) {
+        next if (exists($courses{$dom.'_'.$user}));
         &log(0,"=== User: ".$user);
         &process_dynamic_metadata($user,$dom);
         #
@@ -238,7 +250,10 @@ foreach my $dom (@domains) {
     foreach my $uname (keys(%portusers)) {
         my $urlstart = '/uploaded/'.$dom.'/'.$uname;
         my $pathstart = &propath($dom,$uname).'/userfiles';
-        my $is_course = &Apache::lonnet::is_course($dom,$uname);
+        my $is_course = '';
+        if (exists($courses{$dom.'_'.$uname})) {
+            $is_course = 1;
+        }
         my $curr_perm = &Apache::lonnet::get_portfile_permissions($dom,$uname);
         my %access = &Apache::lonnet::get_access_controls($curr_perm);
         foreach my $file (keys(%access)) {
@@ -261,11 +276,107 @@ foreach my $dom (@domains) {
             &portfolio_logging(%portmetalog);
         }
     }
+    my %duplicates;
+    my %names_by_id = (
+                          id       => {},
+                          clickers => {},
+                      );
+    my %ids_by_name = (
+                          id       => {},
+                          clickers => {},
+                      );
+    my %idstodelete = (
+                          id       => {},
+                          clickers => {}, 
+                      );
+    my %idstoadd    = (
+                          id       => {},
+                          clickers => {},
+                      );
+    my %namespace  = (
+                         id       => 'ids',
+                         clickers => 'clickers',
+                     );
+    my %idtext = (
+                     id       => 'employee/student IDs',
+                     clickers => 'clicker IDs',
+                 );
+    unless ($simulate || $oneuser) {
+        foreach my $key ('id','clickers') {
+            my $hashref = &tie_domain_hash($dom,$namespace{$key},&GDBM_WRCREAT());
+            if (ref($hashref) eq 'HASH') {
+                while (my ($id,$unamestr) = each(%{$hashref}) ) {
+                    $id = &unescape($id);
+                    $unamestr = &unescape($unamestr);
+                    if ($key eq 'clickers') {
+                        my @unames = split(/,/,$unamestr);
+                        foreach my $uname (@unames) {
+                            push(@{$ids_by_name{$key}{$uname}},$id);
+                        }
+                        $names_by_id{$key}{$id} = $unamestr;
+                    } else {
+                        $names_by_id{$key}{$id} = $unamestr;
+                        push(@{$ids_by_name{$key}{$unamestr}},$id);
+                    }
+                }
+                &untie_domain_hash($hashref);
+            }
+        }
+    }
     # Update allusers
     foreach my $uname (keys(%allusers)) {
+        next if (exists($courses{$dom.'_'.$uname}));
         my %userdata = 
             &Apache::lonnet::get('environment',['firstname','lastname',
-                'middlename','generation','id','permanentemail'],$dom,$uname);
+                'middlename','generation','id','permanentemail','clickers'],
+                                 $dom,$uname);
+        unless ($simulate || $oneuser) {
+            foreach my $key ('id','clickers') {
+                my %addid = ();
+                if ($userdata{$key} ne '') {
+                    my $idfromenv = $userdata{$key};
+                    if ($key eq 'id') {
+                        $idfromenv=~tr/A-Z/a-z/;
+                        $addid{$idfromenv} = 1;
+                    } else {
+                        $idfromenv =~ s/^\s+//;
+                        $idfromenv =~ s/\s+$//;
+                        map { $addid{$_} = 1; } split(/,/,$idfromenv);
+                    }
+                }
+                if (ref($ids_by_name{$key}{$uname}) eq 'ARRAY') {
+                    if (scalar(@{$ids_by_name{$key}{$uname}}) > 1) {
+                        &log(0,"Multiple $idtext{$key} found in $namespace{$key}.db for $uname:$dom -- ".
+                             join(', ',@{$ids_by_name{$key}{$uname}}));
+                    }
+                    foreach my $id (@{$ids_by_name{$key}{$uname}}) {
+                         if ($addid{$id}) {
+                            delete($addid{$id});
+                         } else {
+                            if ($key eq 'id') {
+                                $idstodelete{$key}{$id} = $uname;
+                            } else {
+                                $idstodelete{$key}{$id} .= $uname.',';
+                            }
+                        }
+                    }
+                }
+                if (keys(%addid)) {
+                    foreach my $id (keys(%addid)) {
+                        if ($key eq 'id') {
+                            if (exists($idstoadd{$key}{$id})) {
+                                push(@{$duplicates{$id}},$uname);
+                            } else {
+                                $idstoadd{$key}{$id} = $uname;
+                            }
+                        } else {
+                            $idstoadd{$key}{$id} .= $uname.',';
+                        }
+                    }
+                }
+            }
+        }
+
         $userdata{'username'} = $uname;
         $userdata{'domain'} = $dom;
         my %alluserslog = 
@@ -275,6 +386,91 @@ foreach my $dom (@domains) {
             &log(0,$alluserslog{$item});
         }
     }
+    unless ($simulate || $oneuser) {
+        foreach my $key ('id','clickers') { 
+            if (keys(%{$idstodelete{$key}}) > 0) {
+                my %resulthash;
+                if ($key eq 'id') {
+                    %resulthash = &Apache::lonnet::iddel($dom,$idstodelete{$key},$hostid,$namespace{$key});
+                } else {
+                    foreach my $delid (sort(keys(%{$idstodelete{$key}}))) {
+                        $idstodelete{$key}{$delid} =~ s/,$//;
+                    }
+                    %resulthash = &Apache::lonnet::iddel($dom,$idstodelete{$key},$hostid,$namespace{$key});
+                }
+                if ($resulthash{$hostid} eq 'ok') {
+                    foreach my $id (sort(keys(%{$idstodelete{$key}}))) {
+                        &log(0,"Record deleted from $namespace{$key}.db for $dom -- $id => ".$idstodelete{$key}{$id});
+                    }
+                } else {
+                    &log(0,"Error: '$resulthash{$hostid}' occurred when attempting to delete records from $namespace{$key}.db for $dom");
+                }
+            }
+            if (keys(%{$idstoadd{$key}}) > 0) {
+                my $idmessage = '';
+                my %newids;
+                if ($key eq 'id') {
+                    foreach my $addid (sort(keys(%{$idstoadd{$key}}))) {
+                        if ((exists($names_by_id{$key}{$addid})) && ($names_by_id{$key}{$addid} ne $idstoadd{$key}{$addid})  && !($idstodelete{$key}{$addid})) {
+                            &log(0,"Two usernames associated with a single ID $addid in domain: $dom: $names_by_id{$key}{$addid} (current) and $idstoadd{$key}{$addid}\n");
+                            $idmessage .= "$addid,$names_by_id{$key}{$addid},$idstoadd{$key}{$addid}\n";
+                        } else {
+                            $newids{$addid} = $idstoadd{$key}{$addid};
+                        }
+                    }
+                } else {
+                    foreach my $addid (sort(keys(%{$idstoadd{$key}}))) {
+                        $idstoadd{$key}{$addid} =~ s/,$//;
+                        $newids{$addid} = $idstoadd{$key}{$addid};
+                    }
+                }
+                if (keys(%newids) > 0) {
+                    my $putresult;
+                    if ($key eq 'clickers') {
+                        $putresult = &Apache::lonnet::updateclickers($dom,'add',\%newids,$hostid); 
+                    } else {
+                        $putresult = &Apache::lonnet::put_dom($namespace{$key},\%newids,$dom,$hostid);
+                    } 
+                    if ($putresult eq 'ok') {
+                        foreach my $id (sort(keys(%newids))) {
+                            &log(0,"Record added to $namespace{$key}.db for $dom -- $id => ".$newids{$id});
+                        }
+                    } else {
+                        &log(0,"Error: '$putresult' occurred when attempting to add records to $namespace{$key}.db for $dom"); 
+                    }
+                }
+                if ($idmessage) {
+                    my $to = &Apache::loncommon::build_recipient_list(undef,'idconflictsmail',$dom);
+                    if ($to ne '') {
+                        my $msg = new Mail::Send;
+                        $msg->to($to);
+                        $msg->subject('LON-CAPA studentIDs conflict');
+                        my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+                        my $hostname = &Apache::lonnet::hostname($lonhost);
+                        my $replytoaddress = 'do-not-reply@'.$hostname;
+                        $msg->add('Reply-to',$replytoaddress);
+                        $msg->add('From','www@'.$hostname);
+                        $msg->add('Content-type','text/plain; charset=UTF-8');
+                        if (my $fh = $msg->open()) {
+                            print $fh 
+                                'The following IDs are used for more than one user in your domain:'."\n".
+                                'Each row contains: Student/Employee ID, Current username in ids.db file, '.
+                                'Additional username'."\n\n".
+                                $idmessage;
+                            $fh->close;
+                        }
+                    }
+                }
+            }
+        }
+        if (keys(%duplicates) > 0) {
+            foreach my $id (sort(keys(%duplicates))) {
+                if (ref($duplicates{$id}) eq 'ARRAY') {
+                    &log(0,"Duplicate IDs found for entries to add to ids.db in $dom -- $id => ".join(',',@{$duplicates{$id}}));
+                }
+            }
+        }
+    }
 }
 
 #
@@ -342,13 +538,13 @@ sub descend_tree {
         closedir(DIR);
         $depth ++;
         foreach my $item (@contents) {
-            if ($depth < 4) {
+            if (($depth < 4) && (length($item) == 1)) {
                 &descend_tree($dom,$dir.'/'.$item,$depth,$allportusers,$alldomusers);
             } else {
                 if (-e $dir.'/'.$item.'/file_permissions.db') {
-                     $$allportusers{$item} = '';
+                    $$allportusers{$item} = '';
                 }
-                if (!&Apache::lonnet::is_course($dom,$item)) { 
+                if (-e $dir.'/'.$item.'/passwd') {
                     $$alldomusers{$item} = '';
                 }
             }