[LON-CAPA-cvs] cvs: loncom /metadata_database searchcat.pl

[www]

www		Fri Dec 26 10:13:49 2003 EDT

  Modified files:              
    /loncom/metadata_database	searchcat.pl 
  Log:
  FLOATs working.
  
  
Index: loncom/metadata_database/searchcat.pl
diff -u loncom/metadata_database/searchcat.pl:1.49 loncom/metadata_database/searchcat.pl:1.50
--- loncom/metadata_database/searchcat.pl:1.49	Thu Dec 25 10:20:00 2003
+++ loncom/metadata_database/searchcat.pl	Fri Dec 26 10:13:48 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.49 2003/12/25 15:20:00 www Exp $
+# $Id: searchcat.pl,v 1.50 2003/12/26 15:13:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,19 +188,19 @@
 		if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
 		unless ($listitems{$cat} eq 'app') {
 		    if (defined($sum{$cat})) {
-			$sum{$cat}+=$evaldata{$esckey};
+			$sum{$cat}+=&unescape($evaldata{$esckey});
 			$concat{$cat}.=','.$item;
 		    } else {
-			$sum{$cat}=$evaldata{$esckey};
+			$sum{$cat}=&unescape($evaldata{$esckey});
 			$concat{$cat}=$item;
 		    }
 		} else {
 		    if (defined($sum{$cat})) {
 			if ($evaldata{$esckey}=~/\w/) {
-			    $sum{$cat}.='<hr>'.$evaldata{$esckey};
+			    $sum{$cat}.='<hr />'.&unescape($evaldata{$esckey});
 			}
 		    } else {
-			$sum{$cat}=''.$evaldata{$esckey};
+			$sum{$cat}=''.&unescape($evaldata{$esckey});
 		    }
 		}
 	    }
@@ -241,7 +241,7 @@
 # ---------------  Read loncapa_apache.conf and loncapa.conf and get variables
 my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
 my %perlvar=%{$perlvarref};
-undef $perlvarref; # remove since sensitive and not needed
+undef $perlvarref;
 delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
 
 # ------------------------------------- Only run if machine is a library server
@@ -282,7 +282,7 @@
         "title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, ".
         "version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, ".
         "creationdate DATETIME, lastrevisiondate DATETIME, owner TEXT, ".
-        "copyright TEXT, ".
+        "copyright TEXT, dependencies TEXT, ".
         "count INTEGER UNSIGNED, ".
         "course INTEGER UNSIGNED, course_list TEXT, ".
         "goto INTEGER UNSIGNED, goto_list TEXT, ".
@@ -334,6 +334,7 @@
      "?,".   # revisiondate
      "?,".   # owner
      "?,".   # copyright
+     "?,".   # dependencies
      "?,".   # count
      "?,".   # course
      "?,".   # course_list
@@ -393,6 +394,7 @@
                              sqltime($ref->{'lastrevisiondate'}),
                              $ref->{'owner'},
                              $ref->{'copyright'},
+			     $ref->{'dependencies'},
 			     $dyn{'count'},
 			     $dyn{'course'},
 			     $dyn{'course_list'},