--- loncom/metadata_database/searchcat.pl	2007/01/02 12:52:22	1.75
+++ loncom/metadata_database/searchcat.pl	2007/04/11 22:44:18	1.76
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.75 2007/01/02 12:52:22 raeburn Exp $
+# $Id: searchcat.pl,v 1.76 2007/04/11 22:44:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,7 @@ use strict;
 use DBI;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::lonmetadata;
-
+use LONCAPA;
 use Getopt::Long;
 use IO::File;
 use HTML::TokeParser;
@@ -679,7 +679,7 @@ sub write_copyright_count {
 ##   (copied from lond, modification of the return value)
 sub ishome {
     my $author=shift;
-    $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
+    $author=~s{/home/httpd/html/res/([^/]*)/([^/]*).*}{$1/$2};
     my ($udom,$uname)=split(/\//,$author);
     my $proname=propath($udom,$uname);
     if (-e $proname) {
@@ -690,20 +690,6 @@ sub ishome {
 }
 
 ##
-## &propath($udom,$uname)
-##   Returns the path to the users LON-CAPA 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="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
-    return $proname;
-} 
-
-##
 ## &declutter($filename)
 ##   Given a filename, returns a url for the filename.
 sub declutter {
@@ -714,16 +700,3 @@ sub declutter {
     return $thisfn;
 }
 
-##
-## Escape / Unescape special characters
-sub unescape {
-    my $str=shift;
-    $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-    return $str;
-}
-
-sub escape {
-    my $str=shift;
-    $str =~ s/(\W)/"%".unpack('H2',$1)/eg;
-    return $str;
-}