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

Diff for /loncom/interface/londocs.pm between versions 1.314 and 1.314.2.3

version 1.314, 2008/10/08 17:19:18 version 1.314.2.3, 2008/12/21 15:48:43
Line 1279  sub do_paste_from_buffer { Line 1279  sub do_paste_from_buffer {
 # Maps need to be copied first  # Maps need to be copied first
     if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {      if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
  $title=&mt('Copy of').' '.$title;   $title=&mt('Copy of').' '.$title;
  my $newid=$$.time;          my $newid=$$.int(rand(100)).time;
  $url=~/^(.+)\.(\w+)$/;   my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
  my $newurl=$1.$newid.'.'.$2;          if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
               my $path = $1;
               my $prefix = $2;
               my $ancestor = $3;
               if (length($ancestor) > 10) {
                   $ancestor = substr($ancestor,-10,10);
               }
               $oldid = $path.$prefix.$ancestor;
           }
           my $counter = 0;
           my $newurl=$oldid.$newid.'.'.$ext;
           my $is_unique = &uniqueness_check($newurl);
           while (!$is_unique && $counter < 100) {
               $counter ++;
               $newid ++;
               $newurl = $oldid.$newid;
               $is_unique = &uniqueness_check($newurl);
           }
           if (!$is_unique) {
               if ($url=~/\.page$/) {
                   return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
               } else {
                   return &mt('Paste failed: an error occurred creating a unique URL for the folder');
               }
           }
  my $storefn=$newurl;   my $storefn=$newurl;
  $storefn=~s{^/\w+/$match_domain/$match_username/}{};   $storefn=~s{^/\w+/$match_domain/$match_username/}{};
  &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,   &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
Line 1330  sub do_paste_from_buffer { Line 1354  sub do_paste_from_buffer {
 # Store the result  # Store the result
 }  }
   
   sub uniqueness_check {
       my ($newurl) = @_;
       my $unique = 1;
       foreach my $res (@LONCAPA::map::order) {
           my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
           $url=&LONCAPA::map::qtescape($url);
           if ($newurl eq $url) {
               $unique = 0;
               last;    
           }
       }
       return $unique;
   }
   
 my %parameter_type = ( 'randompick'     => 'int_pos',  my %parameter_type = ( 'randompick'     => 'int_pos',
        'hiddenresource' => 'string_yesno',         'hiddenresource' => 'string_yesno',
        'encrypturl'     => 'string_yesno',         'encrypturl'     => 'string_yesno',
Line 1904  END Line 1942  END
     my $ro_set=      my $ro_set=
     ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');      ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
  $rand_order_text ='   $rand_order_text ='
 <nobr><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></nobr>';     <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
     }      }
     if ($ispage) {      if ($ispage) {
         my $pagename=&escape($pagetitle);          my $pagename=&escape($pagetitle);
Removed from v.1.314  
changed lines
  Added in v.1.314.2.3

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