--- loncom/metadata_database/searchcat.pl	2007/04/11 22:44:18	1.76
+++ loncom/metadata_database/searchcat.pl	2013/07/25 19:11:10	1.79
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.76 2007/04/11 22:44:18 albertel Exp $
+# $Id: searchcat.pl,v 1.79 2013/07/25 19:11:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,6 +123,7 @@ my %oldnames = (
                  'portfolio'   => 'portfolio_metadata',
                  'access'      => 'portfolio_access',
                  'addedfields' => 'portfolio_addedfields',
+                 'allusers'    => 'allusers',
                );
 
 my %newnames;
@@ -134,6 +135,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');
@@ -172,7 +175,7 @@ foreach my $key (keys(%newnames)) {
 }
 
 #
-# Create the new metadata and portfolio tables
+# Create the new metadata, portfolio and allusers tables
 foreach my $key (keys(%newnames)) {
     if ($newnames{$key} ne '') { 
         my $request =
@@ -221,20 +224,30 @@ foreach my $dom (@domains) {
               no_chdir   => 1,
              }, join('/',($Apache::lonnet::perlvar{'lonDocRoot'},'res',$dom,$user)) );
     }
-    # Search for public portfolio files
-    my %portusers;
+    # Search for all users and public portfolio files
+    my (%allusers,%portusers,%courses);
     if ($oneuser) {
         %portusers = (
                         $oneuser => '',
                        );
+        %allusers = (
+                        $oneuser => '',
+                       );
+        %courses = &courseiddump($dom,'.',1,'.','.',$oneuser,undef,
+                                 undef,'.');
     } else {
+        # get courseIDs for domain on current machine
+        %courses=&Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',1,[$hostid],'.');
         my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom;
-        &descend_tree($dir,0,\%portusers);
+        &descend_tree($dom,$dir,0,\%portusers,\%allusers);
     }
     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)) {
@@ -257,6 +270,95 @@ foreach my $dom (@domains) {
             &portfolio_logging(%portmetalog);
         }
     }
+    my (%names_by_id,,%ids_by_name,%idstodelete,%idstoadd,%duplicates);
+    unless ($simulate || $oneuser) {
+        my $idshashref;
+        $idshashref = &tie_domain_hash($dom, "ids", &GDBM_WRCREAT());
+        if (ref($idshashref) eq 'HASH') {
+            %names_by_id = %{$idshashref};
+            while (my ($id,$uname) = each(%{$idshashref}) ) {
+                $id = &unescape($id);
+                $uname = &unescape($uname); 
+                $names_by_id{$id} = $uname;
+                push(@{$ids_by_name{$uname}},$id);
+            }
+            &untie_domain_hash($idshashref);
+        }
+    }
+    # 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);
+        unless ($simulate || $oneuser) {
+            my $addid;
+            if ($userdata{'id'} ne '') {
+                $addid = $userdata{'id'};
+                $addid=~tr/A-Z/a-z/;
+            }
+            if (exists($ids_by_name{$uname})) {
+                if (ref($ids_by_name{$uname}) eq 'ARRAY') {
+                    if (scalar(@{$ids_by_name{$uname}}) > 1) {
+                        &log(0,"Multiple employee/student IDs found in ids.db for $uname:$dom -- ".join(', ',@{$ids_by_name{$uname}}));
+                    }
+                    foreach my $id (@{$ids_by_name{$uname}}) {
+                        if ($id eq $userdata{'id'}) {
+                            undef($addid);
+                        } else { 
+                            $idstodelete{$id} = $uname;
+                        }
+                    }
+                }
+            }
+            if ($addid ne '') {
+                if (exists($idstoadd{$addid})) {
+                    push(@{$duplicates{$addid}},$uname);
+                } else {
+                    if ((exists($names_by_id{$addid})) && ($names_by_id{$addid} ne $uname)) {
+                        &log(0,"In ids.db ($dom) $addid => $names_by_id{$addid} will be replaced by $addid => $uname");
+                    }
+                    $idstoadd{$addid} = $uname;
+                }
+            }
+        }
+        
+        $userdata{'username'} = $uname;
+        $userdata{'domain'} = $dom;
+        my %alluserslog = 
+            &LONCAPA::lonmetadata::process_allusers_data($dbh,$simulate,
+                \%newnames,$uname,$dom,\%userdata);
+        foreach my $item (keys(%alluserslog)) {
+            &log(0,$alluserslog{$item});
+        }
+    }
+    unless ($simulate || $oneuser) {
+        if (keys(%idstodelete) > 0) {
+            my %resulthash = &Apache::lonnet::iddel($dom,\%idstodelete,$hostid);
+            if ($resulthash{$hostid} eq 'ok') {
+                foreach my $id (sort(keys(%idstodelete))) {
+                    &log(0,"Record deleted from ids.db for $dom -- $id => ".$idstodelete{$id});
+                }
+            } else {
+                &log(0,"Error: '$resulthash{$hostid}' occurred when attempting to delete records from ids.db for $dom");
+            }
+        }
+        if (keys(%idstoadd) > 0) {
+            my $putresult = &Apache::lonnet::put_dom('ids',\%idstoadd,$dom,$hostid);
+            if ($putresult eq 'ok') {
+                foreach my $id (sort(keys(%idstoadd))) {
+                    &log(0,"Record added to ids.db for $dom -- $id => ".$idstoadd{$id});
+                }
+            } else {
+                &log(0,"Error: '$putresult' occurred when attempting to add records to ids.db for $dom"); 
+            }
+        }
+        if (keys(%duplicates) > 0) {
+            foreach my $id (sort(keys(%duplicates))) {
+                &log(0,"Duplicate IDs found for entries to add to ids.db in $dom -- $id => $idstodelete{$id}");
+            }
+        }
+    }
 }
 
 #
@@ -317,7 +419,7 @@ sub portfolio_logging {
 }
 
 sub descend_tree {
-    my ($dir,$depth,$alldomusers) = @_;
+    my ($dom,$dir,$depth,$allportusers,$alldomusers) = @_;
     if (-d $dir) {
         opendir(DIR,$dir);
         my @contents = grep(!/^\./,readdir(DIR));
@@ -325,10 +427,12 @@ sub descend_tree {
         $depth ++;
         foreach my $item (@contents) {
             if ($depth < 4) {
-                &descend_tree($dir.'/'.$item,$depth,$alldomusers);
+                &descend_tree($dom,$dir.'/'.$item,$depth,$allportusers,$alldomusers);
             } else {
                 if (-e $dir.'/'.$item.'/file_permissions.db') {
-                 
+                    $$allportusers{$item} = '';
+                }
+                if (-e $dir.'/'.$item.'/passwd') {
                     $$alldomusers{$item} = '';
                 }
             }