--- loncom/lonsql	2001/04/02 14:42:26	1.28
+++ loncom/lonsql	2001/04/17 15:47:19	1.35
@@ -19,11 +19,10 @@ require "find.pl";
 sub wanted {
     (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
     -f _ &&
-    /^.*\.meta$/ &&
+    /^.*\.meta$/ && !/^.+\.\d+\.[^\.]+\.meta$/ &&
     push(@metalist,"$dir/$_");
 }
 
-
 $childmaxattempts=10;
 $run =0;#running counter to generate the query-id
 
@@ -39,6 +38,20 @@ while ($configline=<CONFIG>) {
 }
 close(CONFIG);
 
+# ------------------------------------- Make sure that database can be accessed
+{
+    my $dbh;
+    unless (
+	    $dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
+	    ) { 
+	print "Cannot connect to database!\n";
+	exit;
+    }
+    else {
+	$dbh->disconnect;
+    }
+}
+
 # --------------------------------------------- Check if other instance running
 
 my $pidfile="$perlvar{'lonDaemons'}/logs/lonsql.pid";
@@ -60,7 +73,6 @@ while ($configline=<CONFIG>) {
     chomp($ip);
 
     $hostip{$ip}=$id;
-
     if ($id eq $perlvar{'lonHostID'}) { $thisserver=$name; }
 
     $PREFORK++;
@@ -191,12 +203,11 @@ sub make_new_child {
         #open database handle
 	# making dbh global to avoid garbage collector
 	unless (
-		$dbh = DBI->connect("DBI:mysql:loncapa","www","123",{ RaiseError =>0,PrintError=>0})
+		$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
 		) { 
-	            my $st=120+int(rand(240));
+  	            sleep(10+int(rand(20)));
 		    &logthis("<font color=blue>WARNING: Couldn't connect to database  ($st secs): $@</font>");
 		    print "database handle error\n";
-		    sleep($st);
 		    exit;
 
 	  };
@@ -258,7 +269,14 @@ sub make_new_child {
 		}
 		else {
 		    @metalist=(); pop @metalist;
-		    &find("$perlvar{'lonDocRoot'}/res");
+		    opendir(RESOURCES,"$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}");
+		    my @homeusers=grep
+		          {&ishome("$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}/$_")}
+		          grep {!/^\.\.?$/} readdir(RESOURCES);
+		    closedir RESOURCES;
+		    foreach my $user (@homeusers) {
+			&find("$perlvar{'lonDocRoot'}/res/$perlvar{'lonDefDomain'}/$user");
+		    }
 		}
 #		&logthis("FILELIST:" . join(":::",@metalist));
 		# if file is indicated in sql database and
@@ -283,7 +301,7 @@ sub make_new_child {
 			$m2=~s/^$docroot//;
 			$m2=~s/\.meta$//;
 			unless ($query) {
-			    my $q2="select * from metadata where url like '$m2'";
+			    my $q2="select * from metadata where url like binary '$m2'";
 			    my $sth = $dbh->prepare($q2);
 			    $sth->execute();
 			    my $r1=$sth->fetchall_arrayref;
@@ -352,6 +370,7 @@ sub reply {
     }
   } else {
     $answer='self_reply';
+    $answer=subreply($cmd,$server);
   } 
   return $answer;
 }
@@ -371,3 +390,29 @@ sub unescape {
     $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
     return $str;
 }
+
+# --------------------------------------- Is this the home server of an author?
+# (copied from lond, modification of the return value)
+sub ishome {
+    my $author=shift;
+    $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
+    my ($udom,$uname)=split(/\//,$author);
+    my $proname=propath($udom,$uname);
+    if (-e $proname) {
+	return 1;
+    } else {
+        return 0;
+    }
+}
+
+# -------------------------------------------- Return path to profile directory
+# (copied from lond)
+sub propath {
+    my ($udom,$uname)=@_;
+    $udom=~s/\W//g;
+    $uname=~s/\W//g;
+    my $subdir=$uname.'__';
+    $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+    my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+    return $proname;
+}