[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.109 and 1.112

version 1.109, 2001/03/19 22:27:06 version 1.112, 2001/03/22 15:08:49
Line 3 Line 3
 #  #
 # Functions for use by content handlers:  # Functions for use by content handlers:
 #  #
 # metadata_query(sql-query-string) : returns file handle of where sql  # metadata_query(sql-query-string,custom-metadata-regex) : 
 #                                    results will be stored for query  #                                    returns file handle of where sql and
   #                                    regex results will be stored for query
 # plaintext(short)   : plain text explanation of short term  # plaintext(short)   : plain text explanation of short term
 # fileembstyle(ext)  : embed style in page for file extension  # fileembstyle(ext)  : embed style in page for file extension
 # filedescription(ext) : descriptor text for file extension  # filedescription(ext) : descriptor text for file extension
Line 91 Line 92
 # 02/27/01 Scott Harrison  # 02/27/01 Scott Harrison
 # 3/2 Gerd Kortemeyer  # 3/2 Gerd Kortemeyer
 # 3/15 Scott Harrison  # 3/15 Scott Harrison
 # 3/19 Gerd Kortemeyer  # 3/19,3/20 Gerd Kortemeyer
   
 package Apache::lonnet;  package Apache::lonnet;
   
Line 628  sub log { Line 629  sub log {
     return critical("log:$dom:$nam:$what",$hom);      return critical("log:$dom:$nam:$what",$hom);
 }  }
   
   # --------------------------------------------- Set Expire Date for Spreadsheet
   
   sub expirespread {
       my ($uname,$udom,$stype,$usymb)=@_;
       my $cid=$ENV{'request.course.id'}; 
       if ($cid) {
          my $now=time;
          my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
          return &reply('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
                               $ENV{'course.'.$cid.'.num'}.
               ':nohist_expirationdates:'.
                               &escape($key).'='.$now,
                               $ENV{'course.'.$cid.'.home'})
       }
       return 'ok';
   }
   
 # ----------------------------------------------------- Devalidate Spreadsheets  # ----------------------------------------------------- Devalidate Spreadsheets
   
 sub devalidate {  sub devalidate {
Line 1224  sub definerole { Line 1242  sub definerole {
 # ---------------- Make a metadata query against the network of library servers  # ---------------- Make a metadata query against the network of library servers
   
 sub metadata_query {  sub metadata_query {
   <<<<<<< lonnet.pm
       my ($query,$custom)=@_;
       unless ($custom) {
    my $reply=&reply("querysend:".&escape($query),'msul3');
    return $reply;
       }
       else {
    my $reply=&reply("querysend:".&escape($query).':'.
    &escape($customquery),'msul3');
    return $reply;
       }
   =======
     my ($query)=@_;      my ($query)=@_;
       # need to put in a loop here and return list
     my $reply=&reply("querysend:".&escape($query),'msul3');      my $reply=&reply("querysend:".&escape($query),'msul3');
   >>>>>>> 1.111
 }  }
   
 # ------------------------------------------------------------------ Plain Text  # ------------------------------------------------------------------ Plain Text
Removed from v.1.109  
changed lines
  Added in v.1.112

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>