[LON-CAPA-cvs] cvs: loncom /interface lonmsgdisplay.pm slotrequest.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 22 Jun 2006 14:53:15 -0000


albertel		Thu Jun 22 10:53:15 2006 EDT

  Modified files:              
    /loncom/interface	slotrequest.pm lonmsgdisplay.pm 
  Log:
  - morph to use new lonnet provided error detector
  
  
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.66 loncom/interface/slotrequest.pm:1.67
--- loncom/interface/slotrequest.pm:1.66	Mon Jun 19 23:32:40 2006
+++ loncom/interface/slotrequest.pm	Thu Jun 22 10:53:15 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.66 2006/06/20 03:32:40 albertel Exp $
+# $Id: slotrequest.pm,v 1.67 2006/06/22 14:53:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,7 +90,7 @@
 
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
-    if (&network_error(%consumed)) { 
+    if (&Apache::lonnet::error(%consumed)) { 
 	return 'error: Unable to determine current status';
     }
     my ($tmp)=%consumed;
@@ -127,8 +127,9 @@
     my ($cnum,$cdom)=&get_course();
     my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
 
-    if (&network_error($student) || &network_error($course)  ||
-	&network_error(%slots)) {
+    if (&Apache::lonnet::error($student) 
+	|| &Apache::lonnet::error($course)
+	|| &Apache::lonnet::error(%slots)) {
 	return 'error: Unable to determine current status';
     }    
     my @got;
@@ -175,7 +176,8 @@
 	my $course =  &Apache::lonnet::EXT("resource.0.available",
 					   $symb, $env{'user.domain'},
 					   $env{'user.name'});
-	if (&network_error($student) || &network_error($course)) {
+	if (&Apache::lonnet::error($student) 
+	    || &Apache::lonnet::error($course)) {
 	    return 'error: Unable to determine current status';
 	}
 	foreach my $slot (split(/:/,$student), split(/:/, $course)) {
@@ -186,7 +188,7 @@
     if (!ref($slots)) {
 	my ($cnum,$cdom)=&get_course();
 	my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum);
-	if (&network_error(%slots)) {
+	if (&Apache::lonnet::error(%slots)) {
 	    return 'error: Unable to determine current status';
 	}
 	$slots = \%slots;
@@ -212,7 +214,7 @@
 
     if (!ref($consumed_uniqueperiods)) {
 	$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
-	if (&network_error(%$consumed_uniqueperiods)) {
+	if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
 	    return 'error: Unable to determine current status';
 	}
     }
@@ -230,14 +232,6 @@
 
 }
 
-sub network_error {
-    my ($result) = @_;
-    if ($result =~ /^(con_lost|no_such_host|error: [^2])/) {
-	return 1;
-    }
-    return 0;
-}
-
 sub make_reservation {
     my ($slot_name,$slot,$symb)=@_;
 
@@ -250,7 +244,8 @@
     my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
     &Apache::lonxml::debug("use_slots is  $use_slots<br />");
 
-    if (&network_error($value) || &network_error($use_slots)) { 
+    if (&Apache::lonnet::error($value) 
+	|| &Apache::lonnet::error($use_slots)) { 
 	return 'error: Unable to determine current status';
     }
 
@@ -266,7 +261,7 @@
 	if ($other_slot eq $slot_name) {
 	    my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom,
 					       $cnum, "^$slot_name\0");   
-	    if (&network_error($value)) { 
+	    if (&Apache::lonnet::error($value)) { 
 		return 'error: Unable to determine current status';
 	    }
 	    my $me=$env{'user.name'}.':'.$env{'user.domain'};
@@ -283,7 +278,7 @@
     if (!defined($max)) { $max=99999; }
 
     my (@ids)=&get_reservation_ids($slot_name);
-    if (&network_error(@ids)) { 
+    if (&Apache::lonnet::error(@ids)) { 
 	return 'error: Unable to determine current status';
     }
     my $last=0;
@@ -338,7 +333,7 @@
     my ($cnum,$cdom)=&get_course();
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
-    if (&network_error(%consumed)) {
+    if (&Apache::lonnet::error(%consumed)) {
 	$r->print("<p>".&mt('A network error has occured.').'</p>');
 	return;
     }
@@ -490,7 +485,7 @@
     my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
     &Apache::lonxml::debug("use_slots is  $use_slots<br />");
 
-    if (&network_error($use_slots)) { 
+    if (&Apache::lonnet::error($use_slots)) { 
 	return (0,'error: Unable to determine current status');
     }
 
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.31 loncom/interface/lonmsgdisplay.pm:1.32
--- loncom/interface/lonmsgdisplay.pm:1.31	Mon Jun 12 18:55:23 2006
+++ loncom/interface/lonmsgdisplay.pm	Thu Jun 22 10:53:15 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.31 2006/06/12 22:55:23 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.32 2006/06/22 14:53:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -217,7 +217,7 @@
 # Copy message
     my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
     if (!exists($message{$msgid}) || $message{$msgid} eq '') {
-	if (&Apache::slotrequest::network_error(%message)) {
+	if (&Apache::lonnet::error(%message)) {
 	    return (0,&mt('Message not moved, A network error occurred.'));
 	} else {
 	    return (0,&mt('Message not moved as the message is no longer in the source folder.'));
@@ -226,7 +226,7 @@
 
     my $result =&Apache::lonnet::put('nohist_email'.$trgsuffix,
 				     {$msgid => $message{$msgid}});
-    if (&Apache::slotrequest::network_error($result)) {
+    if (&Apache::lonnet::error($result)) {
 	return (0,&mt('Message not moved, A network error occurred.'));
     }
 
@@ -234,12 +234,12 @@
     unless ($trgfolder eq 'trash') {
        	my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
 	# a non-existant status is the mark of an unread msg
-	if (&Apache::slotrequest::network_error(%status)) {
+	if (&Apache::lonnet::error(%status)) {
 	    return (0,&mt('Message copied to new folder but status was not, A network error occurred.'));
 	}
 	my $result=&Apache::lonnet::put('email_status'.$trgsuffix,
 					{$msgid => $status{$msgid}});
-	if (&Apache::slotrequest::network_error($result)) {
+	if (&Apache::lonnet::error($result)) {
 	    return (0,&mt('Message copied to new folder but status was not, A network error occurred.'));
 	}
     }
@@ -249,10 +249,10 @@
 	&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
     my $result_del_stat =
 	&Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);
-    if (&Apache::slotrequest::network_error($result_del_msg)) {
+    if (&Apache::lonnet::error($result_del_msg)) {
 	return (0,&mt('Message copied, but unable to delete the original from the source folder.'));
     }
-    if (&Apache::slotrequest::network_error($result_del_stat)) {
+    if (&Apache::lonnet::error($result_del_stat)) {
 	return (0,&mt('Message copied, but unable to delete the original status from the source folder.'));
     }