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

Diff for /loncom/interface/groupsort.pm between versions 1.57 and 1.58

version 1.57, 2007/07/12 00:27:13 version 1.58, 2007/07/12 01:04:36
Line 160  sub readfromfile { Line 160  sub readfromfile {
  if ($token->[2]->{'type'} eq 'zombie') { next; }   if ($token->[2]->{'type'} eq 'zombie') { next; }
     }      }
   
     my $url=$token->[2]->{'src'};  
                     my $name=$token->[2]->{'title'};                      my $name=$token->[2]->{'title'};
     $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;      $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
     my $note;      my $note;
Line 170  sub readfromfile { Line 169  sub readfromfile {
     &Apache::lonlocal::locallocaltime($1);      &Apache::lonlocal::locallocaltime($1);
     }      }
     $name=~s/\&colon\;/\:/g;      $name=~s/\&colon\;/\:/g;
     push(@{$resources}, {'url'   => $url,      push(@{$resources}, {'url'   => $token->[2]->{'src'},
  'title' => $name,   'title' => $name,
  'note'  => $note, });   'note'  => $note,
            'id'    => $token->[2]->{'id'},});
  }   }
     }      }
  }   }
Line 228  function finish_import() { Line 228  function finish_import() {
  $begincondition   $begincondition
  opener.document.forms.simpleedit.importdetail.value+='&'+   opener.document.forms.simpleedit.importdetail.value+='&'+
               escape(eval("document.forms.groupsort.title"+num+".value"))+'='+                escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
       escape(eval("document.forms.groupsort.filelink"+num+".value"));        escape(eval("document.forms.groupsort.filelink"+num+".value"))+'='+
         escape(eval("document.forms.groupsort.id"+num+".value"));
  $endcondition   $endcondition
     }      }
     opener.document.forms.simpleedit.submit();      opener.document.forms.simpleedit.submit();
Line 393  END Line 394  END
  $r->print(&movers($clen,$ctr));   $r->print(&movers($clen,$ctr));
     }      }
  }   }
  $r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'}));   $r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'},
     $resource->{'id'}));
  if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {   if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
     $r->print("</td>");      $r->print("</td>");
             unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {              unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
Line 425  END Line 427  END
   
 # --------------------------------------- Hidden values (returns scalar string)  # --------------------------------------- Hidden values (returns scalar string)
 sub hidden {  sub hidden {
     my ($sel,$title,$filelink) = @_;      my ($sel,$title,$filelink,$id) = @_;
     my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.      my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
  '" />';   '" />';
     $filelink=~s|^/ext/|http://|;      $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.      $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
  $filelink.'" />';   $filelink.'" />';
       $string .= '<input type="hidden" name="id'.$sel.'" value="'.$id.'" />';
     return $string;      return $string;
 }  }
   
Removed from v.1.57  
changed lines
  Added in v.1.58

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